Cleanup

Author: danielstjules

context-proxy.js

@@ -0,0 +1,88 @@
+/**
+ * Proxy class for test and suite contexts.
+ *
+ * @param {Spec} [spec]
+ */
+function ContextProxy(spec) {
+  this.spec = spec;
+  this.config = {};
+}
+
+/**
+ * Set test timeout.
+ *
+ * @param  {number}       ms
+ * @return {ContextProxy}
+ */
+ContextProxy.prototype.timeout = function(ms) {
+  this.config.timeout = ms;
+  if (!this.spec) return this;
+  this.spec.timeout = setTimeout(function() {
+    var error = new Error('timeout of ' + ms + 'ms exceeded. Ensure the ' +
+      'done() callback is being called in this test.');
+    error.stack = null;
+    throw error;
+  }, ms);
+  return this;
+};
+
+/**
+ * Set test slowness threshold.
+ *
+ * @param  {number}       ms
+ * @return {ContextProxy}
+ */
+ContextProxy.prototype.slow = function(ms) {
+  this.config.slow = ms;
+  return this;
+};
+
+/**
+ * Mark a test as skipped.
+ *
+ * @return {ContextProxy}
+ */
+ContextProxy.prototype.skip = function() {
+  this.config.skip = true;
+  return this;
+};
+
+/**
+ * Overrides original context behavior and configuration.
+ *
+ * @param {Context} ctx
+ */
+ContextProxy.prototype.patchContext = function(ctx) {
+  if (this.spec && this.spec.timeout) {
+    ctx.timeout(0);
+  } else if (this.config.timeout) {
+    ctx.timeout(this.config.timeout);
+  }
+
+  if (this.config.slow) {
+    ctx.slow(this.config.slow);
+  }
+
+  if (this.config.skip) {
+    ctx.skip();
+  }
+
+  // Derive correct runnable duration
+  if (this.spec && ctx.runnable) {
+    var spec = this.spec;
+    var originalDuration = ctx.runnable().duration;
+    delete ctx.runnable().duration;
+    Object.defineProperty(ctx.runnable(), 'duration', {
+      get: function () {
+        return spec.duration || originalDuration;
+      },
+      set: function (duration) {
+        originalDuration = duration;
+      },
+      enumerable: true,
+      configurable: true
+    });
+  }
+};
+
+module.exports = ContextProxy;

fixtures/proxyContext.js

@@ -1,7 +1,7 @@
-var Promise            = require('bluebird');
-var domain             = require('domain');
-var ContextProxy    = require('./context-proxy');
-var hookTypes = ['before', 'beforeEach', 'afterEach', 'after'];
+var Promise      = require('bluebird');
+var domain       = require('domain');
+var ContextProxy = require('./contextProxy');
+var hookTypes    = ['before', 'beforeEach', 'afterEach', 'after'];
 
 /**
  * Generates a suite for parallel execution of individual specs. While each
@@ -58,8 +58,8 @@ function _parallel(name, fn, key) {
   var restoreUncaught;
   var parentHooks;
   var run;
-  var parallel_ctx = new ContextProxy();
-  fn.call(parallel_ctx);
+  var parallelCtx = new ContextProxy();
+  fn.call(parallelCtx);
 
   restoreIt();
   restoreHooks();
@@ -103,7 +103,7 @@ function _parallel(name, fn, key) {
   };
 
   (key ? describe[key] : describe)(name, function() {
-    parallel_ctx.patchContext(this);
+    parallelCtx.patchContext(this);
     var parentContext = this;
     if (!specs.length) return;
 
@@ -194,11 +194,9 @@ function patchIt(specs) {
     var spec = {
       name: name,
       getPromise: function() {
-        return Promise.resolve().then(function () {
-          var start = new Date();
-          return createWrapper(fn, spec.ctx)().then(function () {
-            spec.duration = (new Date()) - start;
-          });
+        var start = Date.now();
+        return createWrapper(fn, spec.ctx)().then(function() {
+          spec.duration = Date.now() - start;
         });
       },
       duration: 0,

lib/contextProxy.js

@@ -2,9 +2,9 @@
   "name": "mocha.parallel",
   "version": "0.12.0",
   "description": "Run async mocha specs in parallel",
-  "main": "index.js",
+  "main": "lib/parallel.js",
   "scripts": {
-    "test": "mocha test.js"
+    "test": "mocha spec/spec.js"
   },
   "repository": {
     "type": "git",

index.js lib/parallel.jsindex.js renamed to lib/parallel.js

@@ -1,4 +1,4 @@
-var parallel = require('../index.js');
+var parallel = require('../../lib/parallel');
 var assert   = require('assert');
 
 parallel('suite', function() {

package.json

@@ -0,0 +1,26 @@
+var parallel = require('../../lib/parallel');
+var assert   = require('assert');
+
+parallel('suite', function () {
+  this.timeout(3000);
+  this.slow(2600);
+
+  it('test1', function(done) {
+    this.timeout(100);
+    setTimeout(done, 500);
+  });
+
+  it('test2', function(done) {
+    this.skip();
+    setTimeout(done, 500);
+  });
+
+  it('test3', function(done) {
+    this.slow(200);
+    setTimeout(done, 500);
+  });
+
+  it('test4', function(done) {
+    setTimeout(done, 2500);
+  });
+});

fixtures/assertionFailure.js spec/fixtures/assertionFailure.jsfixtures/assertionFailure.js renamed to spec/fixtures/assertionFailure.js

@@ -1,4 +1,4 @@
-var parallel = require('../index.js');
+var parallel = require('../../lib/parallel');
 
 parallel('suite', function() {
   it('test1', function(done) {

spec/fixtures/contextProxy.js

@@ -1,4 +1,4 @@
-var parallel = require('../index.js');
+var parallel = require('../../lib/parallel');
 
 describe('parent', function() {
   this.timeout(0);

fixtures/contextSkip.js spec/fixtures/contextSkip.jsfixtures/contextSkip.js renamed to spec/fixtures/contextSkip.js

@@ -1,4 +1,4 @@
-var parallel = require('../index.js');
+var parallel = require('../../lib/parallel');
 var Promise = require('bluebird');
 //Based on issue #13