Added a tolerance for 1 second in the "should set maxAge" test, to avoid timing false positives.

Also fixed the "should equal original maxAge for all requests" tests so that the first actual value of originalMaxAge is used to compare both requests, rather than a hard coded value.

Author: boenrobot

session/cookie.js

@@ -17,7 +17,6 @@ var deprecate = require('depd')('express-session')
 /**
  * Initialize a new `Cookie` with the given `options`.
  *
- * @param {IncomingMessage} req
  * @param {Object} options
  * @api private
  */

test/cookie.js

@@ -90,9 +90,13 @@ describe('new Cookie()', function () {
 
       it('should set maxAge', function () {
         var maxAge = 60000
+
         var cookie = new Cookie({ maxAge: maxAge })
+        var cookieMaxAge = cookie.maxAge
 
-        assert.strictEqual(cookie.maxAge, maxAge)
+        assert.ok(cookieMaxAge <= maxAge)
+        // Allow up to 1 seconds to happen in between the cookie creation and getting of the current max age.
+        assert.ok(cookieMaxAge >= (maxAge - 1000))
       })
 
       it('should accept Date object', function () {

test/session.js

@@ -1943,39 +1943,47 @@ describe('session()', function(){
             .expect(200, '2000', done)
         })
 
-        it('should equal original maxAge for all requests', function (done) {
+        it('should equal original maxAge for all requests with memory store', function (done) {
+          var originalMaxAge = undefined
           var server = createServer({ cookie: { maxAge: 2000 } }, function (req, res) {
+            if (!originalMaxAge) {
+              originalMaxAge = req.session.cookie.originalMaxAge
+            }
             res.end(JSON.stringify(req.session.cookie.originalMaxAge))
           })
 
           request(server)
             .get('/')
-            .expect(200, '2000', function (err, res) {
+            .expect(200, originalMaxAge, function (err, res) {
               if (err) return done(err)
               setTimeout(function () {
                 request(server)
                   .get('/')
                   .set('Cookie', cookie(res))
-                  .expect(200, '2000', done)
+                  .expect(200, originalMaxAge, done)
               }, 100)
             })
         })
 
-        it('should equal original maxAge for all requests', function (done) {
+        it('should equal original maxAge for all requests with smart store', function (done) {
           var store = new SmartStore()
+          var originalMaxAge = undefined
           var server = createServer({ cookie: { maxAge: 2000 }, store: store }, function (req, res) {
+            if (!originalMaxAge) {
+              originalMaxAge = req.session.cookie.originalMaxAge
+            }
             res.end(JSON.stringify(req.session.cookie.originalMaxAge))
           })
 
           request(server)
             .get('/')
-            .expect(200, '2000', function (err, res) {
+            .expect(200, originalMaxAge, function (err, res) {
               if (err) return done(err)
               setTimeout(function () {
                 request(server)
                   .get('/')
                   .set('Cookie', cookie(res))
-                  .expect(200, '2000', done)
+                  .expect(200, originalMaxAge, done)
               }, 100)
             })
         })