mocha 12.0.0-beta-9 → 12.0.0-beta-9.2

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="docs-next/src/components/mocha-logo.svg" alt="Mocha test framework logo"/>
+  <img src="docs/src/components/mocha-logo.svg" alt="Mocha test framework logo"/>
 </p>
 
 <p align="center">☕️ Classic, reliable, trusted test framework for Node.js and the browser ☕️</p>

package/lib/browser/parse-query.js

@@ -14,7 +14,7 @@ module.exports = function parseQuery(qs) {
     .reduce(function (obj, pair) {
       var i = pair.indexOf("=");
       var key = pair.slice(0, i);
-      var val = pair.slice(++i);
+      var val = pair.slice(i + 1);
 
       // Due to how the URLSearchParams API treats spaces
       obj[key] = decodeURIComponent(val.replace(/\+/g, "%20"));

package/lib/cli/config.js

@@ -66,7 +66,7 @@ const parsers = (exports.parsers = {
  * @returns {Object} Parsed config object
  */
 exports.loadConfig = (filepath) => {
-  let config = {};
+  let config;
   debug("loadConfig: trying to parse config at %s", filepath);
 
   const ext = path.extname(filepath);

package/lib/context.js

@@ -69,7 +69,7 @@ Context.prototype.slow = function (ms) {
  * Mark a test as skipped.
  *
  * @private
- * @throws Pending
+ * @throws PendingError
  */
 Context.prototype.skip = function () {
   this.runnable().skip();

package/lib/hook.js

@@ -1,89 +1,81 @@
 "use strict";
 
 var Runnable = require("./runnable");
-const { inherits, constants } = require("./utils");
+const { constants } = require("./utils");
 const { MOCHA_ID_PROP_NAME } = constants;
 
-/**
- * Expose `Hook`.
- */
-
-module.exports = Hook;
-
-/**
- * Initialize a new `Hook` with the given `title` and callback `fn`
- *
- * @class
- * @extends Runnable
- * @param {String} title
- * @param {Function} fn
- */
-function Hook(title, fn) {
-  Runnable.call(this, title, fn);
-  this.type = "hook";
-}
+class Hook extends Runnable {
+  /**
+   * Initialize a new `Hook` with the given `title` and callback `fn`
+   *
+   * @extends Runnable
+   * @param {String} title
+   * @param {Function} fn
+   */
+  constructor(title, fn) {
+    super(title, fn);
+    this.type = "hook";
+  }
 
-/**
- * Inherit from `Runnable.prototype`.
- */
-inherits(Hook, Runnable);
+  /**
+   * Resets the state for a next run.
+   */
+  reset() {
+    super.reset(this);
+    delete this._error;
+  }
 
-/**
- * Resets the state for a next run.
- */
-Hook.prototype.reset = function () {
-  Runnable.prototype.reset.call(this);
-  delete this._error;
-};
+  /**
+   * Get or set the test `err`.
+   *
+   * @memberof Hook
+   * @public
+   * @param {Error} err
+   * @return {Error}
+   */
+  error(err) {
+    if (!arguments.length) {
+      err = this._error;
+      this._error = null;
+      return err;
+    }
 
-/**
- * Get or set the test `err`.
- *
- * @memberof Hook
- * @public
- * @param {Error} err
- * @return {Error}
- */
-Hook.prototype.error = function (err) {
-  if (!arguments.length) {
-    err = this._error;
-    this._error = null;
-    return err;
+    this._error = err;
   }
 
-  this._error = err;
-};
+  /**
+   * Returns an object suitable for IPC.
+   * Functions are represented by keys beginning with `$$`.
+   * @private
+   * @returns {Object}
+   */
+  serialize() {
+    return {
+      $$currentRetry: this.currentRetry(),
+      $$fullTitle: this.fullTitle(),
+      $$isPending: Boolean(this.isPending()),
+      $$titlePath: this.titlePath(),
+      ctx:
+        this.ctx && this.ctx.currentTest
+          ? {
+              currentTest: {
+                title: this.ctx.currentTest.title,
+                [MOCHA_ID_PROP_NAME]: this.ctx.currentTest.id,
+              },
+            }
+          : {},
+      duration: this.duration,
+      file: this.file,
+      parent: {
+        $$fullTitle: this.parent.fullTitle(),
+        [MOCHA_ID_PROP_NAME]: this.parent.id,
+      },
+      state: this.state,
+      title: this.title,
+      type: this.type,
+      [MOCHA_ID_PROP_NAME]: this.id,
+    };
+  }
+}
 
-/**
- * Returns an object suitable for IPC.
- * Functions are represented by keys beginning with `$$`.
- * @private
- * @returns {Object}
- */
-Hook.prototype.serialize = function serialize() {
-  return {
-    $$currentRetry: this.currentRetry(),
-    $$fullTitle: this.fullTitle(),
-    $$isPending: Boolean(this.isPending()),
-    $$titlePath: this.titlePath(),
-    ctx:
-      this.ctx && this.ctx.currentTest
-        ? {
-            currentTest: {
-              title: this.ctx.currentTest.title,
-              [MOCHA_ID_PROP_NAME]: this.ctx.currentTest.id,
-            },
-          }
-        : {},
-    duration: this.duration,
-    file: this.file,
-    parent: {
-      $$fullTitle: this.parent.fullTitle(),
-      [MOCHA_ID_PROP_NAME]: this.parent.id,
-    },
-    state: this.state,
-    title: this.title,
-    type: this.type,
-    [MOCHA_ID_PROP_NAME]: this.id,
-  };
-};
+module.exports = Hook;

package/lib/nodejs/parallel-buffered-runner.js

@@ -22,9 +22,8 @@ const { createMap, constants } = require("../utils");
 const { MOCHA_ID_PROP_NAME } = constants;
 const { createFatalError } = require("../errors");
 
-const DEFAULT_WORKER_REPORTER = require.resolve(
-  "./reporters/parallel-buffered",
-);
+const DEFAULT_WORKER_REPORTER =
+  require.resolve("./reporters/parallel-buffered");
 
 /**
  * List of options to _not_ serialize for transmission to workers

package/lib/pending.js

@@ -4,13 +4,16 @@
  @module Pending
 */
 
-module.exports = Pending;
-
 /**
- * Initialize a new `Pending` error with the given message.
+ * Initialize a new `PendingError` error with the given message.
  *
  * @param {string} message
  */
-function Pending(message) {
-  this.message = message;
+class PendingError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "PendingError";
+  }
 }
+
+module.exports = PendingError;

package/lib/reporters/base.js

@@ -31,12 +31,6 @@ function getBrowserWindowSize() {
   return [640, 480];
 }
 
-/**
- * Expose `Base`.
- */
-
-exports = module.exports = Base;
-
 /**
  * Check if both stdio streams are associated with a tty.
  */
@@ -49,9 +43,109 @@ var isatty = isBrowser || (process.stdout.isTTY && process.stderr.isTTY);
 var consoleLog = console.log;
 
 /**
- * Enable coloring by default, except in the browser interface.
+ * @abstract
+ * @description
+ * All other reporters generally inherit from this reporter.
  */
+class Base {
+  /**
+   * Constructs a new `Base` reporter instance.
+   *
+   * @public
+   * @memberof Mocha.reporters
+   * @param {Runner} runner - Instance triggers reporter actions.
+   * @param {Object} [options] - runner options
+   */
+  constructor(runner, options) {
+    var failures = (this.failures = []);
+
+    if (!runner) {
+      throw new TypeError("Missing runner argument");
+    }
+    this.options = options || {};
+    this.runner = runner;
+    this.stats = runner.stats; // assigned so Reporters keep a closer reference
+
+    var maxDiffSizeOpt =
+      this.options.reporterOption && this.options.reporterOption.maxDiffSize;
+    if (maxDiffSizeOpt !== undefined && !isNaN(Number(maxDiffSizeOpt))) {
+      exports.maxDiffSize = Number(maxDiffSizeOpt);
+    }
+
+    runner.on(EVENT_TEST_PASS, function (test) {
+      if (test.duration > test.slow()) {
+        test.speed = "slow";
+      } else if (test.duration > test.slow() / 2) {
+        test.speed = "medium";
+      } else {
+        test.speed = "fast";
+      }
+    });
+
+    runner.on(EVENT_TEST_FAIL, function (test, err) {
+      if (showDiff(err)) {
+        stringifyDiffObjs(err);
+      }
+      // more than one error per test
+      if (test.err && err instanceof Error) {
+        test.err.multiple = (test.err.multiple || []).concat(err);
+      } else {
+        test.err = err;
+      }
+      failures.push(test);
+    });
+  }
+
+  /**
+   * Outputs common epilogue used by many of the bundled reporters.
+   *
+   * @public
+   * @memberof Mocha.reporters
+   */
+  epilogue() {
+    var stats = this.stats;
+    var fmt;
+
+    Base.consoleLog();
+
+    // passes
+    fmt =
+      color("bright pass", " ") +
+      color("green", " %d passing") +
+      color("light", " (%s)");
+
+    Base.consoleLog(fmt, stats.passes || 0, milliseconds(stats.duration));
 
+    // pending
+    if (stats.pending) {
+      fmt = color("pending", " ") + color("pending", " %d pending");
+
+      Base.consoleLog(fmt, stats.pending);
+    }
+
+    // failures
+    if (stats.failures) {
+      fmt = color("fail", "  %d failing");
+
+      Base.consoleLog(fmt, stats.failures);
+
+      Base.list(this.failures);
+      Base.consoleLog();
+    }
+
+    Base.consoleLog();
+  }
+}
+
+Base.consoleLog = consoleLog;
+
+Base.abstract = true;
+
+exports = module.exports = Base;
+
+/**
+ * Enable coloring by default, except in the browser interface.
+ */
 exports.useColors =
   !isBrowser &&
   (supportsColor.stdout || process.env.MOCHA_COLORS !== undefined);
@@ -347,98 +441,6 @@ exports.list = function (failures) {
   });
 };
 
-/**
- * Constructs a new `Base` reporter instance.
- *
- * @description
- * All other reporters generally inherit from this reporter.
- *
- * @public
- * @class
- * @memberof Mocha.reporters
- * @param {Runner} runner - Instance triggers reporter actions.
- * @param {Object} [options] - runner options
- */
-function Base(runner, options) {
-  var failures = (this.failures = []);
-
-  if (!runner) {
-    throw new TypeError("Missing runner argument");
-  }
-  this.options = options || {};
-  this.runner = runner;
-  this.stats = runner.stats; // assigned so Reporters keep a closer reference
-
-  var maxDiffSizeOpt =
-    this.options.reporterOption && this.options.reporterOption.maxDiffSize;
-  if (maxDiffSizeOpt !== undefined && !isNaN(Number(maxDiffSizeOpt))) {
-    exports.maxDiffSize = Number(maxDiffSizeOpt);
-  }
-
-  runner.on(EVENT_TEST_PASS, function (test) {
-    if (test.duration > test.slow()) {
-      test.speed = "slow";
-    } else if (test.duration > test.slow() / 2) {
-      test.speed = "medium";
-    } else {
-      test.speed = "fast";
-    }
-  });
-
-  runner.on(EVENT_TEST_FAIL, function (test, err) {
-    if (showDiff(err)) {
-      stringifyDiffObjs(err);
-    }
-    // more than one error per test
-    if (test.err && err instanceof Error) {
-      test.err.multiple = (test.err.multiple || []).concat(err);
-    } else {
-      test.err = err;
-    }
-    failures.push(test);
-  });
-}
-
-/**
- * Outputs common epilogue used by many of the bundled reporters.
- *
- * @public
- * @memberof Mocha.reporters
- */
-Base.prototype.epilogue = function () {
-  var stats = this.stats;
-  var fmt;
-
-  Base.consoleLog();
-
-  // passes
-  fmt =
-    color("bright pass", " ") +
-    color("green", " %d passing") +
-    color("light", " (%s)");
-
-  Base.consoleLog(fmt, stats.passes || 0, milliseconds(stats.duration));
-
-  // pending
-  if (stats.pending) {
-    fmt = color("pending", " ") + color("pending", " %d pending");
-
-    Base.consoleLog(fmt, stats.pending);
-  }
-
-  // failures
-  if (stats.failures) {
-    fmt = color("fail", "  %d failing");
-
-    Base.consoleLog(fmt, stats.failures);
-
-    Base.list(this.failures);
-    Base.consoleLog();
-  }
-
-  Base.consoleLog();
-};
-
 /**
  * Pads the given `str` to `len`.
  *
@@ -469,7 +471,7 @@ function inlineDiff(actual, expected) {
     var width = String(lines.length).length;
     msg = lines
       .map(function (str, i) {
-        return pad(++i, width) + " |" + " " + str;
+        return pad(i + 1, width) + " |" + " " + str;
       })
       .join("\n");
   }
@@ -585,7 +587,3 @@ var objToString = Object.prototype.toString;
 function sameType(a, b) {
   return objToString.call(a) === objToString.call(b);
 }
-
-Base.consoleLog = consoleLog;
-
-Base.abstract = true;

package/lib/reporters/doc.js

@@ -19,82 +19,83 @@ var EVENT_TEST_FAIL = constants.EVENT_TEST_FAIL;
 var EVENT_SUITE_BEGIN = constants.EVENT_SUITE_BEGIN;
 var EVENT_SUITE_END = constants.EVENT_SUITE_END;
 
-/**
- * Expose `Doc`.
- */
-
-exports = module.exports = Doc;
-
-/**
- * Constructs a new `Doc` reporter instance.
- *
- * @public
- * @class
- * @memberof Mocha.reporters
- * @extends Mocha.reporters.Base
- * @param {Runner} runner - Instance triggers reporter actions.
- * @param {Object} [options] - runner options
- */
-function Doc(runner, options) {
-  Base.call(this, runner, options);
+class Doc extends Base {
+  static description = "HTML documentation";
 
-  var indents = 2;
+  /**
+   * Constructs a new `Doc` reporter instance.
+   *
+   * @public
+   * @memberof Mocha.reporters
+   * @extends Mocha.reporters.Base
+   * @param {Runner} runner - Instance triggers reporter actions.
+   * @param {Object} [options] - runner options
+   */
+  constructor(runner, options) {
+    super(runner, options);
 
-  function indent() {
-    return Array(indents).join("  ");
-  }
+    var indents = 2;
 
-  runner.on(EVENT_SUITE_BEGIN, function (suite) {
-    if (suite.root) {
-      return;
+    function indent() {
+      return Array(indents).join("  ");
     }
-    ++indents;
-    Base.consoleLog('%s<section class="suite">', indent());
-    ++indents;
-    Base.consoleLog("%s<h1>%s</h1>", indent(), utils.escape(suite.title));
-    Base.consoleLog("%s<dl>", indent());
-  });
 
-  runner.on(EVENT_SUITE_END, function (suite) {
-    if (suite.root) {
-      return;
-    }
-    Base.consoleLog("%s</dl>", indent());
-    --indents;
-    Base.consoleLog("%s</section>", indent());
-    --indents;
-  });
+    runner.on(EVENT_SUITE_BEGIN, function (suite) {
+      if (suite.root) {
+        return;
+      }
+      ++indents;
+      Base.consoleLog('%s<section class="suite">', indent());
+      ++indents;
+      Base.consoleLog("%s<h1>%s</h1>", indent(), utils.escape(suite.title));
+      Base.consoleLog("%s<dl>", indent());
+    });
 
-  runner.on(EVENT_TEST_PASS, function (test) {
-    Base.consoleLog("%s  <dt>%s</dt>", indent(), utils.escape(test.title));
-    Base.consoleLog("%s  <dt>%s</dt>", indent(), utils.escape(test.file));
-    var code = utils.escape(utils.clean(test.body));
-    Base.consoleLog("%s  <dd><pre><code>%s</code></pre></dd>", indent(), code);
-  });
+    runner.on(EVENT_SUITE_END, function (suite) {
+      if (suite.root) {
+        return;
+      }
+      Base.consoleLog("%s</dl>", indent());
+      --indents;
+      Base.consoleLog("%s</section>", indent());
+      --indents;
+    });
 
-  runner.on(EVENT_TEST_FAIL, function (test, err) {
-    Base.consoleLog(
-      '%s  <dt class="error">%s</dt>',
-      indent(),
-      utils.escape(test.title),
-    );
-    Base.consoleLog(
-      '%s  <dt class="error">%s</dt>',
-      indent(),
-      utils.escape(test.file),
-    );
-    var code = utils.escape(utils.clean(test.body));
-    Base.consoleLog(
-      '%s  <dd class="error"><pre><code>%s</code></pre></dd>',
-      indent(),
-      code,
-    );
-    Base.consoleLog(
-      '%s  <dd class="error">%s</dd>',
-      indent(),
-      utils.escape(err),
-    );
-  });
+    runner.on(EVENT_TEST_PASS, function (test) {
+      Base.consoleLog("%s  <dt>%s</dt>", indent(), utils.escape(test.title));
+      Base.consoleLog("%s  <dt>%s</dt>", indent(), utils.escape(test.file));
+      var code = utils.escape(utils.clean(test.body));
+      Base.consoleLog(
+        "%s  <dd><pre><code>%s</code></pre></dd>",
+        indent(),
+        code,
+      );
+    });
+
+    runner.on(EVENT_TEST_FAIL, function (test, err) {
+      Base.consoleLog(
+        '%s  <dt class="error">%s</dt>',
+        indent(),
+        utils.escape(test.title),
+      );
+      Base.consoleLog(
+        '%s  <dt class="error">%s</dt>',
+        indent(),
+        utils.escape(test.file),
+      );
+      var code = utils.escape(utils.clean(test.body));
+      Base.consoleLog(
+        '%s  <dd class="error"><pre><code>%s</code></pre></dd>',
+        indent(),
+        code,
+      );
+      Base.consoleLog(
+        '%s  <dd class="error">%s</dd>',
+        indent(),
+        utils.escape(err),
+      );
+    });
+  }
 }
 
-Doc.description = "HTML documentation";
+exports = module.exports = Doc;