.travis.yml

@@ -1,3 +1,6 @@
+arch:
+ - amd64
+ - ppc64le
 language: node_js
 
 node_js:

README.md

@@ -100,7 +100,7 @@ describe('POST /users', function() {
       .expect(200)
       .end(function(err, res) {
         if (err) return done(err);
-        done();
+        return done();
       });
   });
 });
@@ -110,15 +110,17 @@ You can also use promises:
 
 ```js
 describe('GET /users', function() {
-  it('responds with json', function() {
+  it('responds with json', function(done) {
     return request(app)
       .get('/users')
       .set('Accept', 'application/json')
       .expect('Content-Type', /json/)
       .expect(200)
       .then(response => {
           assert(response.body.email, 'foo@bar.com')
+          done();
       })
+      .catch(err => done(err))
   });
 });
 ```

lib/test.js

@@ -64,6 +64,28 @@ Test.prototype.serverAddress = function(app, path) {
   return protocol + '://127.0.0.1:' + port + path;
 };
 
+/**
+ * Wraps an assert function into another.
+ * The wrapper function edit the stack trace of any assertion error, prepending a more useful stack to it.
+ *
+ * @param {Function} assertFn
+ * @returns {Function} wrapped assert function
+ */
+
+function wrapAssertFn(assertFn) {
+  var savedStack = new Error().stack.split('\n').slice(3);
+
+  return function(res) {
+    var badStack;
+    var err = assertFn(res);
+    if (err && err.stack) {
+      badStack = err.stack.replace(err.message, '').split('\n').slice(1);
+      err.stack = [err.message, savedStack, '----', badStack].flat().join('\n');
+    }
+    return err;
+  };
+}
+
 /**
  * Expectations:
  *
@@ -83,30 +105,30 @@ Test.prototype.serverAddress = function(app, path) {
 Test.prototype.expect = function(a, b, c) {
   // callback
   if (typeof a === 'function') {
-    this._asserts.push(a);
+    this._asserts.push(wrapAssertFn(a));
     return this;
   }
   if (typeof b === 'function') this.end(b);
   if (typeof c === 'function') this.end(c);
 
   // status
   if (typeof a === 'number') {
-    this._asserts.push(this._assertStatus.bind(this, a));
+    this._asserts.push(wrapAssertFn(this._assertStatus.bind(this, a)));
     // body
     if (typeof b !== 'function' && arguments.length > 1) {
-      this._asserts.push(this._assertBody.bind(this, b));
+      this._asserts.push(wrapAssertFn(this._assertBody.bind(this, b)));
     }
     return this;
   }
 
   // header field
   if (typeof b === 'string' || typeof b === 'number' || b instanceof RegExp) {
-    this._asserts.push(this._assertHeader.bind(this, { name: '' + a, value: b }));
+    this._asserts.push(wrapAssertFn(this._assertHeader.bind(this, { name: '' + a, value: b })));
     return this;
   }
 
   // body
-  this._asserts.push(this._assertBody.bind(this, a));
+  this._asserts.push(wrapAssertFn(this._assertBody.bind(this, a)));
 
   return this;
 };