mocha 9.1.2 → 9.2.1

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2011-2021 OpenJS Foundation and contributors, https://openjsf.org
+Copyright (c) 2011-2022 OpenJS Foundation and contributors, https://openjsf.org
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -65,6 +65,6 @@ Finally, come [chat with the maintainers](https://gitter.im/mochajs/contributors
 
 ## License
 
-Copyright 2011-2021 OpenJS Foundation and contributors. Licensed [MIT](https://github.com/mochajs/mocha/blob/master/LICENSE).
+Copyright 2011-2022 OpenJS Foundation and contributors. Licensed [MIT](https://github.com/mochajs/mocha/blob/master/LICENSE).
 
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmochajs%2Fmocha.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmochajs%2Fmocha?ref=badge_large)

package/browser-entry.js

@@ -40,12 +40,12 @@ var originalOnerrorHandler = global.onerror;
  * Revert to original onerror handler if previously defined.
  */
 
-process.removeListener = function(e, fn) {
+process.removeListener = function (e, fn) {
   if (e === 'uncaughtException') {
     if (originalOnerrorHandler) {
       global.onerror = originalOnerrorHandler;
     } else {
-      global.onerror = function() {};
+      global.onerror = function () {};
     }
     var i = uncaughtExceptionHandlers.indexOf(fn);
     if (i !== -1) {
@@ -58,7 +58,7 @@ process.removeListener = function(e, fn) {
  * Implements listenerCount for 'uncaughtException'.
  */
 
-process.listenerCount = function(name) {
+process.listenerCount = function (name) {
   if (name === 'uncaughtException') {
     return uncaughtExceptionHandlers.length;
   }
@@ -69,9 +69,9 @@ process.listenerCount = function(name) {
  * Implements uncaughtException listener.
  */
 
-process.on = function(e, fn) {
+process.on = function (e, fn) {
   if (e === 'uncaughtException') {
-    global.onerror = function(err, url, line) {
+    global.onerror = function (err, url, line) {
       fn(new Error(err + ' (' + url + ':' + line + ')'));
       return !mocha.options.allowUncaught;
     };
@@ -79,7 +79,7 @@ process.on = function(e, fn) {
   }
 };
 
-process.listeners = function(e) {
+process.listeners = function (e) {
   if (e === 'uncaughtException') {
     return uncaughtExceptionHandlers;
   }
@@ -110,7 +110,7 @@ function timeslice() {
  * High-performance override of Runner.immediately.
  */
 
-Mocha.Runner.immediately = function(callback) {
+Mocha.Runner.immediately = function (callback) {
   immediateQueue.push(callback);
   if (!immediateTimeout) {
     immediateTimeout = setTimeout(timeslice, 0);
@@ -122,8 +122,8 @@ Mocha.Runner.immediately = function(callback) {
  * This is useful when running tests in a browser because window.onerror will
  * only receive the 'message' attribute of the Error.
  */
-mocha.throwError = function(err) {
-  uncaughtExceptionHandlers.forEach(function(fn) {
+mocha.throwError = function (err) {
+  uncaughtExceptionHandlers.forEach(function (fn) {
     fn(err);
   });
   throw err;
@@ -134,7 +134,7 @@ mocha.throwError = function(err) {
  * Normally this would happen in Mocha.prototype.loadFiles.
  */
 
-mocha.ui = function(ui) {
+mocha.ui = function (ui) {
   Mocha.prototype.ui.call(this, ui);
   this.suite.emit('pre-require', global, null, this);
   return this;
@@ -144,7 +144,7 @@ mocha.ui = function(ui) {
  * Setup mocha with the given setting options.
  */
 
-mocha.setup = function(opts) {
+mocha.setup = function (opts) {
   if (typeof opts === 'string') {
     opts = {ui: opts};
   }
@@ -153,10 +153,10 @@ mocha.setup = function(opts) {
   }
   var self = this;
   Object.keys(opts)
-    .filter(function(opt) {
+    .filter(function (opt) {
       return opt !== 'delay';
     })
-    .forEach(function(opt) {
+    .forEach(function (opt) {
       if (Object.prototype.hasOwnProperty.call(opts, opt)) {
         self[opt](opts[opt]);
       }
@@ -168,7 +168,7 @@ mocha.setup = function(opts) {
  * Run mocha, returning the Runner.
  */
 
-mocha.run = function(fn) {
+mocha.run = function (fn) {
   var options = mocha.options;
   mocha.globals('location');
 
@@ -183,7 +183,7 @@ mocha.run = function(fn) {
     mocha.invert();
   }
 
-  return Mocha.prototype.run.call(mocha, function(err) {
+  return Mocha.prototype.run.call(mocha, function (err) {
     // The DOM Document is not available in Web Workers.
     var document = global.document;
     if (
@@ -209,8 +209,18 @@ Mocha.process = process;
 /**
  * Expose mocha.
  */
-
 global.Mocha = Mocha;
 global.mocha = mocha;
 
+// for bundlers: enable `import {describe, it} from 'mocha'`
+// `bdd` interface only
+// prettier-ignore
+[ 
+  'describe', 'context', 'it', 'specify',
+  'xdescribe', 'xcontext', 'xit', 'xspecify',
+  'before', 'beforeEach', 'afterEach', 'after'
+].forEach(function(key) {
+  mocha[key] = global[key];
+});
+
 module.exports = mocha;

package/lib/browser/growl.js

@@ -23,7 +23,7 @@ var isBrowser = require('../utils').isBrowser;
  * @see {@link Mocha#isGrowlCapable}
  * @return {boolean} whether browser notification support exists
  */
-exports.isCapable = function() {
+exports.isCapable = function () {
   var hasNotificationSupport = 'Notification' in window;
   var hasPromiseSupport = typeof Promise === 'function';
   return isBrowser() && hasNotificationSupport && hasPromiseSupport;
@@ -39,17 +39,17 @@ exports.isCapable = function() {
  * @see {@link Mocha#_growl}
  * @param {Runner} runner - Runner instance.
  */
-exports.notify = function(runner) {
+exports.notify = function (runner) {
   var promise = isPermitted();
 
   /**
    * Attempt notification.
    */
-  var sendNotification = function() {
+  var sendNotification = function () {
     // If user hasn't responded yet... "No notification for you!" (Seinfeld)
     Promise.race([promise, Promise.resolve(undefined)])
       .then(canNotify)
-      .then(function() {
+      .then(function () {
         display(runner);
       })
       .catch(notPermitted);
@@ -77,7 +77,7 @@ function isPermitted() {
       return Promise.resolve(false);
     },
     default: function ask() {
-      return Notification.requestPermission().then(function(permission) {
+      return Notification.requestPermission().then(function (permission) {
         return permission === 'granted';
       });
     }

package/lib/browser/parse-query.js

@@ -11,7 +11,7 @@ module.exports = function parseQuery(qs) {
   return qs
     .replace('?', '')
     .split('&')
-    .reduce(function(obj, pair) {
+    .reduce(function (obj, pair) {
       var i = pair.indexOf('=');
       var key = pair.slice(0, i);
       var val = pair.slice(++i);

package/lib/browser/progress.js

@@ -27,7 +27,7 @@ function Progress() {
  * @param {number} size
  * @return {Progress} Progress instance.
  */
-Progress.prototype.size = function(size) {
+Progress.prototype.size = function (size) {
   this._size = size;
   return this;
 };
@@ -39,7 +39,7 @@ Progress.prototype.size = function(size) {
  * @param {string} text
  * @return {Progress} Progress instance.
  */
-Progress.prototype.text = function(text) {
+Progress.prototype.text = function (text) {
   this._text = text;
   return this;
 };
@@ -51,7 +51,7 @@ Progress.prototype.text = function(text) {
  * @param {number} size
  * @return {Progress} Progress instance.
  */
-Progress.prototype.fontSize = function(size) {
+Progress.prototype.fontSize = function (size) {
   this._fontSize = size;
   return this;
 };
@@ -62,7 +62,7 @@ Progress.prototype.fontSize = function(size) {
  * @param {string} family
  * @return {Progress} Progress instance.
  */
-Progress.prototype.font = function(family) {
+Progress.prototype.font = function (family) {
   this._font = family;
   return this;
 };
@@ -73,7 +73,7 @@ Progress.prototype.font = function(family) {
  * @param {number} n
  * @return {Progress} Progress instance.
  */
-Progress.prototype.update = function(n) {
+Progress.prototype.update = function (n) {
   this.percent = n;
   return this;
 };
@@ -84,7 +84,7 @@ Progress.prototype.update = function(n) {
  * @param {CanvasRenderingContext2d} ctx
  * @return {Progress} Progress instance.
  */
-Progress.prototype.draw = function(ctx) {
+Progress.prototype.draw = function (ctx) {
   try {
     var percent = Math.min(this.percent, 100);
     var size = this._size;

package/lib/cli/config.js

@@ -30,10 +30,6 @@ exports.CONFIG_FILES = [
   '.mocharc.json'
 ];
 
-const isModuleNotFoundError = err =>
-  err.code === 'MODULE_NOT_FOUND' ||
-  err.message.indexOf('Cannot find module') !== -1;
-
 /**
  * Parsers for various config filetypes. Each accepts a filepath and
  * returns an object (but could throw)
@@ -41,17 +37,16 @@ const isModuleNotFoundError = err =>
 const parsers = (exports.parsers = {
   yaml: filepath => require('js-yaml').load(fs.readFileSync(filepath, 'utf8')),
   js: filepath => {
-    const cwdFilepath = path.resolve(filepath);
+    let cwdFilepath;
     try {
-      debug('parsers: load using cwd-relative path: "%s"', cwdFilepath);
+      debug('parsers: load cwd-relative path: "%s"', path.resolve(filepath));
+      cwdFilepath = require.resolve(path.resolve(filepath)); // evtl. throws
       return require(cwdFilepath);
     } catch (err) {
-      if (isModuleNotFoundError(err)) {
-        debug('parsers: retry load as module-relative path: "%s"', filepath);
-        return require(filepath);
-      } else {
-        throw err; // rethrow
-      }
+      if (cwdFilepath) throw err;
+
+      debug('parsers: retry load as module-relative path: "%s"', filepath);
+      return require(filepath);
     }
   },
   json: filepath =>

package/lib/cli/run.js

@@ -366,7 +366,7 @@ exports.builder = yargs =>
     .number(types.number)
     .alias(aliases);
 
-exports.handler = async function(argv) {
+exports.handler = async function (argv) {
   debug('post-yargs config', argv);
   const mocha = new Mocha(argv);
 

package/lib/cli/watch-run.js

@@ -231,10 +231,7 @@ const createWatcher = (
   process.stdin.resume();
   process.stdin.setEncoding('utf8');
   process.stdin.on('data', data => {
-    const str = data
-      .toString()
-      .trim()
-      .toLowerCase();
+    const str = data.toString().trim().toLowerCase();
     if (str === 'rs') rerunner.scheduleRun();
   });
 

package/lib/context.js

@@ -22,7 +22,7 @@ function Context() {}
  * @param {Runnable} runnable
  * @return {Context} context
  */
-Context.prototype.runnable = function(runnable) {
+Context.prototype.runnable = function (runnable) {
   if (!arguments.length) {
     return this._runnable;
   }
@@ -37,7 +37,7 @@ Context.prototype.runnable = function(runnable) {
  * @param {number} ms
  * @return {Context} self
  */
-Context.prototype.timeout = function(ms) {
+Context.prototype.timeout = function (ms) {
   if (!arguments.length) {
     return this.runnable().timeout();
   }
@@ -52,7 +52,7 @@ Context.prototype.timeout = function(ms) {
  * @param {number} ms
  * @return {Context} self
  */
-Context.prototype.slow = function(ms) {
+Context.prototype.slow = function (ms) {
   if (!arguments.length) {
     return this.runnable().slow();
   }
@@ -66,7 +66,7 @@ Context.prototype.slow = function(ms) {
  * @private
  * @throws Pending
  */
-Context.prototype.skip = function() {
+Context.prototype.skip = function () {
   this.runnable().skip();
 };
 
@@ -77,7 +77,7 @@ Context.prototype.skip = function() {
  * @param {number} n
  * @return {Context} self
  */
-Context.prototype.retries = function(n) {
+Context.prototype.retries = function (n) {
   if (!arguments.length) {
     return this.runnable().retries();
   }

package/lib/errors.js

@@ -18,7 +18,7 @@ const emitWarning = (msg, type) => {
     process.emitWarning(msg, type);
   } else {
     /* istanbul ignore next */
-    process.nextTick(function() {
+    process.nextTick(function () {
       console.warn(type + ': ' + msg);
     });
   }

package/lib/hook.js

@@ -31,7 +31,7 @@ inherits(Hook, Runnable);
 /**
  * Resets the state for a next run.
  */
-Hook.prototype.reset = function() {
+Hook.prototype.reset = function () {
   Runnable.prototype.reset.call(this);
   delete this._error;
 };
@@ -44,7 +44,7 @@ Hook.prototype.reset = function() {
  * @param {Error} err
  * @return {Error}
  */
-Hook.prototype.error = function(err) {
+Hook.prototype.error = function (err) {
   if (!arguments.length) {
     err = this._error;
     this._error = null;

package/lib/interfaces/bdd.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var Test = require('../test');
-var EVENT_FILE_PRE_REQUIRE = require('../suite').constants
-  .EVENT_FILE_PRE_REQUIRE;
+var EVENT_FILE_PRE_REQUIRE =
+  require('../suite').constants.EVENT_FILE_PRE_REQUIRE;
 
 /**
  * BDD-style interface:
@@ -24,7 +24,7 @@ var EVENT_FILE_PRE_REQUIRE = require('../suite').constants
 module.exports = function bddInterface(suite) {
   var suites = [suite];
 
-  suite.on(EVENT_FILE_PRE_REQUIRE, function(context, file, mocha) {
+  suite.on(EVENT_FILE_PRE_REQUIRE, function (context, file, mocha) {
     var common = require('./common')(suites, context, mocha);
 
     context.before = common.before;
@@ -38,7 +38,7 @@ module.exports = function bddInterface(suite) {
      * and/or tests.
      */
 
-    context.describe = context.context = function(title, fn) {
+    context.describe = context.context = function (title, fn) {
       return common.suite.create({
         title: title,
         file: file,
@@ -50,22 +50,22 @@ module.exports = function bddInterface(suite) {
      * Pending describe.
      */
 
-    context.xdescribe = context.xcontext = context.describe.skip = function(
-      title,
-      fn
-    ) {
-      return common.suite.skip({
-        title: title,
-        file: file,
-        fn: fn
-      });
-    };
+    context.xdescribe =
+      context.xcontext =
+      context.describe.skip =
+        function (title, fn) {
+          return common.suite.skip({
+            title: title,
+            file: file,
+            fn: fn
+          });
+        };
 
     /**
      * Exclusive suite.
      */
 
-    context.describe.only = function(title, fn) {
+    context.describe.only = function (title, fn) {
       return common.suite.only({
         title: title,
         file: file,
@@ -79,7 +79,7 @@ module.exports = function bddInterface(suite) {
      * acting as a thunk.
      */
 
-    context.it = context.specify = function(title, fn) {
+    context.it = context.specify = function (title, fn) {
       var suite = suites[0];
       if (suite.isPending()) {
         fn = null;
@@ -94,7 +94,7 @@ module.exports = function bddInterface(suite) {
      * Exclusive test-case.
      */
 
-    context.it.only = function(title, fn) {
+    context.it.only = function (title, fn) {
       return common.test.only(mocha, context.it(title, fn));
     };
 
@@ -102,9 +102,12 @@ module.exports = function bddInterface(suite) {
      * Pending test case.
      */
 
-    context.xit = context.xspecify = context.it.skip = function(title) {
-      return context.it(title);
-    };
+    context.xit =
+      context.xspecify =
+      context.it.skip =
+        function (title) {
+          return context.it(title);
+        };
   });
 };
 

package/lib/interfaces/common.js

@@ -19,7 +19,7 @@ var createForbiddenExclusivityError = errors.createForbiddenExclusivityError;
  * @param {Mocha} mocha
  * @return {Object} An object containing common functions.
  */
-module.exports = function(suites, context, mocha) {
+module.exports = function (suites, context, mocha) {
   /**
    * Check if the suite should be tested.
    *
@@ -56,7 +56,7 @@ module.exports = function(suites, context, mocha) {
      * @param {string} name
      * @param {Function} fn
      */
-    before: function(name, fn) {
+    before: function (name, fn) {
       suites[0].beforeAll(name, fn);
     },
 
@@ -66,7 +66,7 @@ module.exports = function(suites, context, mocha) {
      * @param {string} name
      * @param {Function} fn
      */
-    after: function(name, fn) {
+    after: function (name, fn) {
       suites[0].afterAll(name, fn);
     },
 
@@ -76,7 +76,7 @@ module.exports = function(suites, context, mocha) {
      * @param {string} name
      * @param {Function} fn
      */
-    beforeEach: function(name, fn) {
+    beforeEach: function (name, fn) {
       suites[0].beforeEach(name, fn);
     },
 
@@ -86,7 +86,7 @@ module.exports = function(suites, context, mocha) {
      * @param {string} name
      * @param {Function} fn
      */
-    afterEach: function(name, fn) {
+    afterEach: function (name, fn) {
       suites[0].afterEach(name, fn);
     },
 
@@ -172,7 +172,7 @@ module.exports = function(suites, context, mocha) {
        * @param {Function} test
        * @returns {*}
        */
-      only: function(mocha, test) {
+      only: function (mocha, test) {
         if (mocha.options.forbidOnly) {
           throw createForbiddenExclusivityError(mocha);
         }
@@ -185,7 +185,7 @@ module.exports = function(suites, context, mocha) {
        *
        * @param {string} title
        */
-      skip: function(title) {
+      skip: function (title) {
         context.test(title);
       }
     }

package/lib/interfaces/exports.js

@@ -19,7 +19,7 @@ var Test = require('../test');
  *
  * @param {Suite} suite Root suite.
  */
-module.exports = function(suite) {
+module.exports = function (suite) {
   var suites = [suite];
 
   suite.on(Suite.constants.EVENT_FILE_REQUIRE, visit);

package/lib/interfaces/qunit.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var Test = require('../test');
-var EVENT_FILE_PRE_REQUIRE = require('../suite').constants
-  .EVENT_FILE_PRE_REQUIRE;
+var EVENT_FILE_PRE_REQUIRE =
+  require('../suite').constants.EVENT_FILE_PRE_REQUIRE;
 
 /**
  * QUnit-style interface:
@@ -32,7 +32,7 @@ var EVENT_FILE_PRE_REQUIRE = require('../suite').constants
 module.exports = function qUnitInterface(suite) {
   var suites = [suite];
 
-  suite.on(EVENT_FILE_PRE_REQUIRE, function(context, file, mocha) {
+  suite.on(EVENT_FILE_PRE_REQUIRE, function (context, file, mocha) {
     var common = require('./common')(suites, context, mocha);
 
     context.before = common.before;
@@ -44,7 +44,7 @@ module.exports = function qUnitInterface(suite) {
      * Describe a "suite" with the given `title`.
      */
 
-    context.suite = function(title) {
+    context.suite = function (title) {
       if (suites.length > 1) {
         suites.shift();
       }
@@ -59,7 +59,7 @@ module.exports = function qUnitInterface(suite) {
      * Exclusive Suite.
      */
 
-    context.suite.only = function(title) {
+    context.suite.only = function (title) {
       if (suites.length > 1) {
         suites.shift();
       }
@@ -76,7 +76,7 @@ module.exports = function qUnitInterface(suite) {
      * acting as a thunk.
      */
 
-    context.test = function(title, fn) {
+    context.test = function (title, fn) {
       var test = new Test(title, fn);
       test.file = file;
       suites[0].addTest(test);
@@ -87,7 +87,7 @@ module.exports = function qUnitInterface(suite) {
      * Exclusive test-case.
      */
 
-    context.test.only = function(title, fn) {
+    context.test.only = function (title, fn) {
       return common.test.only(mocha, context.test(title, fn));
     };
 

package/lib/interfaces/tdd.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var Test = require('../test');
-var EVENT_FILE_PRE_REQUIRE = require('../suite').constants
-  .EVENT_FILE_PRE_REQUIRE;
+var EVENT_FILE_PRE_REQUIRE =
+  require('../suite').constants.EVENT_FILE_PRE_REQUIRE;
 
 /**
  * TDD-style interface:
@@ -29,10 +29,10 @@ var EVENT_FILE_PRE_REQUIRE = require('../suite').constants
  *
  * @param {Suite} suite Root suite.
  */
-module.exports = function(suite) {
+module.exports = function (suite) {
   var suites = [suite];
 
-  suite.on(EVENT_FILE_PRE_REQUIRE, function(context, file, mocha) {
+  suite.on(EVENT_FILE_PRE_REQUIRE, function (context, file, mocha) {
     var common = require('./common')(suites, context, mocha);
 
     context.setup = common.beforeEach;
@@ -45,7 +45,7 @@ module.exports = function(suite) {
      * Describe a "suite" with the given `title` and callback `fn` containing
      * nested suites and/or tests.
      */
-    context.suite = function(title, fn) {
+    context.suite = function (title, fn) {
       return common.suite.create({
         title: title,
         file: file,
@@ -56,7 +56,7 @@ module.exports = function(suite) {
     /**
      * Pending suite.
      */
-    context.suite.skip = function(title, fn) {
+    context.suite.skip = function (title, fn) {
       return common.suite.skip({
         title: title,
         file: file,
@@ -67,7 +67,7 @@ module.exports = function(suite) {
     /**
      * Exclusive test-case.
      */
-    context.suite.only = function(title, fn) {
+    context.suite.only = function (title, fn) {
       return common.suite.only({
         title: title,
         file: file,
@@ -79,7 +79,7 @@ module.exports = function(suite) {
      * Describe a specification or test-case with the given `title` and
      * callback `fn` acting as a thunk.
      */
-    context.test = function(title, fn) {
+    context.test = function (title, fn) {
       var suite = suites[0];
       if (suite.isPending()) {
         fn = null;
@@ -94,7 +94,7 @@ module.exports = function(suite) {
      * Exclusive test-case.
      */
 
-    context.test.only = function(title, fn) {
+    context.test.only = function (title, fn) {
       return common.test.only(mocha, context.test(title, fn));
     };