Update supertest (+fixes)

Author: thomseddon

package.json

@@ -25,7 +25,7 @@
     "express": "^4.4.3",
     "mocha": "^1.20.1",
     "should": "^4.0.4",
-    "supertest": "0.5.x"
+    "supertest": "^0.13.0"
   },
   "licenses": [
     {

test/authorise.js

@@ -66,7 +66,7 @@ describe('Authorise', function() {
 
     request(app)
       .get('/?access_token=thom')
-      .expect(/nightworld/, 200, done);
+      .expect(200, /nightworld/, done);
   });
 
   it('should require application/x-www-form-urlencoded when access token is ' +
@@ -97,7 +97,7 @@ describe('Authorise', function() {
       .post('/')
       .set('Content-Type', 'application/x-www-form-urlencoded')
       .send({ access_token: 'thom' })
-      .expect(/nightworld/, 200, done);
+      .expect(200, /nightworld/, done);
   });
 
   it('should detect malformed header', function (done) {
@@ -115,7 +115,7 @@ describe('Authorise', function() {
     request(app)
       .get('/')
       .set('Authorization', 'Bearer thom')
-      .expect(/nightworld/, 200, done);
+      .expect(200, /nightworld/, done);
   });
 
   it('should allow exactly one method (get: query + auth)', function (done) {
@@ -182,7 +182,7 @@ describe('Authorise', function() {
 
     request(app)
       .get('/?access_token=thom')
-      .expect(/nightworld/, 200, done);
+      .expect(200, /nightworld/, done);
   });
 
   it('should expose the user id when setting userId', function (done) {
@@ -207,7 +207,7 @@ describe('Authorise', function() {
 
     request(app)
       .get('/?access_token=thom')
-      .expect(/nightworld/, 200, done);
+      .expect(200, /nightworld/, done);
   });
 
   it('should expose the user id when setting user object', function (done) {
@@ -234,7 +234,7 @@ describe('Authorise', function() {
 
     request(app)
       .get('/?access_token=thom')
-      .expect(/nightworld/, 200, done);
+      .expect(200, /nightworld/, done);
   });
 
 });

test/grant.js

@@ -248,7 +248,7 @@ describe('Grant', function() {
         .post('/oauth/token')
         .set('Content-Type', 'application/x-www-form-urlencoded')
         .send(validBody)
-        .expect(/thommy/, 200, done);
+        .expect(200, /thommy/, done);
 
     });
 
@@ -278,7 +278,7 @@ describe('Grant', function() {
         .post('/oauth/token')
         .set('Content-Type', 'application/x-www-form-urlencoded')
         .send(validBody)
-        .expect(/"access_token":"thommy"/, 200, done);
+        .expect(200, /"access_token":"thommy"/, done);
 
     });
   });