mocha 5.1.0 → 6.0.0-1

package/lib/mocharc.json

@@ -0,0 +1,10 @@
+{
+  "diff": true,
+  "extension": ["js"],
+  "opts": "./test/mocha.opts",
+  "package": "./package.json",
+  "reporter": "spec",
+  "slow": 75,
+  "timeout": 2000,
+  "ui": "bdd"
+}

package/lib/pending.js

@@ -1,9 +1,5 @@
 'use strict';
 
-/**
- * Expose `Pending`.
- */
-
 module.exports = Pending;
 
 /**
@@ -11,6 +7,6 @@ module.exports = Pending;
  *
  * @param {string} message
  */
-function Pending (message) {
+function Pending(message) {
   this.message = message;
 }

package/lib/reporters/base.js

@@ -8,7 +8,7 @@
 
 var tty = require('tty');
 var diff = require('diff');
-var ms = require('../ms');
+var milliseconds = require('ms');
 var utils = require('../utils');
 var supportsColor = process.browser ? null : require('supports-color');
 
@@ -18,19 +18,6 @@ var supportsColor = process.browser ? null : require('supports-color');
 
 exports = module.exports = Base;
 
-/**
- * Save timer references to avoid Sinon interfering.
- * See: https://github.com/mochajs/mocha/issues/237
- */
-
-/* eslint-disable no-unused-vars, no-native-reassign */
-var Date = global.Date;
-var setTimeout = global.setTimeout;
-var setInterval = global.setInterval;
-var clearTimeout = global.clearTimeout;
-var clearInterval = global.clearInterval;
-/* eslint-enable no-unused-vars, no-native-reassign */
-
 /**
  * Check if both stdio streams are associated with a tty.
  */
@@ -41,7 +28,9 @@ var isatty = tty.isatty(1) && tty.isatty(2);
  * Enable coloring by default, except in the browser interface.
  */
 
-exports.useColors = !process.browser && (supportsColor || (process.env.MOCHA_COLORS !== undefined));
+exports.useColors =
+  !process.browser &&
+  (supportsColor.stdout || process.env.MOCHA_COLORS !== undefined);
 
 /**
  * Inline diffs instead of +/-
@@ -103,14 +92,14 @@ if (process.platform === 'win32') {
  * @param {string} type
  * @param {string} str
  * @return {string}
- * @api private
+ * @private
  */
-var color = exports.color = function (type, str) {
+var color = (exports.color = function(type, str) {
   if (!exports.useColors) {
     return String(str);
   }
   return '\u001b[' + exports.colors[type] + 'm' + str + '\u001b[0m';
-};
+});
 
 /**
  * Expose term window size, with some defaults for when stderr is not a tty.
@@ -131,23 +120,23 @@ if (isatty) {
  */
 
 exports.cursor = {
-  hide: function () {
+  hide: function() {
     isatty && process.stdout.write('\u001b[?25l');
   },
 
-  show: function () {
+  show: function() {
     isatty && process.stdout.write('\u001b[?25h');
   },
 
-  deleteLine: function () {
+  deleteLine: function() {
     isatty && process.stdout.write('\u001b[2K');
   },
 
-  beginningOfLine: function () {
+  beginningOfLine: function() {
     isatty && process.stdout.write('\u001b[0G');
   },
 
-  CR: function () {
+  CR: function() {
     if (isatty) {
       exports.cursor.deleteLine();
       exports.cursor.beginningOfLine();
@@ -157,11 +146,16 @@ exports.cursor = {
   }
 };
 
-function showDiff (err) {
-  return err && err.showDiff !== false && sameType(err.actual, err.expected) && err.expected !== undefined;
+function showDiff(err) {
+  return (
+    err &&
+    err.showDiff !== false &&
+    sameType(err.actual, err.expected) &&
+    err.expected !== undefined
+  );
 }
 
-function stringifyDiffObjs (err) {
+function stringifyDiffObjs(err) {
   if (!utils.isString(err.actual) || !utils.isString(err.expected)) {
     err.actual = utils.stringify(err.actual);
     err.expected = utils.stringify(err.expected);
@@ -178,11 +172,11 @@ function stringifyDiffObjs (err) {
  * @param {string} expected
  * @return {string} Diff
  */
-var generateDiff = exports.generateDiff = function (actual, expected) {
+var generateDiff = (exports.generateDiff = function(actual, expected) {
   return exports.inlineDiffs
     ? inlineDiff(actual, expected)
     : unifiedDiff(actual, expected);
-};
+});
 
 /**
  * Output the given `failures` as a list.
@@ -191,14 +185,14 @@ var generateDiff = exports.generateDiff = function (actual, expected) {
  * @memberof Mocha.reporters.Base
  * @variation 1
  * @param {Array} failures
- * @api public
  */
 
-exports.list = function (failures) {
+exports.list = function(failures) {
   console.log();
-  failures.forEach(function (test, i) {
+  failures.forEach(function(test, i) {
     // format
-    var fmt = color('error title', '  %s) %s:\n') +
+    var fmt =
+      color('error title', '  %s) %s:\n') +
       color('error message', '     %s') +
       color('error stack', '\n%s\n');
 
@@ -232,7 +226,8 @@ exports.list = function (failures) {
     // explicitly show diff
     if (!exports.hideDiff && showDiff(err)) {
       stringifyDiffObjs(err);
-      fmt = color('error title', '  %s) %s:\n%s') + color('error stack', '\n%s\n');
+      fmt =
+        color('error title', '  %s) %s:\n%s') + color('error stack', '\n%s\n');
       var match = message.match(/^([^:]+): expected/);
       msg = '\n      ' + color('error message', match ? match[1] : msg);
 
@@ -244,7 +239,7 @@ exports.list = function (failures) {
 
     // indented test title
     var testTitle = '';
-    test.titlePath().forEach(function (str, index) {
+    test.titlePath().forEach(function(str, index) {
       if (index !== 0) {
         testTitle += '\n     ';
       }
@@ -254,7 +249,7 @@ exports.list = function (failures) {
       testTitle += str;
     });
 
-    console.log(fmt, (i + 1), testTitle, msg, stack);
+    console.log(fmt, i + 1, testTitle, msg, stack);
   });
 };
 
@@ -262,45 +257,24 @@ exports.list = function (failures) {
  * Initialize a new `Base` reporter.
  *
  * All other reporters generally
- * inherit from this reporter, providing
- * stats such as test duration, number
- * of tests passed / failed etc.
+ * inherit from this reporter.
  *
  * @memberof Mocha.reporters
  * @public
  * @class
  * @param {Runner} runner
- * @api public
  */
 
-function Base (runner) {
-  var stats = this.stats = { suites: 0, tests: 0, passes: 0, pending: 0, failures: 0 };
-  var failures = this.failures = [];
+function Base(runner) {
+  var failures = (this.failures = []);
 
   if (!runner) {
-    return;
+    throw new TypeError('Missing runner argument');
   }
+  this.stats = runner.stats; // assigned so Reporters keep a closer reference
   this.runner = runner;
 
-  runner.stats = stats;
-
-  runner.on('start', function () {
-    stats.start = new Date();
-  });
-
-  runner.on('suite', function (suite) {
-    stats.suites = stats.suites || 0;
-    suite.root || stats.suites++;
-  });
-
-  runner.on('test end', function () {
-    stats.tests = stats.tests || 0;
-    stats.tests++;
-  });
-
-  runner.on('pass', function (test) {
-    stats.passes = stats.passes || 0;
-
+  runner.on('pass', function(test) {
     if (test.duration > test.slow()) {
       test.speed = 'slow';
     } else if (test.duration > test.slow() / 2) {
@@ -308,28 +282,15 @@ function Base (runner) {
     } else {
       test.speed = 'fast';
     }
-
-    stats.passes++;
   });
 
-  runner.on('fail', function (test, err) {
-    stats.failures = stats.failures || 0;
-    stats.failures++;
+  runner.on('fail', function(test, err) {
     if (showDiff(err)) {
       stringifyDiffObjs(err);
     }
     test.err = err;
     failures.push(test);
   });
-
-  runner.once('end', function () {
-    stats.end = new Date();
-    stats.duration = stats.end - stats.start;
-  });
-
-  runner.on('pending', function () {
-    stats.pending++;
-  });
 }
 
 /**
@@ -338,27 +299,24 @@ function Base (runner) {
  *
  * @memberof Mocha.reporters.Base
  * @public
- * @api public
  */
-Base.prototype.epilogue = function () {
+Base.prototype.epilogue = function() {
   var stats = this.stats;
   var fmt;
 
   console.log();
 
   // passes
-  fmt = color('bright pass', ' ') +
+  fmt =
+    color('bright pass', ' ') +
     color('green', ' %d passing') +
     color('light', ' (%s)');
 
-  console.log(fmt,
-    stats.passes || 0,
-    ms(stats.duration));
+  console.log(fmt, stats.passes || 0, milliseconds(stats.duration));
 
   // pending
   if (stats.pending) {
-    fmt = color('pending', ' ') +
-      color('pending', ' %d pending');
+    fmt = color('pending', ' ') + color('pending', ' %d pending');
 
     console.log(fmt, stats.pending);
   }
@@ -379,12 +337,12 @@ Base.prototype.epilogue = function () {
 /**
  * Pad the given `str` to `len`.
  *
- * @api private
+ * @private
  * @param {string} str
  * @param {string} len
  * @return {string}
  */
-function pad (str, len) {
+function pad(str, len) {
   str = String(str);
   return Array(len - str.length + 1).join(' ') + str;
 }
@@ -392,25 +350,28 @@ function pad (str, len) {
 /**
  * Returns an inline diff between 2 strings with coloured ANSI output.
  *
- * @api private
+ * @private
  * @param {String} actual
  * @param {String} expected
  * @return {string} Diff
  */
-function inlineDiff (actual, expected) {
+function inlineDiff(actual, expected) {
   var msg = errorDiff(actual, expected);
 
   // linenos
   var lines = msg.split('\n');
   if (lines.length > 4) {
     var width = String(lines.length).length;
-    msg = lines.map(function (str, i) {
-      return pad(++i, width) + ' |' + ' ' + str;
-    }).join('\n');
+    msg = lines
+      .map(function(str, i) {
+        return pad(++i, width) + ' |' + ' ' + str;
+      })
+      .join('\n');
   }
 
   // legend
-  msg = '\n' +
+  msg =
+    '\n' +
     color('diff removed', 'actual') +
     ' ' +
     color('diff added', 'expected') +
@@ -426,14 +387,14 @@ function inlineDiff (actual, expected) {
 /**
  * Returns a unified diff between two strings with coloured ANSI output.
  *
- * @api private
+ * @private
  * @param {String} actual
  * @param {String} expected
  * @return {string} The diff.
  */
-function unifiedDiff (actual, expected) {
+function unifiedDiff(actual, expected) {
   var indent = '      ';
-  function cleanUp (line) {
+  function cleanUp(line) {
     if (line[0] === '+') {
       return indent + colorLines('diff added', line);
     }
@@ -448,50 +409,62 @@ function unifiedDiff (actual, expected) {
     }
     return indent + line;
   }
-  function notBlank (line) {
+  function notBlank(line) {
     return typeof line !== 'undefined' && line !== null;
   }
   var msg = diff.createPatch('string', actual, expected);
   var lines = msg.split('\n').splice(5);
-  return '\n      ' +
-    colorLines('diff added', '+ expected') + ' ' +
+  return (
+    '\n      ' +
+    colorLines('diff added', '+ expected') +
+    ' ' +
     colorLines('diff removed', '- actual') +
     '\n\n' +
-    lines.map(cleanUp).filter(notBlank).join('\n');
+    lines
+      .map(cleanUp)
+      .filter(notBlank)
+      .join('\n')
+  );
 }
 
 /**
  * Return a character diff for `err`.
  *
- * @api private
+ * @private
  * @param {String} actual
  * @param {String} expected
  * @return {string} the diff
  */
-function errorDiff (actual, expected) {
-  return diff.diffWordsWithSpace(actual, expected).map(function (str) {
-    if (str.added) {
-      return colorLines('diff added', str.value);
-    }
-    if (str.removed) {
-      return colorLines('diff removed', str.value);
-    }
-    return str.value;
-  }).join('');
+function errorDiff(actual, expected) {
+  return diff
+    .diffWordsWithSpace(actual, expected)
+    .map(function(str) {
+      if (str.added) {
+        return colorLines('diff added', str.value);
+      }
+      if (str.removed) {
+        return colorLines('diff removed', str.value);
+      }
+      return str.value;
+    })
+    .join('');
 }
 
 /**
  * Color lines for `str`, using the color `name`.
  *
- * @api private
+ * @private
  * @param {string} name
  * @param {string} str
  * @return {string}
  */
-function colorLines (name, str) {
-  return str.split('\n').map(function (str) {
-    return color(name, str);
-  }).join('\n');
+function colorLines(name, str) {
+  return str
+    .split('\n')
+    .map(function(str) {
+      return color(name, str);
+    })
+    .join('\n');
 }
 
 /**
@@ -502,11 +475,13 @@ var objToString = Object.prototype.toString;
 /**
  * Check that a / b have the same type.
  *
- * @api private
+ * @private
  * @param {Object} a
  * @param {Object} b
  * @return {boolean}
  */
-function sameType (a, b) {
+function sameType(a, b) {
   return objToString.call(a) === objToString.call(b);
 }
+
+Base.abstract = true;

package/lib/reporters/doc.js

@@ -23,18 +23,17 @@ exports = module.exports = Doc;
  * @extends {Base}
  * @public
  * @param {Runner} runner
- * @api public
  */
-function Doc (runner) {
+function Doc(runner) {
   Base.call(this, runner);
 
   var indents = 2;
 
-  function indent () {
+  function indent() {
     return Array(indents).join('  ');
   }
 
-  runner.on('suite', function (suite) {
+  runner.on('suite', function(suite) {
     if (suite.root) {
       return;
     }
@@ -45,7 +44,7 @@ function Doc (runner) {
     console.log('%s<dl>', indent());
   });
 
-  runner.on('suite end', function (suite) {
+  runner.on('suite end', function(suite) {
     if (suite.root) {
       return;
     }
@@ -55,16 +54,26 @@ function Doc (runner) {
     --indents;
   });
 
-  runner.on('pass', function (test) {
+  runner.on('pass', function(test) {
     console.log('%s  <dt>%s</dt>', indent(), utils.escape(test.title));
     var code = utils.escape(utils.clean(test.body));
     console.log('%s  <dd><pre><code>%s</code></pre></dd>', indent(), code);
   });
 
-  runner.on('fail', function (test, err) {
-    console.log('%s  <dt class="error">%s</dt>', indent(), utils.escape(test.title));
+  runner.on('fail', function(test, err) {
+    console.log(
+      '%s  <dt class="error">%s</dt>',
+      indent(),
+      utils.escape(test.title)
+    );
     var code = utils.escape(utils.clean(test.body));
-    console.log('%s  <dd class="error"><pre><code>%s</code></pre></dd>', indent(), code);
+    console.log(
+      '%s  <dd class="error"><pre><code>%s</code></pre></dd>',
+      indent(),
+      code
+    );
     console.log('%s  <dd class="error">%s</dd>', indent(), utils.escape(err));
   });
 }
+
+Doc.description = 'HTML documentation';

package/lib/reporters/dot.js

@@ -8,7 +8,6 @@
 
 var Base = require('./base');
 var inherits = require('../utils').inherits;
-var color = Base.color;
 
 /**
  * Expose `Dot`.
@@ -23,46 +22,45 @@ exports = module.exports = Dot;
  * @memberof Mocha.reporters
  * @extends Mocha.reporters.Base
  * @public
- * @api public
  * @param {Runner} runner
  */
-function Dot (runner) {
+function Dot(runner) {
   Base.call(this, runner);
 
   var self = this;
-  var width = Base.window.width * 0.75 | 0;
+  var width = (Base.window.width * 0.75) | 0;
   var n = -1;
 
-  runner.on('start', function () {
+  runner.on('start', function() {
     process.stdout.write('\n');
   });
 
-  runner.on('pending', function () {
+  runner.on('pending', function() {
     if (++n % width === 0) {
       process.stdout.write('\n  ');
     }
-    process.stdout.write(color('pending', Base.symbols.comma));
+    process.stdout.write(Base.color('pending', Base.symbols.comma));
   });
 
-  runner.on('pass', function (test) {
+  runner.on('pass', function(test) {
     if (++n % width === 0) {
       process.stdout.write('\n  ');
     }
     if (test.speed === 'slow') {
-      process.stdout.write(color('bright yellow', Base.symbols.dot));
+      process.stdout.write(Base.color('bright yellow', Base.symbols.dot));
     } else {
-      process.stdout.write(color(test.speed, Base.symbols.dot));
+      process.stdout.write(Base.color(test.speed, Base.symbols.dot));
     }
   });
 
-  runner.on('fail', function () {
+  runner.on('fail', function() {
     if (++n % width === 0) {
       process.stdout.write('\n  ');
     }
-    process.stdout.write(color('fail', Base.symbols.bang));
+    process.stdout.write(Base.color('fail', Base.symbols.bang));
   });
 
-  runner.once('end', function () {
+  runner.once('end', function() {
     console.log();
     self.epilogue();
   });
@@ -72,3 +70,5 @@ function Dot (runner) {
  * Inherit from `Base.prototype`.
  */
 inherits(Dot, Base);
+
+Dot.description = 'dot matrix representation';