mocha 3.5.3 → 5.0.0

package/lib/runner.js

@@ -10,15 +10,10 @@ var utils = require('./utils');
 var inherits = utils.inherits;
 var debug = require('debug')('mocha:runner');
 var Runnable = require('./runnable');
-var filter = utils.filter;
-var indexOf = utils.indexOf;
-var some = utils.some;
-var keys = utils.keys;
 var stackFilter = utils.stackTraceFilter();
 var stringify = utils.stringify;
 var type = utils.type;
 var undefinedError = utils.undefinedError;
-var isArray = utils.isArray;
 
 /**
  * Non-enumerable globals.
@@ -150,11 +145,11 @@ Runner.prototype.grepTotal = function (suite) {
  * @api private
  */
 Runner.prototype.globalProps = function () {
-  var props = keys(global);
+  var props = Object.keys(global);
 
   // non-enumerables
   for (var i = 0; i < globals.length; ++i) {
-    if (~indexOf(props, globals[i])) {
+    if (~props.indexOf(globals[i])) {
       continue;
     }
     props.push(globals[i]);
@@ -229,7 +224,7 @@ Runner.prototype.fail = function (test, err) {
   ++this.failures;
   test.state = 'failed';
 
-  if (!(err instanceof Error || err && typeof err.message === 'string')) {
+  if (!(err instanceof Error || (err && typeof err.message === 'string'))) {
     err = new Error('the ' + type(err) + ' ' + stringify(err) + ' was thrown, throw an Error :)');
   }
 
@@ -316,7 +311,7 @@ Runner.prototype.hook = function (name, fn) {
           if (name === 'beforeEach' || name === 'afterEach') {
             self.test.pending = true;
           } else {
-            utils.forEach(suite.tests, function (test) {
+            suite.tests.forEach(function (test) {
               test.pending = true;
             });
             // a pending hook won't be executed twice.
@@ -429,6 +424,10 @@ Runner.prototype.runTest = function (fn) {
   if (!test) {
     return;
   }
+  if (this.forbidOnly && hasOnly(this.parents().reverse()[0] || this.suite)) {
+    fn(new Error('`.only` forbidden'));
+    return;
+  }
   if (this.asyncOnly) {
     test.asyncOnly = true;
   }
@@ -529,7 +528,13 @@ Runner.prototype.runTests = function (suite, fn) {
     }
 
     if (test.isPending()) {
-      self.emit('pending', test);
+      if (self.forbidPending) {
+        test.isPending = alwaysFalse;
+        self.fail(test, new Error('Pending test forbidden'));
+        delete test.isPending;
+      } else {
+        self.emit('pending', test);
+      }
       self.emit('test end', test);
       return next();
     }
@@ -538,7 +543,13 @@ Runner.prototype.runTests = function (suite, fn) {
     self.emit('test', self.test = test);
     self.hookDown('beforeEach', function (err, errSuite) {
       if (test.isPending()) {
-        self.emit('pending', test);
+        if (self.forbidPending) {
+          test.isPending = alwaysFalse;
+          self.fail(test, new Error('Pending test forbidden'));
+          delete test.isPending;
+        } else {
+          self.emit('pending', test);
+        }
         self.emit('test end', test);
         return next();
       }
@@ -550,7 +561,9 @@ Runner.prototype.runTests = function (suite, fn) {
         test = self.test;
         if (err) {
           var retry = test.currentRetry();
-          if (err instanceof Pending) {
+          if (err instanceof Pending && self.forbidPending) {
+            self.fail(test, new Error('Pending test forbidden'));
+          } else if (err instanceof Pending) {
             test.pending = true;
             self.emit('pending', test);
           } else if (retry < test.retries()) {
@@ -586,6 +599,10 @@ Runner.prototype.runTests = function (suite, fn) {
   next();
 };
 
+function alwaysFalse () {
+  return false;
+}
+
 /**
  * Run the given `suite` and invoke the callback `fn()` when complete.
  *
@@ -722,7 +739,7 @@ Runner.prototype.uncaught = function (err) {
     return;
   }
 
- // recover from hooks
+  // recover from hooks
   if (runnable.type === 'hook') {
     var errSuite = this.suite;
     // if hook failure is in afterEach block
@@ -758,19 +775,19 @@ function cleanSuiteReferences (suite) {
     }
   }
 
-  if (isArray(suite._beforeAll)) {
+  if (Array.isArray(suite._beforeAll)) {
     cleanArrReferences(suite._beforeAll);
   }
 
-  if (isArray(suite._beforeEach)) {
+  if (Array.isArray(suite._beforeEach)) {
     cleanArrReferences(suite._beforeEach);
   }
 
-  if (isArray(suite._afterAll)) {
+  if (Array.isArray(suite._afterAll)) {
     cleanArrReferences(suite._afterAll);
   }
 
-  if (isArray(suite._afterEach)) {
+  if (Array.isArray(suite._afterEach)) {
     cleanArrReferences(suite._afterEach);
   }
 
@@ -794,7 +811,7 @@ Runner.prototype.run = function (fn) {
   var rootSuite = this.suite;
 
   // If there is an `only` filter
-  if (this.hasOnly) {
+  if (hasOnly(rootSuite)) {
     filterOnly(rootSuite);
   }
 
@@ -820,12 +837,6 @@ Runner.prototype.run = function (fn) {
 
   // callback
   this.on('end', function () {
-    if (self.forbidOnly && self.hasOnly) {
-      self.failures += self.stats.tests;
-    }
-    if (self.forbidPending) {
-      self.failures += self.stats.pending;
-    }
     debug('end');
     process.removeListener('uncaughtException', uncaught);
     fn(self.failures);
@@ -874,7 +885,7 @@ function filterOnly (suite) {
   } else {
     // Otherwise, do not run any of the tests in this suite.
     suite.tests = [];
-    utils.forEach(suite._onlySuites, function (onlySuite) {
+    suite._onlySuites.forEach(function (onlySuite) {
       // If there are other `only` tests/suites nested in the current `only` suite, then filter that `only` suite.
       // Otherwise, all of the tests on this `only` suite should be run, so don't filter it.
       if (hasOnly(onlySuite)) {
@@ -882,8 +893,8 @@ function filterOnly (suite) {
       }
     });
     // Run the `only` suites, as well as any other suites that have `only` tests/suites as descendants.
-    suite.suites = filter(suite.suites, function (childSuite) {
-      return indexOf(suite._onlySuites, childSuite) !== -1 || filterOnly(childSuite);
+    suite.suites = suite.suites.filter(function (childSuite) {
+      return suite._onlySuites.indexOf(childSuite) !== -1 || filterOnly(childSuite);
     });
   }
   // Keep the suite only if there is something to run
@@ -898,7 +909,7 @@ function filterOnly (suite) {
  * @api private
  */
 function hasOnly (suite) {
-  return suite._onlyTests.length || suite._onlySuites.length || some(suite.suites, hasOnly);
+  return suite._onlyTests.length || suite._onlySuites.length || suite.suites.some(hasOnly);
 }
 
 /**
@@ -910,7 +921,7 @@ function hasOnly (suite) {
  * @return {Array}
  */
 function filterLeaks (ok, globals) {
-  return filter(globals, function (key) {
+  return globals.filter(function (key) {
     // Firefox and Chrome exposes iframes as index inside the window object
     if (/^\d+/.test(key)) {
       return false;
@@ -934,7 +945,7 @@ function filterLeaks (ok, globals) {
       return false;
     }
 
-    var matched = filter(ok, function (ok) {
+    var matched = ok.filter(function (ok) {
       if (~ok.indexOf('*')) {
         return key.indexOf(ok.split('*')[0]) === 0;
       }
@@ -953,7 +964,7 @@ function filterLeaks (ok, globals) {
 function extraGlobals () {
   if (typeof process === 'object' && typeof process.version === 'string') {
     var parts = process.version.split('.');
-    var nodeVersion = utils.reduce(parts, function (a, v) {
+    var nodeVersion = parts.reduce(function (a, v) {
       return a << 8 | v;
     });
 

package/lib/suite.js

@@ -92,7 +92,7 @@ Suite.prototype.clone = function () {
 };
 
 /**
- * Set timeout `ms` or short-hand such as "2s".
+ * Set or get timeout `ms` or short-hand such as "2s".
  *
  * @api private
  * @param {number|string} ms
@@ -114,7 +114,7 @@ Suite.prototype.timeout = function (ms) {
 };
 
 /**
- * Set number of times to retry a failed test.
+ * Set or get number of times to retry a failed test.
  *
  * @api private
  * @param {number|string} n
@@ -130,7 +130,7 @@ Suite.prototype.retries = function (n) {
 };
 
 /**
-  * Set timeout to `enabled`.
+  * Set or get timeout to `enabled`.
   *
   * @api private
   * @param {boolean} enabled
@@ -146,7 +146,7 @@ Suite.prototype.enableTimeouts = function (enabled) {
 };
 
 /**
- * Set slow `ms` or short-hand such as "2s".
+ * Set or get slow `ms` or short-hand such as "2s".
  *
  * @api private
  * @param {number|string} ms
@@ -165,7 +165,7 @@ Suite.prototype.slow = function (ms) {
 };
 
 /**
- * Sets whether to bail after first error.
+ * Set or get whether to bail after first error.
  *
  * @api private
  * @param {boolean} bail
@@ -355,13 +355,25 @@ Suite.prototype.addTest = function (test) {
  * @return {string}
  */
 Suite.prototype.fullTitle = function () {
+  return this.titlePath().join(' ');
+};
+
+/**
+ * Return the title path generated by recursively concatenating the parent's
+ * title path.
+ *
+ * @api public
+ * @return {string}
+ */
+Suite.prototype.titlePath = function () {
+  var result = [];
   if (this.parent) {
-    var full = this.parent.fullTitle();
-    if (full) {
-      return full + ' ' + this.title;
-    }
+    result = result.concat(this.parent.titlePath());
+  }
+  if (!this.root) {
+    result.push(this.title);
   }
-  return this.title;
+  return result;
 };
 
 /**
@@ -371,7 +383,7 @@ Suite.prototype.fullTitle = function () {
  * @return {number}
  */
 Suite.prototype.total = function () {
-  return utils.reduce(this.suites, function (sum, suite) {
+  return this.suites.reduce(function (sum, suite) {
     return sum + suite.total();
   }, 0) + this.tests.length;
 };
@@ -385,8 +397,8 @@ Suite.prototype.total = function () {
  * @return {Suite}
  */
 Suite.prototype.eachTest = function (fn) {
-  utils.forEach(this.tests, fn);
-  utils.forEach(this.suites, function (suite) {
+  this.tests.forEach(fn);
+  this.suites.forEach(function (suite) {
     suite.eachTest(fn);
   });
   return this;

package/lib/test.js

@@ -5,8 +5,8 @@
  */
 
 var Runnable = require('./runnable');
-var create = require('lodash.create');
-var isString = require('./utils').isString;
+var utils = require('./utils');
+var isString = utils.isString;
 
 /**
  * Expose `Test`.
@@ -33,9 +33,7 @@ function Test (title, fn) {
 /**
  * Inherit from `Runnable.prototype`.
  */
-Test.prototype = create(Runnable.prototype, {
-  constructor: Test
-});
+utils.inherits(Test, Runnable);
 
 Test.prototype.clone = function () {
   var test = new Test(this.title, this.fn);

package/lib/utils.js

@@ -6,10 +6,9 @@
  * Module dependencies.
  */
 
-var JSON = require('json3');
 var basename = require('path').basename;
 var debug = require('debug')('mocha:watch');
-var exists = require('fs').existsSync || require('path').existsSync;
+var exists = require('fs').existsSync;
 var glob = require('glob');
 var path = require('path');
 var join = path.join;
@@ -17,7 +16,6 @@ var readdirSync = require('fs').readdirSync;
 var statSync = require('fs').statSync;
 var watchFile = require('fs').watchFile;
 var lstatSync = require('fs').lstatSync;
-var toISOString = require('./to-iso-string');
 var he = require('he');
 
 /**
@@ -39,20 +37,6 @@ exports.escape = function (html) {
   return he.encode(String(html), { useNamedReferences: false });
 };
 
-/**
- * Array#forEach (<=IE8)
- *
- * @api private
- * @param {Array} arr
- * @param {Function} fn
- * @param {Object} scope
- */
-exports.forEach = function (arr, fn, scope) {
-  for (var i = 0, l = arr.length; i < l; i++) {
-    fn.call(scope, arr[i], i);
-  }
-};
-
 /**
  * Test if the given obj is type of string.
  *
@@ -64,118 +48,6 @@ exports.isString = function (obj) {
   return typeof obj === 'string';
 };
 
-/**
- * Array#map (<=IE8)
- *
- * @api private
- * @param {Array} arr
- * @param {Function} fn
- * @param {Object} scope
- * @return {Array}
- */
-exports.map = function (arr, fn, scope) {
-  var result = [];
-  for (var i = 0, l = arr.length; i < l; i++) {
-    result.push(fn.call(scope, arr[i], i, arr));
-  }
-  return result;
-};
-
-/**
- * Array#indexOf (<=IE8)
- *
- * @api private
- * @param {Array} arr
- * @param {Object} obj to find index of
- * @param {number} start
- * @return {number}
- */
-var indexOf = exports.indexOf = function (arr, obj, start) {
-  for (var i = start || 0, l = arr.length; i < l; i++) {
-    if (arr[i] === obj) {
-      return i;
-    }
-  }
-  return -1;
-};
-
-/**
- * Array#reduce (<=IE8)
- *
- * @api private
- * @param {Array} arr
- * @param {Function} fn
- * @param {Object} val Initial value.
- * @return {*}
- */
-var reduce = exports.reduce = function (arr, fn, val) {
-  var rval = val;
-
-  for (var i = 0, l = arr.length; i < l; i++) {
-    rval = fn(rval, arr[i], i, arr);
-  }
-
-  return rval;
-};
-
-/**
- * Array#filter (<=IE8)
- *
- * @api private
- * @param {Array} arr
- * @param {Function} fn
- * @return {Array}
- */
-exports.filter = function (arr, fn) {
-  var ret = [];
-
-  for (var i = 0, l = arr.length; i < l; i++) {
-    var val = arr[i];
-    if (fn(val, i, arr)) {
-      ret.push(val);
-    }
-  }
-
-  return ret;
-};
-
-/**
- * Array#some (<=IE8)
- *
- * @api private
- * @param {Array} arr
- * @param {Function} fn
- * @return {Array}
- */
-exports.some = function (arr, fn) {
-  for (var i = 0, l = arr.length; i < l; i++) {
-    if (fn(arr[i])) {
-      return true;
-    }
-  }
-  return false;
-};
-
-/**
- * Object.keys (<=IE8)
- *
- * @api private
- * @param {Object} obj
- * @return {Array} keys
- */
-exports.keys = typeof Object.keys === 'function' ? Object.keys : function (obj) {
-  var keys = [];
-  var has = Object.prototype.hasOwnProperty; // for `window` on <=IE8
-
-  for (var key in obj) {
-    if (has.call(obj, key)) {
-      keys.push(key);
-    }
-  }
-
-  return keys;
-};
-
 /**
  * Watch the given `files` for changes
  * and invoke `fn(file)` on modification.
@@ -196,30 +68,6 @@ exports.watch = function (files, fn) {
   });
 };
 
-/**
- * Array.isArray (<=IE8)
- *
- * @api private
- * @param {Object} obj
- * @return {Boolean}
- */
-var isArray = typeof Array.isArray === 'function' ? Array.isArray : function (obj) {
-  return Object.prototype.toString.call(obj) === '[object Array]';
-};
-
-exports.isArray = isArray;
-
-/**
- * Buffer.prototype.toJSON polyfill.
- *
- * @type {Function}
- */
-if (typeof Buffer !== 'undefined' && Buffer.prototype) {
-  Buffer.prototype.toJSON = Buffer.prototype.toJSON || function () {
-    return Array.prototype.slice.call(this, 0);
-  };
-}
-
 /**
  * Ignored files.
  *
@@ -292,18 +140,7 @@ exports.clean = function (str) {
 
   str = str.replace(re, '');
 
-  return exports.trim(str);
-};
-
-/**
- * Trim the given `str`.
- *
- * @api private
- * @param {string} str
- * @return {string}
- */
-exports.trim = function (str) {
-  return str.replace(/^\s+|\s+$/g, '');
+  return str.trim();
 };
 
 /**
@@ -314,7 +151,7 @@ exports.trim = function (str) {
  * @return {Object}
  */
 exports.parseQuery = function (qs) {
-  return reduce(qs.replace('?', '').split('&'), function (obj, pair) {
+  return qs.replace('?', '').split('&').reduce(function (obj, pair) {
     var i = pair.indexOf('=');
     var key = pair.slice(0, i);
     var val = pair.slice(++i);
@@ -411,7 +248,7 @@ var type = exports.type = function type (value) {
     return 'undefined';
   } else if (value === null) {
     return 'null';
-  } else if (typeof Buffer !== 'undefined' && Buffer.isBuffer(value)) {
+  } else if (Buffer.isBuffer(value)) {
     return 'buffer';
   }
   return Object.prototype.toString.call(value)
@@ -437,9 +274,9 @@ var type = exports.type = function type (value) {
 exports.stringify = function (value) {
   var typeHint = type(value);
 
-  if (!~indexOf(['object', 'array', 'function'], typeHint)) {
+  if (!~['object', 'array', 'function'].indexOf(typeHint)) {
     if (typeHint === 'buffer') {
-      var json = value.toJSON();
+      var json = Buffer.prototype.toJSON.call(value);
       // Based on the toJSON result
       return jsonStringify(json.data && json.type ? json.data : json, 2)
         .replace(/,(\n|$)/g, '$1');
@@ -448,7 +285,7 @@ exports.stringify = function (value) {
     // IE7/IE8 has a bizarre String constructor; needs to be coerced
     // into an array and back to obj.
     if (typeHint === 'string' && typeof value === 'object') {
-      value = reduce(value.split(''), function (acc, char, idx) {
+      value = value.split('').reduce(function (acc, char, idx) {
         acc[idx] = char;
         return acc;
       }, {});
@@ -484,9 +321,9 @@ function jsonStringify (object, spaces, depth) {
 
   depth = depth || 1;
   var space = spaces * depth;
-  var str = isArray(object) ? '[' : '{';
-  var end = isArray(object) ? ']' : '}';
-  var length = typeof object.length === 'number' ? object.length : exports.keys(object).length;
+  var str = Array.isArray(object) ? '[' : '{';
+  var end = Array.isArray(object) ? ']' : '}';
+  var length = typeof object.length === 'number' ? object.length : Object.keys(object).length;
   // `.repeat()` polyfill
   function repeat (s, n) {
     return new Array(n).join(s);
@@ -511,12 +348,7 @@ function jsonStringify (object, spaces, depth) {
           : val.toString();
         break;
       case 'date':
-        var sDate;
-        if (isNaN(val.getTime())) { // Invalid date
-          sDate = val.toString();
-        } else {
-          sDate = val.toISOString ? val.toISOString() : toISOString(val);
-        }
+        var sDate = isNaN(val.getTime()) ? val.toString() : val.toISOString();
         val = '[Date: ' + sDate + ']';
         break;
       case 'buffer':
@@ -539,9 +371,9 @@ function jsonStringify (object, spaces, depth) {
     }
     --length;
     str += '\n ' + repeat(' ', space) +
-      (isArray(object) ? '' : '"' + i + '": ') + // key
-      _stringify(object[i]) +                    // value
-      (length ? ',' : '');                       // comma
+      (Array.isArray(object) ? '' : '"' + i + '": ') + // key
+      _stringify(object[i]) + // value
+      (length ? ',' : ''); // comma
   }
 
   return str +
@@ -549,17 +381,6 @@ function jsonStringify (object, spaces, depth) {
     (str.length !== 1 ? '\n' + repeat(' ', --space) + end : end);
 }
 
-/**
- * Test if a value is a buffer.
- *
- * @api private
- * @param {*} value The value to test.
- * @return {boolean} True if `value` is a buffer, otherwise false
- */
-exports.isBuffer = function (value) {
-  return typeof Buffer !== 'undefined' && Buffer.isBuffer(value);
-};
-
 /**
  * Return a new Thing that has the keys in sorted order. Recursive.
  *
@@ -593,7 +414,7 @@ exports.canonicalize = function canonicalize (value, stack, typeHint) {
 
   stack = stack || [];
 
-  if (indexOf(stack, value) !== -1) {
+  if (stack.indexOf(value) !== -1) {
     return '[Circular]';
   }
 
@@ -605,7 +426,7 @@ exports.canonicalize = function canonicalize (value, stack, typeHint) {
       break;
     case 'array':
       withStack(value, function () {
-        canonicalizedObj = exports.map(value, function (item) {
+        canonicalizedObj = value.map(function (item) {
           return exports.canonicalize(item, stack);
         });
       });
@@ -625,7 +446,7 @@ exports.canonicalize = function canonicalize (value, stack, typeHint) {
     case 'object':
       canonicalizedObj = canonicalizedObj || {};
       withStack(value, function () {
-        exports.forEach(exports.keys(value).sort(), function (key) {
+        Object.keys(value).sort().forEach(function (key) {
           canonicalizedObj[key] = exports.canonicalize(value[key], stack);
         });
       });
@@ -655,7 +476,6 @@ exports.canonicalize = function canonicalize (value, stack, typeHint) {
  */
 exports.lookupFiles = function lookupFiles (path, extensions, recursive) {
   var files = [];
-  var re = new RegExp('\\.(' + extensions.join('|') + ')$');
 
   if (!exists(path)) {
     if (exists(path + '.js')) {
@@ -693,6 +513,7 @@ exports.lookupFiles = function lookupFiles (path, extensions, recursive) {
       // ignore error
       return;
     }
+    var re = new RegExp('\\.(?:' + extensions.join('|') + ')$');
     if (!stat.isFile() || !re.test(file) || basename(file)[0] === '.') {
       return;
     }
@@ -765,7 +586,7 @@ exports.stackTraceFilter = function () {
   return function (stack) {
     stack = stack.split('\n');
 
-    stack = reduce(stack, function (list, line) {
+    stack = stack.reduce(function (list, line) {
       if (isMochaInternal(line)) {
         return list;
       }