mocha 12.0.0-beta-4 → 12.0.0-beta-6

package/README.md

@@ -1,8 +1,8 @@
 <p align="center">
-  <img src="assets/mocha-logo.svg" alt="Mocha test framework logo"/>
+  <img src="docs-next/src/components/mocha-logo.svg" alt="Mocha test framework logo"/>
 </p>
 
-<p align="center">☕️ Simple, flexible, fun JavaScript test framework for Node.js & The Browser ☕️</p>
+<p align="center">☕️ Classic, reliable, trusted test framework for Node.js and the browser ☕️</p>
 
 <div align="center">
 

package/lib/cli/run-option-metadata.js

@@ -35,6 +35,7 @@ const TYPES = (exports.types = {
     "diff",
     "dry-run",
     "exit",
+    "fail-hook-affected-tests",
     "pass-on-failing-test-suite",
     "fail-zero",
     "forbid-only",

package/lib/cli/run.js

@@ -104,6 +104,11 @@ exports.builder = (yargs) =>
         description: "Not fail test run if tests were failed",
         group: GROUPS.RULES,
       },
+      "fail-hook-affected-tests": {
+        description:
+          "Report tests as failed when affected by hook failures (before/beforeEach)",
+        group: GROUPS.RULES,
+      },
       "fail-zero": {
         description: "Fail test run if no test(s) encountered",
         group: GROUPS.RULES,

package/lib/mocha.js

@@ -846,6 +846,20 @@ Mocha.prototype.dryRun = function (dryRun) {
   return this;
 };
 
+/**
+ * Reports tests as failed when they are skipped due to a hook failure.
+ *
+ * @public
+ * @see [CLI option](../#-fail-hook-affected-tests)
+ * @param {boolean} [failHookAffectedTests=true] - Whether to fail tests affected by hook failures.
+ * @return {Mocha} this
+ * @chainable
+ */
+Mocha.prototype.failHookAffectedTests = function (failHookAffectedTests) {
+  this.options.failHookAffectedTests = failHookAffectedTests !== false;
+  return this;
+};
+
 /**
  * Fails test run if no tests encountered with exit-code 1.
  *
@@ -974,6 +988,7 @@ Mocha.prototype.run = function (fn) {
     cleanReferencesAfterRun: this._cleanReferencesAfterRun,
     delay: options.delay,
     dryRun: options.dryRun,
+    failHookAffectedTests: options.failHookAffectedTests,
     failZero: options.failZero,
   });
   createStatsCollector(runner);

package/lib/nodejs/esm-utils.js

@@ -1,6 +1,7 @@
 const path = require("node:path");
 const url = require("node:url");
 const debug = require("debug")("mocha:esm-utils");
+const { isMochaError } = require("../errors");
 
 const forward = (x) => x;
 
@@ -98,7 +99,7 @@ const requireModule = async (file, esmDecorator) => {
     return require(file);
   } catch (requireErr) {
     debug("requireModule caught err: %O", requireErr.message);
-    if (requireErr.name === "TSError") {
+    if (requireErr.name === "TSError" || isMochaError(requireErr)) {
       throw requireErr;
     }
     try {

package/lib/runner.js

@@ -182,6 +182,7 @@ class Runner extends EventEmitter {
    * @param {boolean} [opts.delay] - Whether to delay execution of root suite until ready.
    * @param {boolean} [opts.dryRun] - Whether to report tests without running them.
    * @param {boolean} [opts.failZero] - Whether to fail test run if zero tests encountered.
+   * @param {boolean} [opts.failHookAffectedTests] - Whether to fail all tests affected by hook failures.
    */
   constructor(suite, opts = {}) {
     super();
@@ -441,6 +442,73 @@ Runner.prototype.checkGlobals = function (test) {
   }
 };
 
+/**
+ * Create an error object for a test that was skipped due to a hook failure.
+ *
+ * @private
+ * @param {string} hookTitle - The title of the failed hook
+ * @param {*} hookError - The error from the failed hook (may not be an Error object)
+ * @returns {Error} The error object for the skipped test
+ */
+function createHookSkipError(hookTitle, hookError) {
+  // Handle falsy or undefined exceptions
+  if (!hookError) {
+    hookError = createInvalidExceptionError(
+      'Hook "' + hookTitle + '" failed with exception: ' + hookError,
+      hookError,
+    );
+  }
+  // Convert non-Error objects to Error
+  else if (!isError(hookError)) {
+    hookError = thrown2Error(hookError);
+  }
+
+  var errorMessage =
+    'Test skipped due to failure in hook "' +
+    hookTitle +
+    '": ' +
+    hookError.message;
+  var testError = new Error(errorMessage);
+  testError.stack = hookError.stack;
+  return testError;
+}
+
+/**
+ * Fail all tests that are affected by a hook failure.
+ * This is used when the `failHookAffectedTests` option is enabled.
+ *
+ * @private
+ * @param {Suite} suite - The suite containing the affected tests
+ * @param {Error} hookError - The error from the failed hook
+ * @param {string} hookTitle - The title of the failed hook
+ */
+Runner.prototype.failAffectedTests = function (suite, hookError, hookTitle) {
+  if (!this._opts.failHookAffectedTests) {
+    return;
+  }
+
+  var self = this;
+  var testError = createHookSkipError(hookTitle, hookError);
+
+  // Recursively fail all tests in this suite and its child suites
+  function failTestsInSuite(s) {
+    s.tests.forEach(function (test) {
+      // Only fail tests that haven't been executed yet
+      if (!test.state) {
+        test.state = STATE_FAILED;
+        self.failures++;
+        self.emit(constants.EVENT_TEST_BEGIN, test);
+        self.emit(constants.EVENT_TEST_FAIL, test, testError);
+        self.emit(constants.EVENT_TEST_END, test);
+      }
+    });
+
+    s.suites.forEach(failTestsInSuite);
+  }
+
+  failTestsInSuite(suite);
+};
+
 /**
  * Fail the given `test`.
  *
@@ -583,6 +651,28 @@ Runner.prototype.hook = function (name, fn) {
         }
       } else if (err) {
         self.fail(hook, err);
+        // If failHookAffectedTests is enabled, mark affected tests as failed
+        if (self._opts.failHookAffectedTests) {
+          if (name === HOOK_TYPE_BEFORE_ALL) {
+            self.failAffectedTests(self.suite, err, hook.title);
+          } else if (name === HOOK_TYPE_BEFORE_EACH) {
+            // Fail the current test
+            if (self.test && !self.test.state) {
+              var testError = createHookSkipError(hook.title, err);
+
+              self.test.state = STATE_FAILED;
+              self.failures++;
+              self.emit(constants.EVENT_TEST_BEGIN, self.test);
+              self.emit(constants.EVENT_TEST_FAIL, self.test, testError);
+              self.emit(constants.EVENT_TEST_END, self.test);
+            }
+            // Store the hook error info for remaining tests
+            self._failedBeforeEachHook = {
+              error: err,
+              title: hook.title,
+            };
+          }
+        }
         // stop executing hooks, notify callee of hook err
         return fn(err);
       }
@@ -734,10 +824,37 @@ Runner.prototype.runTests = function (suite, fn) {
   var tests = suite.tests.slice();
   var test;
 
-  function hookErr(_, errSuite, after) {
+  function hookErr(err, errSuite, after) {
     // before/after Each hook for errSuite failed:
     var orig = self.suite;
 
+    // If failHookAffectedTests is enabled and this is a beforeEach failure,
+    // mark remaining tests as failed
+    if (
+      self._opts.failHookAffectedTests &&
+      !after &&
+      self._failedBeforeEachHook
+    ) {
+      // Fail all remaining tests in the suite
+      var remainingTests = tests.slice();
+      remainingTests.forEach(function (t) {
+        if (!t.state) {
+          var testError = createHookSkipError(
+            self._failedBeforeEachHook.title,
+            self._failedBeforeEachHook.error,
+          );
+
+          t.state = STATE_FAILED;
+          self.failures++;
+          self.emit(constants.EVENT_TEST_BEGIN, t);
+          self.emit(constants.EVENT_TEST_FAIL, t, testError);
+          self.emit(constants.EVENT_TEST_END, t);
+        }
+      });
+      // Clear the stored hook info
+      delete self._failedBeforeEachHook;
+    }
+
     // for failed 'after each' hook start from errSuite parent,
     // otherwise start from errSuite itself
     self.suite = after ? errSuite.parent : errSuite;

package/lib/suite.js

@@ -159,6 +159,16 @@ Suite.prototype.timeout = function (ms) {
 
   debug("timeout %d", ms);
   this._timeout = parseInt(ms, 10);
+
+  // Allow overriding inner/nested suites
+  // See and test-cases with chain-called timeout argument.
+  // https://github.com/mochajs/mocha/issues/5422
+  for (const t of this.tests) {
+    t.timeout(this._timeout);
+  }
+  for (const s of this.suites) {
+    s.timeout(this._timeout);
+  }
   return this;
 };
 

package/mocha.js

@@ -1,4 +1,4 @@
-// mocha@12.0.0-beta-4 in javascript ES2018
+// mocha@12.0.0-beta-6 in javascript ES2018
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
@@ -11340,6 +11340,16 @@
 
 			  debug("timeout %d", ms);
 			  this._timeout = parseInt(ms, 10);
+
+			  // Allow overriding inner/nested suites
+			  // See and test-cases with chain-called timeout argument.
+			  // https://github.com/mochajs/mocha/issues/5422
+			  for (const t of this.tests) {
+			    t.timeout(this._timeout);
+			  }
+			  for (const s of this.suites) {
+			    s.timeout(this._timeout);
+			  }
 			  return this;
 			};
 
@@ -12042,6 +12052,7 @@
 		   * @param {boolean} [opts.delay] - Whether to delay execution of root suite until ready.
 		   * @param {boolean} [opts.dryRun] - Whether to report tests without running them.
 		   * @param {boolean} [opts.failZero] - Whether to fail test run if zero tests encountered.
+		   * @param {boolean} [opts.failHookAffectedTests] - Whether to fail all tests affected by hook failures.
 		   */
 		  constructor(suite, opts = {}) {
 		    super();
@@ -12301,6 +12312,73 @@
 		  }
 		};
 
+		/**
+		 * Create an error object for a test that was skipped due to a hook failure.
+		 *
+		 * @private
+		 * @param {string} hookTitle - The title of the failed hook
+		 * @param {*} hookError - The error from the failed hook (may not be an Error object)
+		 * @returns {Error} The error object for the skipped test
+		 */
+		function createHookSkipError(hookTitle, hookError) {
+		  // Handle falsy or undefined exceptions
+		  if (!hookError) {
+		    hookError = createInvalidExceptionError(
+		      'Hook "' + hookTitle + '" failed with exception: ' + hookError,
+		      hookError,
+		    );
+		  }
+		  // Convert non-Error objects to Error
+		  else if (!isError(hookError)) {
+		    hookError = thrown2Error(hookError);
+		  }
+
+		  var errorMessage =
+		    'Test skipped due to failure in hook "' +
+		    hookTitle +
+		    '": ' +
+		    hookError.message;
+		  var testError = new Error(errorMessage);
+		  testError.stack = hookError.stack;
+		  return testError;
+		}
+
+		/**
+		 * Fail all tests that are affected by a hook failure.
+		 * This is used when the `failHookAffectedTests` option is enabled.
+		 *
+		 * @private
+		 * @param {Suite} suite - The suite containing the affected tests
+		 * @param {Error} hookError - The error from the failed hook
+		 * @param {string} hookTitle - The title of the failed hook
+		 */
+		Runner.prototype.failAffectedTests = function (suite, hookError, hookTitle) {
+		  if (!this._opts.failHookAffectedTests) {
+		    return;
+		  }
+
+		  var self = this;
+		  var testError = createHookSkipError(hookTitle, hookError);
+
+		  // Recursively fail all tests in this suite and its child suites
+		  function failTestsInSuite(s) {
+		    s.tests.forEach(function (test) {
+		      // Only fail tests that haven't been executed yet
+		      if (!test.state) {
+		        test.state = STATE_FAILED;
+		        self.failures++;
+		        self.emit(constants.EVENT_TEST_BEGIN, test);
+		        self.emit(constants.EVENT_TEST_FAIL, test, testError);
+		        self.emit(constants.EVENT_TEST_END, test);
+		      }
+		    });
+
+		    s.suites.forEach(failTestsInSuite);
+		  }
+
+		  failTestsInSuite(suite);
+		};
+
 		/**
 		 * Fail the given `test`.
 		 *
@@ -12443,6 +12521,28 @@
 		        }
 		      } else if (err) {
 		        self.fail(hook, err);
+		        // If failHookAffectedTests is enabled, mark affected tests as failed
+		        if (self._opts.failHookAffectedTests) {
+		          if (name === HOOK_TYPE_BEFORE_ALL) {
+		            self.failAffectedTests(self.suite, err, hook.title);
+		          } else if (name === HOOK_TYPE_BEFORE_EACH) {
+		            // Fail the current test
+		            if (self.test && !self.test.state) {
+		              var testError = createHookSkipError(hook.title, err);
+
+		              self.test.state = STATE_FAILED;
+		              self.failures++;
+		              self.emit(constants.EVENT_TEST_BEGIN, self.test);
+		              self.emit(constants.EVENT_TEST_FAIL, self.test, testError);
+		              self.emit(constants.EVENT_TEST_END, self.test);
+		            }
+		            // Store the hook error info for remaining tests
+		            self._failedBeforeEachHook = {
+		              error: err,
+		              title: hook.title,
+		            };
+		          }
+		        }
 		        // stop executing hooks, notify callee of hook err
 		        return fn(err);
 		      }
@@ -12594,10 +12694,37 @@
 		  var tests = suite.tests.slice();
 		  var test;
 
-		  function hookErr(_, errSuite, after) {
+		  function hookErr(err, errSuite, after) {
 		    // before/after Each hook for errSuite failed:
 		    var orig = self.suite;
 
+		    // If failHookAffectedTests is enabled and this is a beforeEach failure,
+		    // mark remaining tests as failed
+		    if (
+		      self._opts.failHookAffectedTests &&
+		      !after &&
+		      self._failedBeforeEachHook
+		    ) {
+		      // Fail all remaining tests in the suite
+		      var remainingTests = tests.slice();
+		      remainingTests.forEach(function (t) {
+		        if (!t.state) {
+		          var testError = createHookSkipError(
+		            self._failedBeforeEachHook.title,
+		            self._failedBeforeEachHook.error,
+		          );
+
+		          t.state = STATE_FAILED;
+		          self.failures++;
+		          self.emit(constants.EVENT_TEST_BEGIN, t);
+		          self.emit(constants.EVENT_TEST_FAIL, t, testError);
+		          self.emit(constants.EVENT_TEST_END, t);
+		        }
+		      });
+		      // Clear the stored hook info
+		      delete self._failedBeforeEachHook;
+		    }
+
 		    // for failed 'after each' hook start from errSuite parent,
 		    // otherwise start from errSuite itself
 		    self.suite = after ? errSuite.parent : errSuite;
@@ -18060,6 +18187,20 @@
 			  return this;
 			};
 
+			/**
+			 * Reports tests as failed when they are skipped due to a hook failure.
+			 *
+			 * @public
+			 * @see [CLI option](../#-fail-hook-affected-tests)
+			 * @param {boolean} [failHookAffectedTests=true] - Whether to fail tests affected by hook failures.
+			 * @return {Mocha} this
+			 * @chainable
+			 */
+			Mocha.prototype.failHookAffectedTests = function (failHookAffectedTests) {
+			  this.options.failHookAffectedTests = failHookAffectedTests !== false;
+			  return this;
+			};
+
 			/**
 			 * Fails test run if no tests encountered with exit-code 1.
 			 *
@@ -18188,6 +18329,7 @@
 			    cleanReferencesAfterRun: this._cleanReferencesAfterRun,
 			    delay: options.delay,
 			    dryRun: options.dryRun,
+			    failHookAffectedTests: options.failHookAffectedTests,
 			    failZero: options.failZero,
 			  });
 			  createStatsCollector(runner);