mocha 2.3.0 → 2.3.4

package/lib/reporters/spec.js

@@ -3,7 +3,7 @@
  */
 
 var Base = require('./base');
-var create = require('lodash.create');
+var inherits = require('../utils').inherits;
 var color = Base.color;
 var cursor = Base.cursor;
 
@@ -80,7 +80,4 @@ function Spec(runner) {
 /**
  * Inherit from `Base.prototype`.
  */
-
-Spec.prototype = create(Base.prototype, {
-  constructor: Spec
-});
+inherits(Spec, Base);

package/lib/reporters/templates/coverage.jade

@@ -17,7 +17,7 @@ html
         .misses= cov.misses
 
       #files
-        each file in cov.files
+        for file in cov.files
           .file
             h2(id=file.filename)= file.filename
             #stats(class=coverageClass(file.coverage))
@@ -33,7 +33,7 @@ html
                   th Hits
                   th Source
               tbody
-                each line, number in file.source
+                for line, number in file.source
                   if line.coverage > 0
                     tr.hit
                       td.line= number

package/lib/reporters/templates/menu.jade

@@ -1,12 +1,12 @@
 #menu
   li
     a(href='#overview') overview
-  each file in cov.files
+  for file in cov.files
     li
       span.cov(class=coverageClass(file.coverage)) #{file.coverage | 0}
       a(href='##{file.filename}')
-        - var segments = file.filename.split('/')
-        - var basename = segments.pop()
+        segments = file.filename.split('/')
+        basename = segments.pop()
         if segments.length
           span.dirname= segments.join('/') + '/'
         span.basename= basename

package/lib/reporters/xunit.js

@@ -3,9 +3,10 @@
  */
 
 var Base = require('./base');
-var create = require('lodash.create');
+var utils = require('../utils');
+var inherits = utils.inherits;
 var fs = require('fs');
-var escape = require('../utils').escape;
+var escape = utils.escape;
 
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
@@ -76,6 +77,11 @@ function XUnit(runner, options) {
   });
 }
 
+/**
+ * Inherit from `Base.prototype`.
+ */
+inherits(XUnit, Base);
+
 /**
  * Override done to close the stream (if it's a file).
  *
@@ -92,14 +98,6 @@ XUnit.prototype.done = function(failures, fn) {
   }
 };
 
-/**
- * Inherit from `Base.prototype`.
- */
-
-XUnit.prototype = create(Base.prototype, {
-  constructor: XUnit
-});
-
 /**
  * Write out the given line.
  *

package/lib/runnable.js

@@ -4,10 +4,10 @@
 
 var EventEmitter = require('events').EventEmitter;
 var Pending = require('./pending');
-var create = require('lodash.create');
 var debug = require('debug')('mocha:runnable');
 var milliseconds = require('./ms');
 var utils = require('./utils');
+var inherits = utils.inherits;
 
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
@@ -57,10 +57,7 @@ function Runnable(title, fn) {
 /**
  * Inherit from `EventEmitter.prototype`.
  */
-
-Runnable.prototype = create(EventEmitter.prototype, {
-  constructor: Runnable
-});
+inherits(Runnable, EventEmitter);
 
 /**
  * Set & get timeout `ms`.

package/lib/runner.js

@@ -4,15 +4,17 @@
 
 var EventEmitter = require('events').EventEmitter;
 var Pending = require('./pending');
-var create = require('lodash.create');
+var utils = require('./utils');
+var inherits = utils.inherits;
 var debug = require('debug')('mocha:runner');
-var filter = require('./utils').filter;
-var indexOf = require('./utils').indexOf;
-var keys = require('./utils').keys;
-var stackFilter = require('./utils').stackTraceFilter();
-var stringify = require('./utils').stringify;
-var type = require('./utils').type;
-var undefinedError = require('./utils').undefinedError;
+var Runnable = require('./runnable');
+var filter = utils.filter;
+var indexOf = utils.indexOf;
+var keys = utils.keys;
+var stackFilter = utils.stackTraceFilter();
+var stringify = utils.stringify;
+var type = utils.type;
+var undefinedError = utils.undefinedError;
 
 /**
  * Non-enumerable globals.
@@ -63,6 +65,7 @@ function Runner(suite, delay) {
   this._abort = false;
   this._delay = delay;
   this.suite = suite;
+  this.started = false;
   this.total = suite.total();
   this.failures = 0;
   this.on('test end', function(test) {
@@ -87,10 +90,7 @@ Runner.immediately = global.setImmediate || process.nextTick;
 /**
  * Inherit from `EventEmitter.prototype`.
  */
-
-Runner.prototype = create(EventEmitter.prototype, {
-  constructor: Runner
-});
+inherits(Runner, EventEmitter);
 
 /**
  * Run tests with full titles matching `re`. Updates runner.total
@@ -288,12 +288,13 @@ Runner.prototype.hook = function(name, fn) {
 
     self.emit('hook', hook);
 
-    hook.on('error', function(err) {
-      self.failHook(hook, err);
-    });
+    if (!hook.listeners('error').length) {
+      hook.on('error', function(err) {
+        self.failHook(hook, err);
+      });
+    }
 
     hook.run(function(err) {
-      hook.removeAllListeners('error');
       var testError = hook.error();
       if (testError) {
         self.fail(self.test, testError);
@@ -388,7 +389,8 @@ Runner.prototype.hookDown = function(name, fn) {
 Runner.prototype.parents = function() {
   var suite = this.suite;
   var suites = [];
-  while (suite = suite.parent) {
+  while (suite.parent) {
+    suite = suite.parent;
     suites.push(suite);
   }
   return suites;
@@ -569,7 +571,7 @@ Runner.prototype.runSuite = function(suite, fn) {
 
   debug('run suite %s', suite.fullTitle());
 
-  if (!total) {
+  if (!total || (self.failures && suite._bail)) {
     return fn();
   }
 
@@ -654,7 +656,20 @@ Runner.prototype.uncaught = function(err) {
   err.uncaught = true;
 
   var runnable = this.currentRunnable;
+
   if (!runnable) {
+    runnable = new Runnable('Uncaught error outside test suite');
+    runnable.parent = this.suite;
+
+    if (this.started) {
+      this.fail(runnable, err);
+    } else {
+      // Can't recover from this failure
+      this.emit('start');
+      this.fail(runnable, err);
+      this.emit('end');
+    }
+
     return;
   }
 
@@ -713,6 +728,7 @@ Runner.prototype.run = function(fn) {
   }
 
   function start() {
+    self.started = true;
     self.emit('start');
     self.runSuite(rootSuite, function() {
       debug('finished running');
@@ -808,7 +824,8 @@ function filterLeaks(ok, globals) {
  */
 function extraGlobals() {
   if (typeof process === 'object' && typeof process.version === 'string') {
-    var nodeVersion = process.version.split('.').reduce(function(a, v) {
+    var parts = process.version.split('.');
+    var nodeVersion = utils.reduce(parts, function(a, v) {
       return a << 8 | v;
     });
 

package/lib/suite.js

@@ -4,10 +4,10 @@
 
 var EventEmitter = require('events').EventEmitter;
 var Hook = require('./hook');
-var create = require('lodash.create');
+var utils = require('./utils');
+var inherits = utils.inherits;
 var debug = require('debug')('mocha:suite');
 var milliseconds = require('./ms');
-var utils = require('./utils');
 
 /**
  * Expose `Suite`.
@@ -66,10 +66,7 @@ function Suite(title, parentContext) {
 /**
  * Inherit from `EventEmitter.prototype`.
  */
-
-Suite.prototype = create(EventEmitter.prototype, {
-  constructor: Suite
-});
+inherits(Suite, EventEmitter);
 
 /**
  * Return a clone of this `Suite`.

package/lib/test.js

@@ -3,7 +3,7 @@
  */
 
 var Runnable = require('./runnable');
-var create = require('lodash.create');
+var inherits = require('./utils').inherits;
 
 /**
  * Expose `Test`.
@@ -27,7 +27,4 @@ function Test(title, fn) {
 /**
  * Inherit from `Runnable.prototype`.
  */
-
-Test.prototype = create(Runnable.prototype, {
-  constructor: Test
-});
+inherits(Test, Runnable);

package/lib/utils.js

@@ -19,6 +19,8 @@ var watchFile = require('fs').watchFile;
 
 var ignore = ['node_modules', '.git'];
 
+exports.inherits = require('util').inherits;
+
 /**
  * Escape special characters in the given string of html.
  *
@@ -687,7 +689,7 @@ exports.getError = function(err) {
  * @description
  * When invoking this function you get a filter function that get the Error.stack as an input,
  * and return a prettify output.
- * (i.e: strip Mocha, node_modules, bower and componentJS from stack trace).
+ * (i.e: strip Mocha and internal node functions from stack trace).
  * @returns {Function}
  */
 exports.stackTraceFilter = function() {
@@ -699,14 +701,10 @@ exports.stackTraceFilter = function() {
       : (typeof location === 'undefined' ? window.location : location).href.replace(/\/[^\/]*$/, '/');
 
   function isMochaInternal(line) {
-    return (~line.indexOf('node_modules' + slash + 'mocha'))
-      || (~line.indexOf('components' + slash + 'mochajs'))
-      || (~line.indexOf('components' + slash + 'mocha'));
-  }
-
-  // node_modules, bower, componentJS
-  function isBrowserModule(line) {
-    return (~line.indexOf('node_modules')) || (~line.indexOf('components'));
+    return (~line.indexOf('node_modules' + slash + 'mocha' + slash))
+      || (~line.indexOf('components' + slash + 'mochajs' + slash))
+      || (~line.indexOf('components' + slash + 'mocha' + slash))
+      || (~line.indexOf(slash + 'mocha.js'));
   }
 
   function isNodeInternal(line) {
@@ -722,11 +720,11 @@ exports.stackTraceFilter = function() {
     stack = stack.split('\n');
 
     stack = exports.reduce(stack, function(list, line) {
-      if (is.node && (isMochaInternal(line) || isNodeInternal(line))) {
+      if (isMochaInternal(line)) {
         return list;
       }
 
-      if (is.browser && (isBrowserModule(line))) {
+      if (is.node && isNodeInternal(line)) {
         return list;
       }