mocha 10.7.3 → 10.8.1

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2011-2022 OpenJS Foundation and contributors, https://openjsf.org
+Copyright (c) 2011-2024 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

@@ -1,23 +1,26 @@
 <p align="center">
-  <img src="https://cldup.com/xFVFxOioAU.svg" alt="Mocha test framework logo"/>
+  <img src="assets/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">
-<a href="https://github.com/mochajs/mocha/actions?query=workflow%3ATests+branch%3Amain"><img src="https://github.com/mochajs/mocha/workflows/Tests/badge.svg?branch=main" alt="GitHub Actions Build Status"></a>
-<a href="https://coveralls.io/github/mochajs/mocha"><img src="https://coveralls.io/repos/github/mochajs/mocha/badge.svg" alt="Coverage Status"></a>
-<a href="https://discord.gg/KeDn2uXhER"><img alt="Chat - Discord" src="https://img.shields.io/badge/chat-Discord-5765F2.svg" /></a>
-<a href="https://github.com/mochajs/mocha#sponsors"><img src="https://opencollective.com/mochajs/tiers/sponsors/badge.svg" alt="OpenCollective Sponsors"></a>
-<a href="https://github.com/mochajs/mocha#backers"><img src="https://opencollective.com/mochajs/tiers/backers/badge.svg" alt="OpenCollective Backers"></a>
-</p>
+<div align="center">
 
-<p align="center">
 <a href="https://www.npmjs.com/package/mocha"><img src="https://img.shields.io/npm/v/mocha.svg" alt="NPM Version"></a>
 <a href="https://github.com/mochajs/mocha"><img src="https://img.shields.io/node/v/mocha.svg" alt="Node Version"></a>
-</p>
+[![GitHub Actions Build Status](https://github.com/mochajs/mocha/actions/workflows/mocha.yml/badge.svg)](https://github.com/mochajs/mocha/actions/workflows/mocha.yml)
+<a href="https://coveralls.io/github/mochajs/mocha"><img src="https://coveralls.io/repos/github/mochajs/mocha/badge.svg" alt="Coverage Status"></a>
+
+</div>
 
-<p align="center"><br><img alt="Mocha Browser Support h/t SauceLabs" src="https://saucelabs.com/browser-matrix/mochajs.svg" width="354"></p>
+<div align="center">
+
+<a href="https://discord.gg/KeDn2uXhER"><img alt="Chat - Discord" src="https://img.shields.io/badge/Chat-Discord-5765F2.svg" /></a>
+<a href="https://github.com/mochajs/mocha#sponsors"><img src="https://opencollective.com/mochajs/tiers/sponsors/badge.svg" alt="OpenCollective Sponsors"></a>
+<a href="https://github.com/mochajs/mocha#backers"><img src="https://opencollective.com/mochajs/tiers/backers/badge.svg" alt="OpenCollective Backers"></a>
+[![Collective Funds Guidelines v0.1](https://img.shields.io/badge/collective_funds_guidelines-v0.1-D8E8D4?style=flat&labelColor=3A6457)](https://github.com/collective-funds/guidelines)
+
+</div>
 
 ## Links
 
@@ -68,6 +71,4 @@ Finally, come [chat with the maintainers on Discord](https://discord.gg/KeDn2uXh
 
 ## License
 
-Copyright 2011-2022 OpenJS Foundation and contributors. Licensed [MIT](https://github.com/mochajs/mocha/blob/main/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)
+Copyright 2011-2024 OpenJS Foundation and contributors. Licensed [MIT](https://github.com/mochajs/mocha/blob/main/LICENSE).

package/lib/cli/options.js

@@ -181,8 +181,24 @@ const loadPkgRc = (args = {}) => {
   result = {};
   const filepath = args.package || findUp.sync(mocharc.package);
   if (filepath) {
+    let configData;
     try {
-      const pkg = JSON.parse(fs.readFileSync(filepath, 'utf8'));
+      configData = fs.readFileSync(filepath, 'utf8');
+    } catch (err) {
+      // If `args.package` was explicitly specified, throw an error
+      if (filepath == args.package) {
+        throw createUnparsableFileError(
+          `Unable to read ${filepath}: ${err}`,
+          filepath
+        );
+      } else {
+        debug('failed to read default package.json at %s; ignoring',
+              filepath);
+        return result;
+      }
+    }
+    try {
+      const pkg = JSON.parse(configData);
       if (pkg.mocha) {
         debug('`mocha` prop of package.json parsed: %O', pkg.mocha);
         result = pkg.mocha;
@@ -190,13 +206,11 @@ const loadPkgRc = (args = {}) => {
         debug('no config found in %s', filepath);
       }
     } catch (err) {
-      if (args.package) {
-        throw createUnparsableFileError(
-          `Unable to read/parse ${filepath}: ${err}`,
-          filepath
-        );
-      }
-      debug('failed to read default package.json at %s; ignoring', filepath);
+      // If JSON failed to parse, throw an error.
+      throw createUnparsableFileError(
+        `Unable to parse ${filepath}: ${err}`,
+        filepath
+      );
     }
   }
   return result;

package/lib/reporters/html.js

@@ -32,11 +32,12 @@ var Date = global.Date;
 exports = module.exports = HTML;
 
 /**
- * Stats template.
+ * Stats template: Result, progress, passes, failures, and duration.
  */
 
 var statsTemplate =
   '<ul id="mocha-stats">' +
+  '<li class="result"></li>' +
   '<li class="progress-contain"><progress class="progress-element" max="100" value="0"></progress><svg class="progress-ring"><circle class="ring-flatlight" stroke-dasharray="100%,0%"/><circle class="ring-highlight" stroke-dasharray="0%,100%"/></svg><div class="progress-text">0%</div></li>' +
   '<li class="passes"><a href="javascript:void(0);">passes:</a> <em>0</em></li>' +
   '<li class="failures"><a href="javascript:void(0);">failures:</a> <em>0</em></li>' +
@@ -62,18 +63,35 @@ function HTML(runner, options) {
   var stats = this.stats;
   var stat = fragment(statsTemplate);
   var items = stat.getElementsByTagName('li');
-  var passes = items[1].getElementsByTagName('em')[0];
-  var passesLink = items[1].getElementsByTagName('a')[0];
-  var failures = items[2].getElementsByTagName('em')[0];
-  var failuresLink = items[2].getElementsByTagName('a')[0];
-  var duration = items[3].getElementsByTagName('em')[0];
+  const resultIndex = 0;
+  const progressIndex = 1;
+  const passesIndex = 2;
+  const failuresIndex = 3;
+  const durationIndex = 4;
+  /** Stat item containing the root suite pass or fail indicator (hasFailures ? '✖' : '✓') */
+  var resultIndicator = items[resultIndex];
+  /** Passes text and count */
+  const passesStat = items[passesIndex];
+  /** Stat item containing the pass count (not the word, just the number) */
+  const passesCount = passesStat.getElementsByTagName('em')[0];
+  /** Stat item linking to filter to show only passing tests */
+  const passesLink = passesStat.getElementsByTagName('a')[0];
+  /** Failures text and count */
+  const failuresStat = items[failuresIndex];
+  /** Stat item containing the failure count (not the word, just the number) */
+  const failuresCount = failuresStat.getElementsByTagName('em')[0];
+  /** Stat item linking to filter to show only failing tests */
+  const failuresLink = failuresStat.getElementsByTagName('a')[0];
+  /** Stat item linking to the duration time (not the word or unit, just the number) */
+  var duration = items[durationIndex].getElementsByTagName('em')[0];
   var report = fragment('<ul id="mocha-report"></ul>');
   var stack = [report];
-  var progressText = items[0].getElementsByTagName('div')[0];
-  var progressBar = items[0].getElementsByTagName('progress')[0];
+  var progressText = items[progressIndex].getElementsByTagName('div')[0];
+  var progressBar = items[progressIndex].getElementsByTagName('progress')[0];
   var progressRing = [
-    items[0].getElementsByClassName('ring-flatlight')[0],
-    items[0].getElementsByClassName('ring-highlight')[0]];
+    items[progressIndex].getElementsByClassName('ring-flatlight')[0],
+    items[progressIndex].getElementsByClassName('ring-highlight')[0]
+  ];
   var progressRingRadius = null; // computed CSS unavailable now, so set later
   var root = document.getElementById('mocha');
 
@@ -127,6 +145,10 @@ function HTML(runner, options) {
 
   runner.on(EVENT_SUITE_END, function (suite) {
     if (suite.root) {
+      if (stats.failures === 0) {
+        text(resultIndicator, '✓');
+        stat.className += ' pass';
+      }
       updateStats();
       return;
     }
@@ -147,6 +169,10 @@ function HTML(runner, options) {
   });
 
   runner.on(EVENT_TEST_FAIL, function (test) {
+    // Update stat items
+    text(resultIndicator, '✖');
+    stat.className += ' fail';
+
     var el = fragment(
       '<li class="test fail"><h2>%e <a href="%e" class="replay">' +
         playIcon +
@@ -219,7 +245,6 @@ function HTML(runner, options) {
   }
 
   function updateStats() {
-    // TODO: add to stats
     var percent = ((stats.tests / runner.total) * 100) | 0;
     progressBar.value = percent;
     if (progressText) {
@@ -245,8 +270,8 @@ function HTML(runner, options) {
 
     // update stats
     var ms = new Date() - stats.start;
-    text(passes, stats.passes);
-    text(failures, stats.failures);
+    text(passesCount, stats.passes);
+    text(failuresCount, stats.failures);
     text(duration, (ms / 1000).toFixed(2));
   }
 }
@@ -269,7 +294,7 @@ function makeUrl(s) {
     window.location.pathname +
     (search ? search + '&' : '?') +
     'grep=' +
-    encodeURIComponent(escapeRe(s))
+    encodeURIComponent(s)
   );
 }
 
@@ -279,7 +304,7 @@ function makeUrl(s) {
  * @param {Object} [suite]
  */
 HTML.prototype.suiteURL = function (suite) {
-  return makeUrl(suite.fullTitle());
+  return makeUrl('^' + escapeRe(suite.fullTitle()) + ' ');
 };
 
 /**
@@ -288,7 +313,7 @@ HTML.prototype.suiteURL = function (suite) {
  * @param {Object} [test]
  */
 HTML.prototype.testURL = function (test) {
-  return makeUrl(test.fullTitle());
+  return makeUrl('^' + escapeRe(test.fullTitle()) + '$');
 };
 
 /**

package/mocha.css

@@ -3,11 +3,11 @@
 :root {
   --mocha-color: #000;
   --mocha-bg-color: #fff;
-  --mocha-pass-icon-color: #00d6b2;
-  --mocha-pass-color: #fff;
-  --mocha-pass-shadow-color: rgba(0,0,0,.2);
-  --mocha-pass-mediump-color: #c09853;
-  --mocha-pass-slow-color: #b94a48;
+  --mocha-test-pass-color: #007f6a;
+  --mocha-test-pass-duration-color: #fff;
+  --mocha-test-pass-shadow-color: rgba(0,0,0, 0.2);
+  --mocha-test-pass-mediump-color: #c09853;
+  --mocha-test-pass-slow-color: #b94a48;
   --mocha-test-pending-color: #0b97c4;
   --mocha-test-pending-icon-color: #0b97c4;
   --mocha-test-fail-color: #c00;
@@ -38,11 +38,11 @@
   :root {
      --mocha-color: #fff;
      --mocha-bg-color: #222;
-     --mocha-pass-icon-color: #00d6b2;
-     --mocha-pass-color: #222;
-     --mocha-pass-shadow-color: rgba(255,255,255,.2);
-     --mocha-pass-mediump-color: #f1be67;
-     --mocha-pass-slow-color: #f49896;
+     --mocha-test-pass-color: #00d6b2;
+     --mocha-test-pass-duration-color: #222;
+     --mocha-test-pass-shadow-color: rgba(255, 255, 255, 0.2);
+     --mocha-test-pass-mediump-color: #f1be67;
+     --mocha-test-pass-slow-color: #f49896;
      --mocha-test-pending-color: #0b97c4;
      --mocha-test-pending-icon-color: #0b97c4;
      --mocha-test-fail-color: #f44;
@@ -141,11 +141,11 @@ body {
 }
 
 #mocha .test.pass.medium .duration {
-  background: var(--mocha-pass-mediump-color);
+  background: var(--mocha-test-pass-mediump-color);
 }
 
 #mocha .test.pass.slow .duration {
-  background: var(--mocha-pass-slow-color);
+  background: var(--mocha-test-pass-slow-color);
 }
 
 #mocha .test.pass::before {
@@ -154,17 +154,17 @@ body {
   display: block;
   float: left;
   margin-right: 5px;
-  color: var(--mocha-pass-icon-color);
+  color: var(--mocha-test-pass-color);
 }
 
 #mocha .test.pass .duration {
   font-size: 9px;
   margin-left: 5px;
   padding: 2px 5px;
-  color: var(--mocha-pass-color);
-  -webkit-box-shadow: inset 0 1px 1px var(--mocha-pass-shadow-color);
-  -moz-box-shadow: inset 0 1px 1px var(--mocha-pass-shadow-color);
-  box-shadow: inset 0 1px 1px var(--mocha-pass-shadow-color);
+  color: var(--mocha-test-pass-duration-color);
+  -webkit-box-shadow: inset 0 1px 1px var(--mocha-test-pass-shadow-color);
+  -moz-box-shadow: inset 0 1px 1px var(--mocha-test-pass-shadow-color);
+  box-shadow: inset 0 1px 1px var(--mocha-test-pass-shadow-color);
   -webkit-border-radius: 5px;
   -moz-border-radius: 5px;
   -ms-border-radius: 5px;
@@ -344,12 +344,37 @@ body {
   z-index: 1;
 }
 
+#mocha-stats.fail li.result {
+  color: var(--mocha-test-fail-color);
+}
+
+#mocha-stats.fail li.failures {
+  color: var(--mocha-test-fail-color);
+}
+
+#mocha-stats.fail li.failures em {
+  color: var(--mocha-test-fail-color);
+}
+
+#mocha-stats.pass li.result {
+  color: var(--mocha-test-pass-color);
+}
+
+#mocha-stats.pass li.passes {
+  color: var(--mocha-test-pass-color);
+}
+
+#mocha-stats.pass li.passes em {
+  color: var(--mocha-test-pass-color);
+}
+
 #mocha-stats .progress-contain {
   float: right;
   padding: 0;
 }
 
-#mocha-stats :is(.progress-element, .progress-text) {
+#mocha-stats .progress-element,
+#mocha-stats .progress-text {
   width: var(--ring-container-size);
   display: block;
   top: 12px;
@@ -374,7 +399,8 @@ body {
   height: var(--ring-container-size);
 }
 
-#mocha-stats :is(.ring-flatlight, .ring-highlight) {
+#mocha-stats .ring-flatlight,
+#mocha-stats .ring-highlight {
   --stroke-thickness: 1.65px;
   --center: calc(var(--ring-container-size) / 2);
   cx: var(--center);

package/mocha.js

@@ -1,4 +1,4 @@
-// mocha@10.7.3 in javascript ES2018
+// mocha@10.8.1 in javascript ES2018
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -16729,11 +16729,12 @@
   module.exports = HTML;
 
   /**
-   * Stats template.
+   * Stats template: Result, progress, passes, failures, and duration.
    */
 
   var statsTemplate =
     '<ul id="mocha-stats">' +
+    '<li class="result"></li>' +
     '<li class="progress-contain"><progress class="progress-element" max="100" value="0"></progress><svg class="progress-ring"><circle class="ring-flatlight" stroke-dasharray="100%,0%"/><circle class="ring-highlight" stroke-dasharray="0%,100%"/></svg><div class="progress-text">0%</div></li>' +
     '<li class="passes"><a href="javascript:void(0);">passes:</a> <em>0</em></li>' +
     '<li class="failures"><a href="javascript:void(0);">failures:</a> <em>0</em></li>' +
@@ -16759,18 +16760,35 @@
     var stats = this.stats;
     var stat = fragment(statsTemplate);
     var items = stat.getElementsByTagName('li');
-    var passes = items[1].getElementsByTagName('em')[0];
-    var passesLink = items[1].getElementsByTagName('a')[0];
-    var failures = items[2].getElementsByTagName('em')[0];
-    var failuresLink = items[2].getElementsByTagName('a')[0];
-    var duration = items[3].getElementsByTagName('em')[0];
+    const resultIndex = 0;
+    const progressIndex = 1;
+    const passesIndex = 2;
+    const failuresIndex = 3;
+    const durationIndex = 4;
+    /** Stat item containing the root suite pass or fail indicator (hasFailures ? '✖' : '✓') */
+    var resultIndicator = items[resultIndex];
+    /** Passes text and count */
+    const passesStat = items[passesIndex];
+    /** Stat item containing the pass count (not the word, just the number) */
+    const passesCount = passesStat.getElementsByTagName('em')[0];
+    /** Stat item linking to filter to show only passing tests */
+    const passesLink = passesStat.getElementsByTagName('a')[0];
+    /** Failures text and count */
+    const failuresStat = items[failuresIndex];
+    /** Stat item containing the failure count (not the word, just the number) */
+    const failuresCount = failuresStat.getElementsByTagName('em')[0];
+    /** Stat item linking to filter to show only failing tests */
+    const failuresLink = failuresStat.getElementsByTagName('a')[0];
+    /** Stat item linking to the duration time (not the word or unit, just the number) */
+    var duration = items[durationIndex].getElementsByTagName('em')[0];
     var report = fragment('<ul id="mocha-report"></ul>');
     var stack = [report];
-    var progressText = items[0].getElementsByTagName('div')[0];
-    var progressBar = items[0].getElementsByTagName('progress')[0];
+    var progressText = items[progressIndex].getElementsByTagName('div')[0];
+    var progressBar = items[progressIndex].getElementsByTagName('progress')[0];
     var progressRing = [
-      items[0].getElementsByClassName('ring-flatlight')[0],
-      items[0].getElementsByClassName('ring-highlight')[0]];
+      items[progressIndex].getElementsByClassName('ring-flatlight')[0],
+      items[progressIndex].getElementsByClassName('ring-highlight')[0]
+    ];
     var root = document.getElementById('mocha');
 
     if (!root) {
@@ -16823,6 +16841,10 @@
 
     runner.on(EVENT_SUITE_END, function (suite) {
       if (suite.root) {
+        if (stats.failures === 0) {
+          text(resultIndicator, '✓');
+          stat.className += ' pass';
+        }
         updateStats();
         return;
       }
@@ -16843,6 +16865,10 @@
     });
 
     runner.on(EVENT_TEST_FAIL, function (test) {
+      // Update stat items
+      text(resultIndicator, '✖');
+      stat.className += ' fail';
+
       var el = fragment(
         '<li class="test fail"><h2>%e <a href="%e" class="replay">' +
           playIcon +
@@ -16915,7 +16941,6 @@
     }
 
     function updateStats() {
-      // TODO: add to stats
       var percent = ((stats.tests / runner.total) * 100) | 0;
       progressBar.value = percent;
       if (progressText) {
@@ -16941,8 +16966,8 @@
 
       // update stats
       var ms = new Date() - stats.start;
-      text(passes, stats.passes);
-      text(failures, stats.failures);
+      text(passesCount, stats.passes);
+      text(failuresCount, stats.failures);
       text(duration, (ms / 1000).toFixed(2));
     }
   }
@@ -16965,7 +16990,7 @@
       window.location.pathname +
       (search ? search + '&' : '?') +
       'grep=' +
-      encodeURIComponent(escapeRe(s))
+      encodeURIComponent(s)
     );
   }
 
@@ -16975,7 +17000,7 @@
    * @param {Object} [suite]
    */
   HTML.prototype.suiteURL = function (suite) {
-    return makeUrl(suite.fullTitle());
+    return makeUrl('^' + escapeRe(suite.fullTitle()) + ' ');
   };
 
   /**
@@ -16984,7 +17009,7 @@
    * @param {Object} [test]
    */
   HTML.prototype.testURL = function (test) {
-    return makeUrl(test.fullTitle());
+    return makeUrl('^' + escapeRe(test.fullTitle()) + '$');
   };
 
   /**
@@ -19174,7 +19199,7 @@
   };
 
   var name = "mocha";
-  var version = "10.7.3";
+  var version = "10.8.1";
   var homepage = "https://mochajs.org/";
   var notifyLogo = "https://ibin.co/4QuRuGjXvl36.png";
   var require$$17 = {