Skip to content

Commit

Permalink
Merge pull request #60 from mweibel/update-deps
Browse files Browse the repository at this point in the history
Update dependencies and required node versions
  • Loading branch information
mweibel committed Oct 19, 2017
2 parents d8300f6 + fa7f22f commit e7c6a58
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 1,624 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/
package-lock.json
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
#

language: node_js
node_js:
- "8"
- "7"
- "6"
- "5"
- "4.4"
- "4.3"
- "4.2"
- "4.1"
sudo: false
script:
- npm run lint
- npm test
2 changes: 1 addition & 1 deletion lib/connect-session-sequelize.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

var util = require('util')
var path = require('path')
var Op = require('sequelize').Op || {};
var Op = require('sequelize').Op || {}
var debug = require('debug')('connect:session-sequelize')
var defaultOptions = {
checkExpirationInterval: 15 * 60 * 1000, // The interval at which to cleanup expired sessions.
Expand Down
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "connect-session-sequelize",
"version": "4.1.0",
"version": "5.0.0",
"description": "Session store for connect-session using sequelize",
"homepage": "https://github.com/mweibel/connect-session-sequelize",
"bugs": "https://github.com/mweibel/connect-session-sequelize/issues",
Expand All @@ -14,21 +14,21 @@
"url": "https://github.com/mweibel/connect-session-sequelize.git"
},
"dependencies": {
"debug": "^2.1.1",
"debug": "^3.1.0",
"deep-equal": "^1.0.1"
},
"devDependencies": {
"express-session": "^1.10.3",
"mocha": "^3.0.0",
"mocha": "^4.0.1",
"sequelize": ">=3.24.5",
"sqlite3": "^3.1.4",
"standard": "^8.2.0"
"standard": "^10.0.3"
},
"peerDependencies": {
"sequelize": ">= 3.24.5"
},
"engines": {
"node": "*"
"node": ">= 4.1.0"
},
"keywords": [
"connect-session",
Expand All @@ -40,5 +40,7 @@
],
"author": "Michael Weibel <michael.weibel@gmail.com> (https://github.com/mweibel)",
"license": "MIT",
"files": ["lib"]
"files": [
"lib"
]
}
14 changes: 9 additions & 5 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ var db = new Sequelize('session_test', 'test', '12345', {
dialect: 'sqlite',
logging: false
})
var store = new SequelizeStore({db: db})
var store = new SequelizeStore({
db: db,
// disable expiration interval otherwise tests don't finish
checkExpirationInterval: -1
})
var sessionId = '1234a'
var sessionData = {foo: 'bar', 'baz': 42}

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

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

it('should load the default model if No Table is specified in options', function () {
var store = new SequelizeStore({db: db})
var store = new SequelizeStore({db: db, checkExpirationInterval: -1})
assert.equal(store.sessionModel.name, 'Session')
})
})
Expand Down Expand Up @@ -98,7 +102,7 @@ describe('extendDefaultFields', function () {
}
db = new Sequelize('session_test', 'test', '12345', { dialect: 'sqlite', logging: console.log })
db.import(path.join(__dirname, 'resources/model'))
store = new SequelizeStore({db: db, table: 'TestSession', extendDefaultFields: extend})
store = new SequelizeStore({db: db, table: 'TestSession', extendDefaultFields: extend, checkExpirationInterval: -1})
return store.sync()
})
it('should extend defaults when extendDefaultFields is set', function (done) {
Expand All @@ -123,7 +127,7 @@ describe('extendDefaultFields', function () {
})
})
.catch(function (err) {
assert.of(!err, "Failed to sync the database")
assert.ifError(err)
})
})
})
Expand Down

0 comments on commit e7c6a58

Please sign in to comment.