mocha.parallel - npm Package Compare versions

Comparing version 0.8.0 to 0.9.0

fixtures/index.js

@@ -6,3 +6,4 @@ var path = require('path');
   'uncaughtException', 'parallelSkip', 'skip', 'only', 'parallelOnly',
-  'failure', 'assertionFailure', 'parentHooks', 'sync'];
+  'failure', 'assertionFailure', 'parentHooks', 'sync', 'contextSkip',
+  'contextTimeout'];
 
@@ -9,0 +10,0 @@ fixtures.forEach(function(fixture) {

index.js

@@ -11,3 +11,4 @@ var Promise   = require('bluebird');
  * suites.  parallel.only() and it.only() may be used to only wait on the
- * specified specs and suites.
+ * specified specs and suites. Runnable contexts are bound, so this.skip()
+ * may be used from within a spec, but this.timeout() is not supported.
  *
@@ -94,2 +95,20 @@ * @example
 
+    specs.forEach(function(spec) {
+      if (spec.skip) {
+        return it.skip(spec.name);
+      }
+
+      (spec.only ? it.only : it)(spec.name, function() {
+        if (spec.error) throw spec.error;
+        return spec.promise.then(function() {
+          if (spec.error) throw spec.error;
+        });
+      });
+    });
+
+    // Retrieve spec contexts from suite
+    this.tests.forEach(function(test, i) {
+      specs[i].ctx = test.ctx;
+    });
+
     before(function() {
@@ -109,15 +128,2 @@ // Before hook exceptions are handled by mocha
     });
-
-    specs.forEach(function(spec) {
-      if (spec.skip) {
-        return it.skip(spec.name);
-      }
-
-      (spec.only ? it.only : it)(spec.name, function() {
-        if (spec.error) throw spec.error;
-        return spec.promise.then(function() {
-          if (spec.error) throw spec.error;
-        });
-      });
-    });
   });
@@ -159,33 +165,30 @@ }
 
-  it = function it(name, fn) {
-    specs.push({
+  var createSpec = function(name, fn, opts) {
+    opts = opts || {};
+
+    var spec = {
       name: name,
-      getPromise: createWrapper(fn),
-      only: null,
-      skip: null,
+      ctx: null,
+      getPromise: function() {
+        return createWrapper(fn, spec.ctx)();
+      },
+      only: opts.only || null,
+      skip: opts.skip || null,
       error: null,
       promise: null
-    });
+    };
+
+    specs.push(spec);
   };
 
+  it = function it(name, fn) {
+    createSpec(name, fn);
+  };
+
   it.skip = function skip(name, fn) {
-    specs.push({
-      name: name,
-      getPromise: createWrapper(fn),
-      only: null,
-      skip: true,
-      error: null,
-      promise: null
-    });
+    createSpec(name, fn, {skip: true});
   };
 
-  it.only = function skip(name, fn) {
-    specs.push({
-      name: name,
-      getPromise: createWrapper(fn),
-      only: true,
-      skip: null,
-      error: null,
-      promise: null
-    });
+  it.only = function only(name, fn) {
+    createSpec(name, fn, {only: true});
   };
@@ -226,14 +229,18 @@
  * Returns a wrapper for a given runnable's fn, including specs or hooks.
+ * Optionally binds the function handler to the passed context.
  *
  * @param   {function} fn
+ * @param   {function} [ctx]
  * @returns {function}
  */
-function createWrapper(fn) {
+function createWrapper(fn, ctx) {
   return function() {
     return new Promise(function(resolve, reject) {
-      var res = fn(function(err) {
+      var cb = function(err) {
         if (err) return reject(err);
         resolve();
-      });
+      };
 
+      var res = fn.call(ctx || this, cb);
+
       // Synchronous spec, or using promises rather than callbacks
@@ -240,0 +247,0 @@ if (!fn.length || (res && res.then)) {

package.json

 {
   "name": "mocha.parallel",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Run async mocha specs in parallel",
@@ -5,0 +5,0 @@ "main": "index.js",

README.md

@@ -31,3 +31,4 @@ # mocha.parallel
  * suites.  parallel.only() and it.only() may be used to only wait on the
- * specified specs and suites.
+ * specified specs and suites. Runnable contexts are bound, so this.skip()
+ * may be used from within a spec, but this.timeout() is not supported.
  *
@@ -34,0 +35,0 @@ * @example

test.js

@@ -199,2 +199,15 @@ var exec     = require('child_process').exec;
   });
+
+  it('supports this.skip() from a spec', function(done) {
+    var cmd = './node_modules/.bin/mocha ' + fixtures.contextSkip;
+    exec(cmd, function(err, stdout, stderr) {
+      if (err) return done(err);
+
+      assert(!stderr.length);
+      assert(stdout.indexOf('2 passing') !== -1);
+      assert(stdout.indexOf('1 pending') !== -1);
+
+      done();
+    });
+  });
 });
@@ -201,0 +214,0 @@

No alert changes

Improved metrics

Total package byte prevSize

30215

increased by4.95%

Number of package files

23

increased by9.52%

Lines of code

801

increased by4.98%

Number of lines in readme file

226

increased by0.44%

No dependency changes