Merge tag '3.20.2'

History.md

@@ -1,3 +1,15 @@
+unreleased
+==========
+
+  * deps: debug@~2.1.3
+    - Fix high intensity foreground color for bold
+    - deps: ms@0.7.0
+  * deps: proxy-addr@~1.0.7
+    - deps: ipaddr.js@0.1.9
+  * deps: send@0.12.2
+    - Throw errors early for invalid `extensions` or `index` options
+    - deps: debug@~2.1.3
+
 4.12.2 / 2015-03-02
 ===================
 
@@ -717,6 +729,33 @@
    - `app.route()` - Proxy to the app's `Router#route()` method to create a new route
    - Router & Route - public API
 
+3.20.2 / 2015-03-16
+===================
+
+  * deps: connect@2.29.1
+    - deps: body-parser@~1.12.2
+    - deps: compression@~1.4.3
+    - deps: connect-timeout@~1.6.1
+    - deps: debug@~2.1.3
+    - deps: errorhandler@~1.3.5
+    - deps: express-session@~1.10.4
+    - deps: finalhandler@0.3.4
+    - deps: method-override@~2.3.2
+    - deps: morgan@~1.5.2
+    - deps: qs@2.4.1
+    - deps: serve-index@~1.6.3
+    - deps: serve-static@~1.9.2
+    - deps: type-is@~1.6.1
+  * deps: debug@~2.1.3
+    - Fix high intensity foreground color for bold
+    - deps: ms@0.7.0
+  * deps: merge-descriptors@1.0.0
+  * deps: proxy-addr@~1.0.7
+    - deps: ipaddr.js@0.1.9
+  * deps: send@0.12.2
+    - Throw errors early for invalid `extensions` or `index` options
+    - deps: debug@~2.1.3
+
 3.20.1 / 2015-02-28
 ===================
 

package.json

@@ -30,8 +30,9 @@
     "accepts": "~1.2.4",
     "content-disposition": "0.5.0",
     "content-type": "~1.0.1",
+    "cookie": "0.1.2",
     "cookie-signature": "1.0.6",
-    "debug": "~2.1.1",
+    "debug": "~2.1.3",
     "depd": "~1.0.0",
     "escape-html": "1.0.1",
     "etag": "~1.5.1",
@@ -42,23 +43,22 @@
     "on-finished": "~2.2.0",
     "parseurl": "~1.3.0",
     "path-to-regexp": "0.1.3",
-    "proxy-addr": "~1.0.6",
+    "proxy-addr": "~1.0.7",
     "qs": "2.3.3",
     "range-parser": "~1.0.2",
-    "send": "0.12.1",
+    "send": "0.12.2",
     "serve-static": "~1.9.1",
     "type-is": "~1.6.0",
     "vary": "~1.0.0",
-    "cookie": "0.1.2",
     "utils-merge": "1.0.0"
   },
   "devDependencies": {
     "after": "0.8.1",
     "ejs": "2.3.1",
-    "istanbul": "0.3.6",
+    "istanbul": "0.3.8",
     "marked": "0.3.3",
-    "mocha": "~2.1.0",
-    "should": "~5.0.1",
+    "mocha": "~2.2.1",
+    "should": "~5.2.0",
     "supertest": "~0.15.0",
     "body-parser": "~1.12.0",
     "connect-redis": "~2.2.0",

test/acceptance/cookie-sessions.js

@@ -0,0 +1,38 @@
+
+var app = require('../../examples/cookie-sessions')
+var request = require('supertest')
+
+describe('cookie-sessions', function () {
+  describe('GET /', function () {
+    it('should display no views', function (done) {
+      request(app)
+      .get('/')
+      .expect(200, 'viewed 0 times\n', done)
+    })
+
+    it('should set a session cookie', function (done) {
+      request(app)
+      .get('/')
+      .expect('Set-Cookie', /express:sess=/)
+      .expect(200, done)
+    })
+
+    it('should display 1 view on revisit', function (done) {
+      request(app)
+      .get('/')
+      .expect(200, 'viewed 0 times\n', function (err, res) {
+        if (err) return done(err)
+        request(app)
+        .get('/')
+        .set('Cookie', getCookies(res))
+        .expect(200, 'viewed 1 times\n', done)
+      })
+    })
+  })
+})
+
+function getCookies(res) {
+  return res.headers['set-cookie'].map(function (val) {
+    return val.split(';')[0]
+  }).join('; ');
+}