Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade dependency&modify unit test according #277

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ language: node_js
sudo: false

node_js:
- '0.10'
- '0.12'
- 'stable'

services:
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ module.exports.__defineGetter__('memoryBackend', function(){
});
module.exports.__defineGetter__('mongodbBackend', function(){
return require('./lib/mongodb-backend.js');
});
});
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "acl",
"version": "0.4.11",
"name": "acl-fork",
"version": "0.4.13",
"description": "An Access Control List module, based on Redis with Express middleware support",
"keywords": [
"middleware",
Expand All @@ -15,11 +15,11 @@
},
"main": "./index.js",
"dependencies": {
"async": "^2.1.4",
"bluebird": "^3.0.2",
"lodash": "^4.17.3",
"mongodb": "^2.0.47",
"redis": "^2.2.5"
"async": "^3.2.3",
"bluebird": "^3.7.2",
"lodash": "^4.17.21",
"mongodb": "^3.7.3",
"redis": "^2.8.0"
},
"devDependencies": {
"mocha": "^3.2.0",
Expand Down
17 changes: 9 additions & 8 deletions test/runner.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
var Acl = require('../')
, tests = require('./tests')
, backendTests = require('./backendtests');
const MongoClient = require('mongodb').MongoClient;

describe('MongoDB - Default', function () {
before(function (done) {
var self = this
, mongodb = require('mongodb')
var self = this;

mongodb.connect('mongodb://localhost:27017/acltest',function(error, db) {
MongoClient.connect('mongodb://localhost:27017',(err,client) => {
const db = client.db('acltest');
db.dropDatabase(function () {
self.backend = new Acl.mongodbBackend(db, "acl")
done()
Expand All @@ -21,12 +22,12 @@ describe('MongoDB - Default', function () {

describe('MongoDB - useSingle', function () {
before(function (done) {
var self = this
, mongodb = require('mongodb')
var self = this;

mongodb.connect('mongodb://localhost:27017/acltest',function(error, db) {
MongoClient.connect('mongodb://localhost:27017',(err,client) => {
const db = client.db('acltest');
db.dropDatabase(function () {
self.backend = new Acl.mongodbBackend(db, "acl", true)
self.backend = new Acl.mongodbBackend(db, "acl")
done()
})
})
Expand All @@ -41,7 +42,7 @@ describe('Redis', function () {
, options = {
host: '127.0.0.1',
port: 6379,
password: null
password: process.env.REDIS_PASSWORD || 'admin'
}
, Redis = require('redis')

Expand Down
Loading