deps: supertest@1.0.1

chmille4 · May 18, 2015 · 7df8fa3 · 7df8fa3
1 parent 96b4a76
commit 7df8fa3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/examples/params/app.js b/examples/params/app.js
@@ -16,12 +16,20 @@ var users = [
   , { name: 'bandit' }
 ];
 
+// Create HTTP error
+
+function createError(status, message) {
+  var err = new Error(message);
+  err.status = status;
+  return err;
+}
+
 // Convert :to and :from to integers
 
 app.param(['to', 'from'], function(req, res, next, num, name){ 
   req.params[name] = parseInt(num, 10);
   if( isNaN(req.params[name]) ){
-    next(new Error('failed to parseInt '+num));
+    next(createError(400, 'failed to parseInt '+num));
   } else {
     next();
   }
@@ -33,7 +41,7 @@ app.param('user', function(req, res, next, id){
   if (req.user = users[id]) {
     next();
   } else {
-    next(new Error('failed to find user'));
+    next(createError(404, 'failed to find user'));
   }
 });
 

diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "marked": "0.3.3",
     "mocha": "2.2.5",
     "should": "~5.2.0",
-    "supertest": "~0.15.0"
+    "supertest": "1.0.1"
   },
   "engines": {
     "node": ">= 0.8.0"

diff --git a/test/acceptance/mvc.js b/test/acceptance/mvc.js
@@ -35,7 +35,7 @@ describe('mvc', function(){
       .put('/pet/3')
       .set('Content-Type', 'application/x-www-form-urlencoded')
       .send({ pet: { name: 'Boots' } })
-      .end(function(err, res){
+      .expect(302, function (err, res) {
         if (err) return done(err);
         request(app)
         .get('/pet/3/edit')
@@ -98,7 +98,7 @@ describe('mvc', function(){
       .put('/user/1')
       .set('Content-Type', 'application/x-www-form-urlencoded')
       .send({ user: { name: 'Tobo' }})
-      .end(function(err, res){
+      .expect(302, function (err, res) {
         if (err) return done(err);
         request(app)
         .get('/user/1/edit')

diff --git a/test/acceptance/params.js b/test/acceptance/params.js
@@ -21,8 +21,8 @@ describe('params', function(){
   describe('GET /user/9', function(){
     it('should fail to find user', function(done){
       request(app)
-        .get('/user/9')
-        .expect(/failed to find user/,done)
+      .get('/user/9')
+      .expect(404, /failed to find user/, done)
     })
   })
 
@@ -37,8 +37,8 @@ describe('params', function(){
   describe('GET /users/foo-bar', function(){
     it('should fail integer parsing', function(done){
       request(app)
-        .get('/users/foo-bar')
-        .expect(/failed to parseInt foo/,done)
+      .get('/users/foo-bar')
+      .expect(400, /failed to parseInt foo/, done)
     })
   })
 })