Add a unit test for regenerated session's not ending up with an expired cookie

Author: JamesMGreene

Diff for: test/session.js

@@ -1303,6 +1303,72 @@ describe('session()', function(){
       });
     });
 
+    it('should not set an expired cookie on destroyed session if session is regenerated', function(done){
+      var store = new session.MemoryStore();
+      var app = express()
+        .use(session({ store: store, unset: 'destroy', secret: 'keyboard cat', cookie: { maxAge: min } }))
+        .use(function(req, res, next){
+          req.session.count = req.session.count || 0;
+          req.session.count++;
+          if (req.session.count === 2) {
+            req.session.destroy(function(err) {
+              if (err) return done(err);
+
+              req.sessionStore.regenerate(req, function(err) {
+                if (err) return done(err);
+
+                req.session.now = Date.now();
+                res.end();
+              });
+            });
+          }
+          else {
+            res.end();
+          }
+        });
+
+      request(app)
+      .get('/')
+      .expect(shouldSetCookie('connect.sid'))
+      .expect(200, function(err, res){
+        if (err) return done(err);
+
+        var now = new Date();
+
+        var expiry = expires(res);
+        assert.ok(expiry);
+
+        var a = new Date(expiry);
+
+        var delta = a.valueOf() - now.valueOf();
+        assert.ok(delta > (min - 1000) && delta <= min);
+
+        request(app)
+        .get('/')
+        .set('Cookie', cookie(res))
+        .expect(shouldSetCookie('connect.sid'))
+        .expect(200, function(err, res){
+          if (err) return done(err);
+
+          now = new Date();
+
+          expiry = expires(res);
+          assert.ok(expiry);
+
+          var b = new Date(expiry);
+
+          // The session regenerated so the expiration date should be the same as the original
+          delta = b.valueOf() - a.valueOf();
+          assert.equal(delta, 0);
+
+          delta = b.valueOf() - now.valueOf();
+          assert.ok(delta > 0);
+
+          done();
+        });
+      });
+    });
+
     it('should not set cookie if initial session destroyed', function(done){
       var store = new session.MemoryStore();
       var app = express()