Fix #30: correctly report duration for synchronous specs

Author: danielstjules

lib/parallel.js

@@ -219,8 +219,8 @@ function patchIt(specs) {
       name: name,
       getPromise: function() {
         var start = Date.now();
-        return createWrapper(fn, spec.ctx)().then(function() {
-          spec.duration = Date.now() - start;
+        return createWrapper(fn, spec.ctx)().then(function(duration) {
+          spec.duration = duration;
         });
       },
       duration: 0,
@@ -283,7 +283,8 @@ function patchHooks(hooks) {
 
 /**
  * Returns a wrapper for a given runnable's fn, including specs or hooks.
- * Optionally binds the function handler to the passed context.
+ * Optionally binds the function handler to the passed context. Resolves
+ * with the duration of the fn.
  *
  * @param   {function} fn
  * @param   {function} [ctx]
@@ -292,9 +293,11 @@ function patchHooks(hooks) {
 function createWrapper(fn, ctx) {
   return function() {
     return new Promise(function(resolve, reject) {
+      var start = Date.now();
+
       var cb = function(err) {
         if (err) return reject(err);
-        resolve();
+        resolve(Date.now() - start);
       };
 
       // Wrap generator functions
@@ -306,7 +309,9 @@ function createWrapper(fn, ctx) {
 
       // Synchronous spec, or using promises rather than callbacks
       if (!fn.length || (res && res.then)) {
-        resolve(res);
+        Promise.resolve(res).then(function() {
+          resolve(Date.now() - start);
+        });
       }
     });
   };

spec/fixtures/syncTime.js

@@ -0,0 +1,41 @@
+var parallel = require('../../lib/parallel');
+
+/**
+ * This fixture exists in reference to issue #30. The following test suite
+ * previously reported:
+ *
+ *  suite
+ *    ✓ a (110ms)
+ *    ✓ b (109ms)
+ *    ✓ c (52ms)
+ *
+ * but now correctly reports:
+ *
+ *  suite
+ *    ✓ a
+ *    ✓ b (60ms)
+ *    ✓ c (46ms)
+ */
+parallel('suite', function() {
+  this.slow(10);
+
+  it('a', function(done) {
+    done();
+  });
+
+  it('b', function(done) {
+    var a;
+    for (var i = 0; i <= 100000000; i++){
+      a = i;
+    }
+    done();
+  });
+
+  it('c', function(done) {
+    var a;
+    for (var i = 0; i <= 100000000; i++){
+      a = i;
+    }
+    done();
+  });
+});

spec/spec.js

@@ -269,6 +269,16 @@ describe('parallel', function() {
       done();
     });
   });
+
+  it.only('correctly reports duration for synchronous tests', function(done) {
+    run(fixtures.syncTime, function(err, stdout, stderr) {
+      if (err) return done(err);
+
+      assert(!stderr.length);
+      assert.equal(stdout.indexOf('a ('), -1);
+      done();
+    });
+  });
 });
 
 /**