Skip to content

Commit e7c6a58

Browse files
authored
Merge pull request #60 from mweibel/update-deps
Update dependencies and required node versions
2 parents d8300f6 + fa7f22f commit e7c6a58

File tree

6 files changed

+29
-1624
lines changed

6 files changed

+29
-1624
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
node_modules/
2+
package-lock.json

.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
#
44

55
language: node_js
6+
node_js:
7+
- "8"
8+
- "7"
9+
- "6"
10+
- "5"
11+
- "4.4"
12+
- "4.3"
13+
- "4.2"
14+
- "4.1"
15+
sudo: false
616
script:
717
- npm run lint
818
- npm test

lib/connect-session-sequelize.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
var util = require('util')
99
var path = require('path')
10-
var Op = require('sequelize').Op || {};
10+
var Op = require('sequelize').Op || {}
1111
var debug = require('debug')('connect:session-sequelize')
1212
var defaultOptions = {
1313
checkExpirationInterval: 15 * 60 * 1000, // The interval at which to cleanup expired sessions.

package.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "connect-session-sequelize",
3-
"version": "4.1.0",
3+
"version": "5.0.0",
44
"description": "Session store for connect-session using sequelize",
55
"homepage": "https://github.com/mweibel/connect-session-sequelize",
66
"bugs": "https://github.com/mweibel/connect-session-sequelize/issues",
@@ -14,21 +14,21 @@
1414
"url": "https://github.com/mweibel/connect-session-sequelize.git"
1515
},
1616
"dependencies": {
17-
"debug": "^2.1.1",
17+
"debug": "^3.1.0",
1818
"deep-equal": "^1.0.1"
1919
},
2020
"devDependencies": {
2121
"express-session": "^1.10.3",
22-
"mocha": "^3.0.0",
22+
"mocha": "^4.0.1",
2323
"sequelize": ">=3.24.5",
2424
"sqlite3": "^3.1.4",
25-
"standard": "^8.2.0"
25+
"standard": "^10.0.3"
2626
},
2727
"peerDependencies": {
2828
"sequelize": ">= 3.24.5"
2929
},
3030
"engines": {
31-
"node": "*"
31+
"node": ">= 4.1.0"
3232
},
3333
"keywords": [
3434
"connect-session",
@@ -40,5 +40,7 @@
4040
],
4141
"author": "Michael Weibel <michael.weibel@gmail.com> (https://github.com/mweibel)",
4242
"license": "MIT",
43-
"files": ["lib"]
43+
"files": [
44+
"lib"
45+
]
4446
}

test/test.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ var db = new Sequelize('session_test', 'test', '12345', {
1212
dialect: 'sqlite',
1313
logging: false
1414
})
15-
var store = new SequelizeStore({db: db})
15+
var store = new SequelizeStore({
16+
db: db,
17+
// disable expiration interval otherwise tests don't finish
18+
checkExpirationInterval: -1
19+
})
1620
var sessionId = '1234a'
1721
var sessionData = {foo: 'bar', 'baz': 42}
1822

@@ -37,12 +41,12 @@ describe('store db', function () {
3741

3842
it('should take a specific table from Sequelize DB', function () {
3943
assert.ok(db.models.TestSession, 'Session model added to Sequelize Object')
40-
var store = new SequelizeStore({db: db, table: 'TestSession'})
44+
var store = new SequelizeStore({db: db, table: 'TestSession', checkExpirationInterval: -1})
4145
assert.equal(store.sessionModel.name, 'TestSession')
4246
})
4347

4448
it('should load the default model if No Table is specified in options', function () {
45-
var store = new SequelizeStore({db: db})
49+
var store = new SequelizeStore({db: db, checkExpirationInterval: -1})
4650
assert.equal(store.sessionModel.name, 'Session')
4751
})
4852
})
@@ -98,7 +102,7 @@ describe('extendDefaultFields', function () {
98102
}
99103
db = new Sequelize('session_test', 'test', '12345', { dialect: 'sqlite', logging: console.log })
100104
db.import(path.join(__dirname, 'resources/model'))
101-
store = new SequelizeStore({db: db, table: 'TestSession', extendDefaultFields: extend})
105+
store = new SequelizeStore({db: db, table: 'TestSession', extendDefaultFields: extend, checkExpirationInterval: -1})
102106
return store.sync()
103107
})
104108
it('should extend defaults when extendDefaultFields is set', function (done) {
@@ -123,7 +127,7 @@ describe('extendDefaultFields', function () {
123127
})
124128
})
125129
.catch(function (err) {
126-
assert.of(!err, "Failed to sync the database")
130+
assert.ifError(err)
127131
})
128132
})
129133
})

0 commit comments

Comments
 (0)