Promised supertest

.eslintrc

@@ -4,6 +4,9 @@
     "node": true,
     "mocha": true
   },
+  "globals": {
+    "Promise": true
+  },
   "rules": {
     // disabled - disagree with airbnb
     "func-names": [0],

Readme.md

@@ -211,6 +211,10 @@ describe('request.agent(app)', function(){
 
   Perform the request and invoke `fn(err, res)`.
 
+### .then(onFulfilled, onRejected)
+
+  Perform the request and return a promise.
+
 ## Notes
 
   Inspired by [api-easy](https://github.com/flatiron/api-easy) minus vows coupling.

lib/test.js

@@ -135,6 +135,28 @@ Test.prototype.end = function(fn) {
   return this;
 };
 
+/**
+ * Perform assertions as a Promise.
+ *
+ * @param {Function} onFulfilled
+ * @param {Function} onRejected
+ * @api public
+ */
+
+Test.prototype.then = function(onFulfilled, onRejected) {
+  var self = this;
+
+  return new Promise(function(resolve, reject) {
+    self.end(function(err, res) {
+      if (err) {
+        return reject(err);
+      }
+
+      resolve(res);
+    });
+  }).then(onFulfilled, onRejected);
+};
+
 /**
  * Perform assertions and invoke `fn(err, res)`.
  *

test/supertest.js

@@ -342,6 +342,46 @@ describe('request(app)', function() {
     });
   });
 
+  describe('.then(onFulfilled, onRejected)', function() {
+    it('should close the server and return a Promise on a fullfilled result', function(done) {
+      var app = express();
+      var test;
+
+      app.get('/', function(req, res) {
+        res.send('promises FTW!');
+      });
+
+      test = request(app)
+      .get('/')
+      .expect(200);
+
+      test.then(function() {}).should.be.an.instanceOf(Promise);
+
+      test._server.on('close', function() {
+        done();
+      });
+    });
+
+    it('should close the server and return a Promise on a rejected result', function(done) {
+      var app = express();
+      var test;
+
+      app.get('/', function(req, res) {
+        res.send('promises FTW!');
+      });
+
+      test = request(app)
+      .get('/')
+      .expect(404);
+
+      test.then(function () {}, function() {}).should.be.an.instanceOf(Promise);
+
+      test._server.on('close', function() {
+        done();
+      });
+    });
+  });
+
   describe('.expect(status[, fn])', function() {
     it('should assert the response status', function(done) {
       var app = express();