test: replace mocha with jest (#324)

* test: replace test with jest phase 1

* test: replace test with jest phase 2

* test: replace test with jest phase 3

* test: replace test with jest phase 4

* chore: regenerate yarn.lock

* chore: update .npmignore

Author: mingchuno

.eslintrc

@@ -2,17 +2,18 @@
   "extends": [
     "standard",
     "prettier",
-    "prettier/standard"
+    "prettier/standard",
+    "plugin:jest/recommended"
   ],
   "parserOptions": {
     "ecmaVersion": 9
   },
   "plugins": [
     "prettier",
-    "mocha"
+    "jest"
   ],
   "rules": {
-    "mocha/no-exclusive-tests": "error",
+    "jest/no-disabled-tests": "error",
     "prettier/prettier": "error",
     "standard/no-callback-literal": "off",
     "no-unused-vars": [
@@ -33,6 +34,6 @@
   "env": {
     "node": true,
     "es6": true,
-    "mocha": true
+    "jest/globals": true
   }
 }

.npmignore

@@ -3,6 +3,7 @@
 History.md
 Makefile
 Readme.md
+.DS_Store
 
 examples/
 support/
@@ -15,3 +16,4 @@ coverage/
 .travis.yml
 commitlint.config.js
 .nyc_output/
+jest.config.js

.travis.yml

@@ -27,4 +27,4 @@ script:
   - MONGODB_URL=mongodb://localhost/connect-mongo-test travis_retry yarn test
 
 after_success:
-  - npm install coveralls -g && yarn cover | coveralls
+  - npm install coveralls -g && yarn test --coverageReporters=text-lcov | coveralls

jest.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  testEnvironment: 'node',
+  testPathIgnorePatterns: ['/node_modules/', 'src'],
+  collectCoverageFrom: ['src/**/*.js', '!**/test/**', '!*.js'],
+  setupFilesAfterEnv: ['<rootDir>/test/jest.setup.js'],
+}

package.json

@@ -32,25 +32,22 @@
     "eslint-config-prettier-standard": "^2.0.0",
     "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.17.3",
-    "eslint-plugin-mocha": "^5.3.0",
+    "eslint-plugin-jest": "^22.6.4",
     "eslint-plugin-node": "^9.1.0",
     "eslint-plugin-prettier": "^3.1.0",
     "eslint-plugin-promise": "^4.1.1",
     "eslint-plugin-standard": "^4.0.0",
-    "expect.js": "^0.3.1",
     "express-session": "^1.0.0",
     "husky": "^2.4.1",
+    "jest": "^24.8.0",
     "lint-staged": "^8.2.1",
-    "mocha": "^6.1.4",
     "mongoose": "^5.2.0",
-    "nyc": "^14.1.1",
     "prettier": "^1.18.2"
   },
   "scripts": {
     "lint": "eslint src test",
     "lint:fix": "eslint src test --fix",
-    "cover": "nyc report --reporter=text-lcov",
-    "test": "nyc mocha"
+    "test": "jest --coverage"
   },
   "husky": {
     "hooks": {

src/crypto.js

@@ -55,7 +55,7 @@ class Crypto {
     const hmac = this._digest(this.secret, ct.ct, this.hashing, this.encodeas)
 
     if (hmac !== ct.hmac) {
-      throw Error('Encrypted session was tampered with!')
+      throw new Error('Encrypted session was tampered with!')
     }
 
     if (ct.at) {

src/index.js

@@ -235,16 +235,11 @@ module.exports = function(connect) {
           .then(session => {
             if (session) {
               if (this.Crypto) {
-                try {
-                  const tmpSession = this.transformFunctions.unserialize(
-                    session.session
-                  )
-                  session.session = this.Crypto.get(tmpSession)
-                } catch (error) {
-                  return callback(error)
-                }
+                const tmpSession = this.transformFunctions.unserialize(
+                  session.session
+                )
+                session.session = this.Crypto.get(tmpSession)
               }
-
               const s = this.transformFunctions.unserialize(session.session)
               if (this.options.touchAfter > 0 && session.lastModified) {
                 s.lastModified = session.lastModified
@@ -269,7 +264,7 @@ module.exports = function(connect) {
         try {
           session = this.Crypto.set(session)
         } catch (error) {
-          return callback(error)
+          return withCallback(Promise.reject(error), callback)
         }
       }
 
@@ -279,7 +274,7 @@ module.exports = function(connect) {
           session: this.transformFunctions.serialize(session),
         }
       } catch (err) {
-        return callback(err)
+        return withCallback(Promise.reject(err), callback)
       }
 
       if (session && session.cookie && session.cookie.expires) {
@@ -338,7 +333,7 @@ module.exports = function(connect) {
         const timeElapsed = currentDate.getTime() - session.lastModified
 
         if (timeElapsed < touchAfter) {
-          return callback()
+          return withCallback(Promise.resolve(), callback)
         }
         updateFields.lastModified = currentDate
       }
@@ -436,7 +431,7 @@ module.exports = function(connect) {
 
     close() {
       if (this.client) {
-        this.client.close()
+        return this.client.close()
       }
     }
   }

test/crypto.js test/crypto.test.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const expect = require('expect.js')
 const Crypto = require('../src/crypto.js')
 
 const options = {
@@ -16,28 +15,25 @@ describe('Crypto', () => {
 
   it('Encrypt data', done => {
     ct = JSON.parse(Crypto.set('123, easy as ABC. ABC, easy as 123'))
-    expect(ct).to.have.property('ct')
-    expect(ct).to.have.property('iv')
-    expect(ct).to.have.property('hmac')
+    expect(ct).toHaveProperty('ct')
+    expect(ct).toHaveProperty('iv')
+    expect(ct).toHaveProperty('hmac')
     done()
   })
 
   it('Decrypt data', done => {
     pt = Crypto.get(JSON.stringify(ct))
-    expect(pt).to.match(/123, easy as ABC. ABC, easy as 123/)
+    expect(pt).toMatch(/123, easy as ABC. ABC, easy as 123/)
     done()
   })
 
   it('HMAC validation', done => {
     hmac = ct.hmac
     ct.hmac = 'funky chicken'
     ct = JSON.stringify(ct)
-
-    try {
+    expect(() => {
       pt = Crypto.get(ct)
-    } catch (err) {
-      expect(err).to.match(/Encrypted session was tampered with/)
-    }
+    }).toThrow(/Encrypted session was tampered with/)
     done()
   })
 
@@ -49,12 +45,9 @@ describe('Crypto', () => {
 
     ct.at = 'funky chicken'
     ct = JSON.stringify(ct)
-
-    try {
+    expect(() => {
       pt = Crypto.get(ct)
-    } catch (err) {
-      expect(err).to.match(/Unsupported state or unable to authenticate data/)
-    }
+    }).toThrow(/Unsupported state or unable to authenticate data/)
     done()
   })
 
@@ -65,12 +58,9 @@ describe('Crypto', () => {
 
     ct.aad = 'funky chicken'
     ct = JSON.stringify(ct)
-
-    try {
+    expect(() => {
       pt = Crypto.get(ct)
-    } catch (err) {
-      expect(err).to.match(/Unsupported state or unable to authenticate data/)
-    }
+    }).toThrow(/Unsupported state or unable to authenticate data/)
     done()
   })
 })

test/events.js test/events.test.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const expect = require('expect.js')
-
 const expressSession = require('express-session')
 const MongoStore = require('..')(expressSession)
 
@@ -15,7 +13,6 @@ function noop() {}
 describe('Events', () => {
   let store, collection
   beforeEach(function(done) {
-    this.timeout(10000)
     store = new MongoStore({
       url: connectionString,
       mongoOptions: { useNewUrlParser: true },
@@ -27,20 +24,20 @@ describe('Events', () => {
     })
   })
   afterEach(() => {
-    store.close()
+    return store.close()
   })
 
   describe('set() with an unknown session id', () => {
     it('should emit a `create` event', done => {
       store.once('create', sid => {
-        expect(sid).to.be('foo1')
+        expect(sid).toBe('foo1')
         done()
       })
       store.set('foo1', { foo: 'bar' }, noop)
     })
     it('should emit a `set` event', done => {
       store.once('set', sid => {
-        expect(sid).to.be('foo2')
+        expect(sid).toBe('foo2')
         done()
       })
       store.set('foo2', { foo: 'bar' }, noop)
@@ -50,26 +47,26 @@ describe('Events', () => {
   describe('set() with a session id associated to an existing session', () => {
     it('should emit an `update` event', done => {
       store.once('update', sid => {
-        expect(sid).to.be('foo3')
+        expect(sid).toBe('foo3')
         done()
       })
       collection.insertOne(
         { _id: 'foo3', session: { foo: 'bar1' }, expires: futureDate },
         err => {
-          expect(err).not.to.be.ok()
+          expect(err).toBeFalsy()
           store.set('foo3', { foo: 'bar2' }, noop)
         }
       )
     })
     it('should emit an `set` event', done => {
       store.once('update', sid => {
-        expect(sid).to.be('foo4')
+        expect(sid).toBe('foo4')
         done()
       })
       collection.insertOne(
         { _id: 'foo4', session: { foo: 'bar1' }, expires: futureDate },
         err => {
-          expect(err).not.to.be.ok()
+          expect(err).toBeFalsy()
           store.set('foo4', { foo: 'bar2' }, noop)
         }
       )
@@ -80,7 +77,6 @@ describe('Events', () => {
 describe('Events w/ Crypto', () => {
   let store, collection
   beforeEach(function(done) {
-    this.timeout(10000)
     store = new MongoStore({
       url: connectionString,
       mongoOptions: { useNewUrlParser: true },
@@ -93,20 +89,20 @@ describe('Events w/ Crypto', () => {
     })
   })
   afterEach(() => {
-    store.close()
+    return store.close()
   })
 
   describe('set() with an unknown session id', () => {
     it('should emit a `create` event', done => {
       store.once('create', sid => {
-        expect(sid).to.be('foo1')
+        expect(sid).toBe('foo1')
         done()
       })
       store.set('foo1', { foo: 'bar' }, noop)
     })
     it('should emit a `set` event', done => {
       store.once('set', sid => {
-        expect(sid).to.be('foo2')
+        expect(sid).toBe('foo2')
         done()
       })
       store.set('foo2', { foo: 'bar' }, noop)
@@ -116,26 +112,26 @@ describe('Events w/ Crypto', () => {
   describe('set() with a session id associated to an existing session', () => {
     it('should emit an `update` event', done => {
       store.once('update', sid => {
-        expect(sid).to.be('foo3')
+        expect(sid).toBe('foo3')
         done()
       })
       collection.insertOne(
         { _id: 'foo3', session: { foo: 'bar1' }, expires: futureDate },
         err => {
-          expect(err).not.to.be.ok()
+          expect(err).toBeFalsy()
           store.set('foo3', { foo: 'bar2' }, noop)
         }
       )
     })
     it('should emit an `set` event', done => {
       store.once('update', sid => {
-        expect(sid).to.be('foo4')
+        expect(sid).toBe('foo4')
         done()
       })
       collection.insertOne(
         { _id: 'foo4', session: { foo: 'bar1' }, expires: futureDate },
         err => {
-          expect(err).not.to.be.ok()
+          expect(err).toBeFalsy()
           store.set('foo4', { foo: 'bar2' }, noop)
         }
       )

test/jest.setup.js

@@ -0,0 +1 @@
+jest.setTimeout(10000)