Bump version to 7.0.0-pre.0

Safari 16 and 17 runners are no longer reliably available in CI. Saucelabs
still provides them, but session creation failures have been frequent for
weeks now. When this has happened in the past, it's been a prelude to
Saucelabs dropping the affected Safari versions altogether.

We could live with retrying ~30-50% of test runs in the hope that things
might improve, but it's probably better to just rip the band-aid off.

.circleci/config.yml

@@ -1,5 +1,5 @@
 # Run tests against supported Node versions, and (except for pull requests)
-# against supported browsers.
+# against supported browsers that are available on Saucelabs.
 
 version: 2.1
 
@@ -89,7 +89,7 @@ jobs:
             export SAUCE_TUNNEL_NAME=$CIRCLE_WORKFLOW_JOB_ID
             scripts/start-sauce-connect
             set +o errexit
-            scripts/run-all-browsers
+            scripts/run-sauce-browsers
             exitcode=$?
             set -o errexit
             scripts/stop-sauce-connect

.github/CONTRIBUTING.md

@@ -41,13 +41,11 @@ Jasmine tests itself. The files in `lib` are loaded first, defining the referenc
 
 The tests should always use `jasmineUnderTest` to refer to the objects and functions that are being tested. But the tests can use functions on `jasmine` as needed. _Be careful how you structure any new test code_. Copy the patterns you see in the existing code - this ensures that the code you're testing is not leaking into the `jasmine` reference and vice-versa.
 
-### `boot0.js` and `boot1.js`
+### `boot.js`
 
-These files file does all of the setup necessary for Jasmine to work in a
-browser. They load all of the code, create an `Env`, attach the global
-functions, and build the reporter. It also sets up the execution of the 
-`Env` - for browsers this is in `window.onload`. While the default in `lib`
-is appropriate for browsers, projects may wish to customize this file.
+This file does all the setup necessary for Jasmine to work in a browser. While
+the default in `lib`is appropriate for most uses, users may wish to customize
+this file.
 
 ### Compatibility
 

.github/workflows/safari.yml

@@ -0,0 +1,23 @@
+name: Test in latest available Safari
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'
+jobs:
+  build:
+    runs-on: macos-latest
+
+    steps:
+    - name: Report Safari version
+      run: osascript -e 'get version of application "Safari"'
+    - uses: actions/checkout@v4
+    - name: Use Node.js 22.x
+      uses: actions/setup-node@v4
+      with:
+        node-version: 22.x
+    - run: npm install
+    - run: npm run build
+    - run: JASMINE_BROWSER=safari npm run ci

LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2008-2019 Pivotal Labs
-Copyright (c) 2008-2025 The Jasmine developers
+Copyright (c) 2008-2026 The Jasmine developers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -30,7 +30,7 @@ Microsoft Edge) as well as Node.
 | Environment       | Supported versions               |
 |-------------------|----------------------------------|
 | Node              | 20, 22, 24                       |
-| Safari            | 16*, 17*                         |
+| Safari            | 26*                              |
 | Chrome            | Evergreen                        |
 | Firefox           | Evergreen, 102*, 115*, 128*, 140 |
 | Edge              | Evergreen                        |
@@ -60,5 +60,5 @@ To find out what environments work with a particular Jasmine release, see the [r
 * Sheel Choksi
 
 Copyright (c) 2008-2019 Pivotal Labs<br>
-Copyright (c) 2008-2025 The Jasmine developers<br>
+Copyright (c) 2008-2026 The Jasmine developers<br>
 This software is licensed under the [MIT License](https://github.com/jasmine/jasmine/blob/main/LICENSE).

RELEASE.md

@@ -28,9 +28,18 @@ should also rev to that version.
 
 When ready to release - specs are all green and the stories are done:
 
-1. Update the release notes in `release_notes` - use the Anchorman gem to generate the markdown file and edit accordingly. Include a list of supported environments.
-1. Update the version in `package.json`
-1. Run `npm run build`.
+1. Update the release notes in `release_notes` - use the Anchorman gem to 
+   generate the Markdown file and edit accordingly. Include a list of supported
+   environments. Get that information from these places:
+   * For Node, see .circleci/config.yml or the README.
+   * For Firefox ESR and Safari <=17, see scripts/run-sauce-browsers or the README.
+   * For evergreen browsers, trigger a Circle CI run and check the
+     [Saucelabs dashboard](https://app.saucelabs.com/dashboard/tests?ownerId=90a771d55857492da3bd5251a2d92457&ownerType=user&ownerName=jasmine-js&start=last7days)
+     once it's finished.
+   * For Safari >17, trigger the [Safari action](https://github.com/jasmine/jasmine/actions/workflows/safari.yml)
+     and get the version from the output.
+2. Update the version in `package.json`
+3. Run `npm run build`.
 
 ### Commit and push core changes
 

lib/jasmine-core.js

@@ -1,6 +1,6 @@
 /*
 Copyright (c) 2008-2019 Pivotal Labs
-Copyright (c) 2008-2025 The Jasmine developers
+Copyright (c) 2008-2026 The Jasmine developers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -24,70 +24,26 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
 
-/**
- * Note: Only available on Node.
- * @module jasmine-core
- */
+const path = require('path');
+const fs = require('fs');
+const {
+  globals,
+  installGlobals,
+  version,
+  private$
+} = require('./jasmine-core/jasmine.js');
 
-const jasmineRequire = require('./jasmine-core/jasmine.js');
-module.exports = jasmineRequire;
-
-const bootWithoutGlobals = (function() {
-  let jasmine, jasmineInterface;
-
-  return function bootWithoutGlobals(reinitialize) {
-    if (!jasmineInterface || reinitialize === true) {
-      jasmine = jasmineRequire.core(jasmineRequire);
-      const env = jasmine.getEnv({ suppressLoadErrors: true });
-      jasmineInterface = jasmineRequire.interface(jasmine, env);
-    }
-
-    return { jasmine, jasmineInterface };
-  };
-})();
-
-/**
- * Boots a copy of Jasmine and returns an object as described in {@link jasmine}.
- * @param {boolean} [reinitialize=true] Whether to create a new copy of Jasmine if one already exists
- * @type {function}
- * @return {jasmine}
- */
-module.exports.boot = function(reinitialize) {
-  if (reinitialize === undefined) {
-    reinitialize = true;
-  }
-
-  const { jasmine, jasmineInterface } = bootWithoutGlobals(reinitialize);
-
-  for (const k in jasmineInterface) {
-    global[k] = jasmineInterface[k];
-  }
-
-  return jasmine;
-};
-
-/**
- * Boots a copy of Jasmine and returns an object containing the properties
- * that would normally be added to the global object. If noGlobals is called
- * multiple times, the same object is returned every time.
- *
- * @example
- * const {describe, beforeEach, it, expect, jasmine} = require('jasmine-core').noGlobals();
- */
-module.exports.noGlobals = function() {
-  const { jasmineInterface } = bootWithoutGlobals(false);
-  return jasmineInterface;
-};
-
-const path = require('path'),
-  fs = require('fs');
+function reset() {
+  private$.currentEnv_ = null;
+  const env = jasmine.getEnv({ suppressLoadErrors: true });
+  rebindInterface(env);
+}
 
 const rootPath = path.join(__dirname, 'jasmine-core'),
-  bootFiles = ['boot0.js', 'boot1.js'],
-  legacyBootFiles = ['boot.js'],
+  bootFiles = ['boot.js'],
   cssFiles = [],
   jsFiles = [],
-  jsFilesToSkip = ['jasmine.js'].concat(bootFiles, legacyBootFiles);
+  jsFilesToSkip = ['jasmine.js'].concat(bootFiles);
 
 fs.readdirSync(rootPath).forEach(function(file) {
   if (fs.statSync(path.join(rootPath, file)).isFile()) {
@@ -104,12 +60,40 @@ fs.readdirSync(rootPath).forEach(function(file) {
   }
 });
 
-module.exports.files = {
-  self: __filename,
-  path: rootPath,
-  bootDir: rootPath,
-  bootFiles: bootFiles,
-  cssFiles: cssFiles,
-  jsFiles: ['jasmine.js'].concat(jsFiles),
-  imagesDir: path.join(__dirname, '../images')
+/**
+ * Note: Only available on Node.
+ *
+ * In addition to the members documented here, this module's exports include all
+ * {@link globals}.
+ * @module jasmine-core
+ */
+module.exports = {
+  ...globals,
+  /**
+   * Copies Jasmine globals (jasmine, describe, it, etc) to the specified
+   * object or to globalThis.
+   * @function
+   * @param {object} [dest] - The object to copy globals to.
+   */
+  installGlobals,
+  /**
+   * Returns the jasmine-core version.
+   * @function
+   */
+  version,
+  /**
+   * Resets all of jasmine-core's state, including removing specs, suites, and
+   * reporters, and resetting configuration to the default.
+   * @function
+   */
+  reset,
+  files: {
+    self: __filename,
+    path: rootPath,
+    bootDir: rootPath,
+    bootFiles: bootFiles,
+    cssFiles: cssFiles,
+    jsFiles: ['jasmine.js'].concat(jsFiles),
+    imagesDir: path.join(__dirname, '../images')
+  }
 };

lib/jasmine-core/boot.js

@@ -0,0 +1,51 @@
+/*
+Copyright (c) 2008-2019 Pivotal Labs
+Copyright (c) 2008-2026 The Jasmine developers
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+'use strict';
+
+(function() {
+  const env = jasmine.getEnv();
+  const urls = new jasmine.HtmlReporterV2Urls();
+
+  /**
+   * Configures Jasmine based on the current set of query parameters. This
+   * supports all parameters set by the HTML reporter as well as
+   * spec=partialPath, which filters out specs whose paths don't contain the
+   * parameter.
+   */
+  env.configure(urls.configFromCurrentUrl());
+
+  const currentWindowOnload = window.onload;
+  window.onload = function() {
+    if (currentWindowOnload) {
+      currentWindowOnload();
+    }
+
+    // The HTML reporter needs to be set up here so it can access the DOM. Other
+    // reporters can be added at any time before env.execute() is called.
+    const htmlReporter = new jasmine.HtmlReporterV2({ env, urls });
+    env.addReporter(htmlReporter);
+    env.execute();
+  };
+})();

lib/jasmine-core/boot0.js

@@ -1,68 +0,0 @@
-/*
-Copyright (c) 2008-2019 Pivotal Labs
-Copyright (c) 2008-2025 The Jasmine developers
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-'use strict';
-
-/**
- This file starts the process of "booting" Jasmine. It initializes Jasmine,
- makes its globals available, and creates the env. This file should be loaded
- after `jasmine.js` and `jasmine_html.js`, but before `boot1.js` or any project
- source files or spec files are loaded.
- */
-(function() {
-  const jasmineRequire = window.jasmineRequire || require('./jasmine.js');
-
-  /**
-   * ## Require & Instantiate
-   *
-   * Require Jasmine's core files. Specifically, this requires and attaches all of Jasmine's code to the `jasmine` reference.
-   */
-  const jasmine = jasmineRequire.core(jasmineRequire),
-    global = jasmine.getGlobal();
-  global.jasmine = jasmine;
-
-  /**
-   * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference.
-   */
-  jasmineRequire.html(jasmine);
-
-  /**
-   * Create the Jasmine environment. This is used to run all specs in a project.
-   */
-  const env = jasmine.getEnv();
-
-  /**
-   * ## The Global Interface
-   *
-   * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged.
-   */
-  const jasmineInterface = jasmineRequire.interface(jasmine, env);
-
-  /**
-   * Add all of the Jasmine global/public interface to the global scope, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`.
-   */
-  for (const property in jasmineInterface) {
-    global[property] = jasmineInterface[property];
-  }
-})();

lib/jasmine-core/boot1.js

@@ -1,77 +0,0 @@
-/*
-Copyright (c) 2008-2019 Pivotal Labs
-Copyright (c) 2008-2025 The Jasmine developers
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-'use strict';
-
-/**
- This file finishes 'booting' Jasmine, performing all of the necessary
- initialization before executing the loaded environment and all of a project's
- specs. This file should be loaded after `boot0.js` but before any project
- source files or spec files are loaded. Thus this file can also be used to
- customize Jasmine for a project.
-
- If a project is using Jasmine via the standalone distribution, this file can
- be customized directly. If you only wish to configure the Jasmine env, you
- can load another file that calls `jasmine.getEnv().configure({...})`
- after `boot0.js` is loaded and before this file is loaded.
- */
-
-(function() {
-  const env = jasmine.getEnv();
-  const urls = new jasmine.HtmlReporterV2Urls();
-
-  /**
-   * ## Reporters
-   * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any).
-   */
-  const htmlReporter = new jasmine.HtmlReporterV2({
-    env,
-    urls,
-    getContainer() {
-      return document.body;
-    }
-  });
-
-  /**
-   * The `jsApiReporter` also receives spec results, and is used by any environment that needs to extract the results  from JavaScript.
-   */
-  env.addReporter(jsApiReporter);
-  env.addReporter(htmlReporter);
-  env.configure(urls.configFromCurrentUrl());
-
-  /**
-   * ## Execution
-   *
-   * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded.
-   */
-  const currentWindowOnload = window.onload;
-
-  window.onload = function() {
-    if (currentWindowOnload) {
-      currentWindowOnload();
-    }
-    htmlReporter.initialize();
-    env.execute();
-  };
-})();

lib/jasmine-core/jasmine-html.js

@@ -1,6 +1,6 @@
 /*
 Copyright (c) 2008-2019 Pivotal Labs
-Copyright (c) 2008-2025 The Jasmine developers
+Copyright (c) 2008-2026 The Jasmine developers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -22,281 +22,50 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-// eslint-disable-next-line no-var
-var jasmineRequire = window.jasmineRequire || require('./jasmine.js');
-
-jasmineRequire.html = function(j$) {
-  j$.private.ResultsNode = jasmineRequire.ResultsNode();
-  j$.private.ResultsStateBuilder = jasmineRequire.ResultsStateBuilder(j$);
-  j$.private.htmlReporterUtils = jasmineRequire.htmlReporterUtils(j$);
-  j$.private.AlertsView = jasmineRequire.AlertsView(j$);
-  j$.private.OverallStatusBar = jasmineRequire.OverallStatusBar(j$);
-  j$.private.Banner = jasmineRequire.Banner(j$);
-  j$.private.SymbolsView = jasmineRequire.SymbolsView(j$);
-  j$.private.SummaryTreeView = jasmineRequire.SummaryTreeView(j$);
-  j$.private.FailuresView = jasmineRequire.FailuresView(j$);
-  j$.HtmlReporter = jasmineRequire.HtmlReporter(j$);
-  j$.HtmlReporterV2Urls = jasmineRequire.HtmlReporterV2Urls(j$);
-  j$.HtmlReporterV2 = jasmineRequire.HtmlReporterV2(j$);
-  j$.QueryString = jasmineRequire.QueryString();
-  j$.HtmlSpecFilter = jasmineRequire.HtmlSpecFilter(j$);
-  j$.private.HtmlSpecFilterV2 = jasmineRequire.HtmlSpecFilterV2();
-};
-
-jasmineRequire.HtmlReporter = function(j$) {
+(function() {
+// eslint-disable-next-line no-unused-vars
+const getJasmineHtmlRequireObj = (function() {
   'use strict';
+  const htmlRequire = {};
 
-  const { createDom, noExpectations } = j$.private.htmlReporterUtils;
-
-  /**
-   * @class HtmlReporter
-   * @classdesc Displays results and allows re-running individual specs and suites.
-   * @implements {Reporter}
-   * @param options Options object. See lib/jasmine-core/boot1.js for details.
-   * @since 1.2.0
-   * @deprecated Use {@link HtmlReporterV2} instead.
-   */
-  class HtmlReporter {
-    #env;
-    #getContainer;
-    #navigateWithNewParam;
-    #urlBuilder;
-    #filterSpecs;
-    #stateBuilder;
-    #config;
-    #htmlReporterMain;
-
-    // Sub-views
-    #alerts;
-    #symbols;
-    #banner;
-    #failures;
-
-    constructor(options) {
-      this.#env = options.env;
-
-      this.#getContainer = options.getContainer;
-      this.#navigateWithNewParam =
-        options.navigateWithNewParam || function() {};
-      this.#urlBuilder = new UrlBuilder(
-        options.addToExistingQueryString || defaultQueryString
-      );
-      this.#filterSpecs = options.filterSpecs;
-    }
-
-    /**
-     * Initializes the reporter. Should be called before {@link Env#execute}.
-     * @function
-     * @name HtmlReporter#initialize
-     */
-    initialize() {
-      this.#env.deprecated(
-        'HtmlReporter and HtmlSpecFilter are deprecated. Use HtmlReporterV2 instead.'
-      );
-      this.#clearPrior();
-      this.#config = this.#env ? this.#env.configuration() : {};
-
-      this.#stateBuilder = new j$.private.ResultsStateBuilder();
-
-      this.#alerts = new j$.private.AlertsView(this.#urlBuilder);
-      this.#symbols = new j$.private.SymbolsView();
-      this.#banner = new j$.private.Banner(this.#navigateWithNewParam);
-      this.#failures = new j$.private.FailuresView(this.#urlBuilder);
-      this.#htmlReporterMain = createDom(
-        'div',
-        { className: 'jasmine_html-reporter' },
-        this.#banner.rootEl,
-        this.#symbols.rootEl,
-        this.#alerts.rootEl,
-        this.#failures.rootEl
-      );
-      this.#getContainer().appendChild(this.#htmlReporterMain);
-    }
-
-    jasmineStarted(options) {
-      this.#stateBuilder.jasmineStarted(options);
-    }
-
-    suiteStarted(result) {
-      this.#stateBuilder.suiteStarted(result);
-    }
-
-    suiteDone(result) {
-      this.#stateBuilder.suiteDone(result);
-
-      if (result.status === 'failed') {
-        this.#failures.append(result, this.#stateBuilder.currentParent);
-      }
-    }
-
-    specStarted() {}
-
-    specDone(result) {
-      this.#stateBuilder.specDone(result);
-      this.#symbols.append(result, this.#config);
-
-      if (noExpectations(result)) {
-        const noSpecMsg = "Spec '" + result.fullName + "' has no expectations.";
-        if (result.status === 'failed') {
-          // eslint-disable-next-line no-console
-          console.error(noSpecMsg);
-        } else {
-          // eslint-disable-next-line no-console
-          console.warn(noSpecMsg);
-        }
-      }
-
-      if (result.status === 'failed') {
-        this.#failures.append(result, this.#stateBuilder.currentParent);
-      }
-    }
-
-    jasmineDone(doneResult) {
-      this.#stateBuilder.jasmineDone(doneResult);
-      this.#banner.showOptionsMenu(this.#config);
-
-      if (
-        this.#stateBuilder.specsExecuted < this.#stateBuilder.totalSpecsDefined
-      ) {
-        this.#alerts.addSkipped(
-          this.#stateBuilder.specsExecuted,
-          this.#stateBuilder.totalSpecsDefined
-        );
-      }
-
-      const statusBar = new j$.private.OverallStatusBar(this.#urlBuilder);
-      statusBar.showDone(doneResult, this.#stateBuilder);
-      this.#alerts.addBar(statusBar.rootEl);
-
-      if (doneResult.failedExpectations) {
-        for (const f of doneResult.failedExpectations) {
-          this.#alerts.addGlobalFailure(f);
-        }
-      }
-
-      for (const dw of this.#stateBuilder.deprecationWarnings) {
-        this.#alerts.addDeprecationWarning(dw);
-      }
-
-      const results = this.#find('.jasmine-results');
-      const summary = new j$.private.SummaryTreeView(
-        this.#urlBuilder,
-        this.#filterSpecs
-      );
-      summary.addResults(this.#stateBuilder.topResults);
-      results.appendChild(summary.rootEl);
-
-      if (this.#stateBuilder.anyNonTopSuiteFailures) {
-        this.#alerts.addFailureToggle(
-          () => this.#setMenuModeTo('jasmine-failure-list'),
-          () => this.#setMenuModeTo('jasmine-spec-list')
-        );
-
-        this.#setMenuModeTo('jasmine-failure-list');
-        this.#failures.show();
-      }
-    }
-
-    #find(selector) {
-      return this.#getContainer().querySelector(
-        '.jasmine_html-reporter ' + selector
-      );
-    }
-
-    #clearPrior() {
-      const oldReporter = this.#find('');
-
-      if (oldReporter) {
-        this.#getContainer().removeChild(oldReporter);
-      }
-    }
-
-    #setMenuModeTo(mode) {
-      this.#htmlReporterMain.setAttribute(
-        'class',
-        'jasmine_html-reporter ' + mode
-      );
-    }
+  function getJasmineHtmlRequire() {
+    return htmlRequire;
   }
 
-  class UrlBuilder {
-    #addToExistingQueryString;
-
-    constructor(addToExistingQueryString) {
-      this.#addToExistingQueryString = function(k, v) {
-        // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
-        return (
-          (window.location.pathname || '') + addToExistingQueryString(k, v)
-        );
-      };
+  htmlRequire.html = function(j$, private$) {
+    if (!private$) {
+      private$ = {};
     }
 
-    suiteHref(suite) {
-      const els = [];
-
-      while (suite && suite.parent) {
-        els.unshift(suite.result.description);
-        suite = suite.parent;
-      }
-
-      return this.#addToExistingQueryString('spec', els.join(' '));
-    }
-
-    specHref(result) {
-      return this.#addToExistingQueryString('spec', result.fullName);
-    }
-
-    runAllHref() {
-      return this.#addToExistingQueryString('spec', '');
-    }
-
-    seedHref(seed) {
-      return this.#addToExistingQueryString('seed', seed);
-    }
-  }
-
-  function defaultQueryString(key, value) {
-    return '?' + key + '=' + value;
-  }
-
-  return HtmlReporter;
-};
-
-jasmineRequire.HtmlSpecFilter = function(j$) {
-  'use strict';
-
-  /**
-   * @class HtmlSpecFilter
-   * @param options Options object. See lib/jasmine-core/boot1.js for details.
-   * @deprecated Use {@link HtmlReporterV2Urls} instead.
-   */
-  function HtmlSpecFilter(options) {
-    j$.getEnv().deprecated(
-      'HtmlReporter and HtmlSpecFilter are deprecated. Use HtmlReporterV2 instead.'
+    private$.ResultsNode = htmlRequire.ResultsNode();
+    private$.ResultsStateBuilder = htmlRequire.ResultsStateBuilder(
+      j$,
+      private$
     );
+    private$.htmlReporterUtils = htmlRequire.htmlReporterUtils(j$, private$);
+    private$.AlertsView = htmlRequire.AlertsView(j$, private$);
+    private$.OverallStatusBar = htmlRequire.OverallStatusBar(j$, private$);
+    private$.Banner = htmlRequire.Banner(j$, private$);
+    private$.SummaryTreeView = htmlRequire.SummaryTreeView(j$, private$);
+    private$.FailuresView = htmlRequire.FailuresView(j$, private$);
+    private$.PerformanceView = htmlRequire.PerformanceView(j$, private$);
+    private$.TabBar = htmlRequire.TabBar(j$, private$);
+    private$.HtmlSpecFilterV2 = htmlRequire.HtmlSpecFilterV2();
 
-    const filterString =
-      options &&
-      options.filterString() &&
-      options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
-    const filterPattern = new RegExp(filterString);
+    for (const k of ['HtmlReporterV2Urls', 'HtmlReporterV2', 'QueryString']) {
+      Object.defineProperty(j$, k, {
+        enumerable: true,
+        configurable: false,
+        writable: false,
+        value: htmlRequire[k](j$, private$)
+      });
+    }
+  };
 
-    /**
-     * Determines whether the spec with the specified name should be executed.
-     * @name HtmlSpecFilter#matches
-     * @function
-     * @param {string} specName The full name of the spec
-     * @returns {boolean}
-     */
-    this.matches = function(specName) {
-      return filterPattern.test(specName);
-    };
-  }
+  return getJasmineHtmlRequire;
+})();
 
-  return HtmlSpecFilter;
-};
-
-jasmineRequire.ResultsNode = function() {
+getJasmineHtmlRequireObj().ResultsNode = function() {
   'use strict';
 
   function ResultsNode(result, type, parent) {
@@ -322,7 +91,7 @@ jasmineRequire.ResultsNode = function() {
   return ResultsNode;
 };
 
-jasmineRequire.QueryString = function() {
+getJasmineHtmlRequireObj().QueryString = function() {
   'use strict';
 
   /**
@@ -338,6 +107,7 @@ jasmineRequire.QueryString = function() {
      */
     constructor(options) {
       this.#getWindowLocation = options.getWindowLocation;
+      Object.freeze(this);
     }
 
     /**
@@ -405,13 +175,14 @@ jasmineRequire.QueryString = function() {
     return '?' + qStrPairs.join('&');
   }
 
+  Object.freeze(QueryString.prototype);
   return QueryString;
 };
 
-jasmineRequire.AlertsView = function(j$) {
+getJasmineHtmlRequireObj().AlertsView = function(j$, private$) {
   'use strict';
 
-  const { createDom } = j$.private.htmlReporterUtils;
+  const { createDom } = private$.htmlReporterUtils;
   const errorBarClassName = 'jasmine-bar jasmine-errored';
   const afterAllMessagePrefix = 'AfterAll ';
 
@@ -434,38 +205,6 @@ jasmineRequire.AlertsView = function(j$) {
       );
     }
 
-    addFailureToggle(onClickFailures, onClickSpecList) {
-      const failuresLink = createDom(
-        'a',
-        { className: 'jasmine-failures-menu', href: '#' },
-        'Failures'
-      );
-      let specListLink = createDom(
-        'a',
-        { className: 'jasmine-spec-list-menu', href: '#' },
-        'Spec List'
-      );
-
-      failuresLink.onclick = function() {
-        onClickFailures();
-        return false;
-      };
-
-      specListLink.onclick = function() {
-        onClickSpecList();
-        return false;
-      };
-
-      this.#createAndAdd('jasmine-menu jasmine-bar jasmine-spec-list', [
-        createDom('span', {}, 'Spec List | '),
-        failuresLink
-      ]);
-      this.#createAndAdd('jasmine-menu jasmine-bar jasmine-failure-list', [
-        specListLink,
-        createDom('span', {}, ' | Failures ')
-      ]);
-    }
-
     addGlobalFailure(failure) {
       this.#createAndAdd(
         errorBarClassName,
@@ -559,10 +298,10 @@ jasmineRequire.AlertsView = function(j$) {
   return AlertsView;
 };
 
-jasmineRequire.Banner = function(j$) {
+getJasmineHtmlRequireObj().Banner = function(j$, private$) {
   'use strict';
 
-  const { createDom } = j$.private.htmlReporterUtils;
+  const { createDom } = private$.htmlReporterUtils;
 
   class Banner {
     #navigateWithNewParam;
@@ -721,10 +460,10 @@ jasmineRequire.Banner = function(j$) {
   return Banner;
 };
 
-jasmineRequire.FailuresView = function(j$) {
+getJasmineHtmlRequireObj().FailuresView = function(j$, private$) {
   'use strict';
 
-  const { createDom } = j$.private.htmlReporterUtils;
+  const { createDom } = private$.htmlReporterUtils;
 
   class FailuresView {
     #urlBuilder;
@@ -888,14 +627,14 @@ jasmineRequire.FailuresView = function(j$) {
   return FailuresView;
 };
 
-jasmineRequire.htmlReporterUtils = function(j$) {
+getJasmineHtmlRequireObj().htmlReporterUtils = function(j$, private$) {
   'use strict';
 
   function createDom(type, attrs, childrenArrayOrVarArgs) {
     const el = document.createElement(type);
     let children;
 
-    if (j$.private.isArray(childrenArrayOrVarArgs)) {
+    if (Array.isArray(childrenArrayOrVarArgs)) {
       children = childrenArrayOrVarArgs;
     } else {
       children = [];
@@ -941,10 +680,14 @@ jasmineRequire.htmlReporterUtils = function(j$) {
   return { createDom, noExpectations };
 };
 
-jasmineRequire.HtmlReporterV2 = function(j$) {
+getJasmineHtmlRequireObj().HtmlReporterV2 = function(j$, private$) {
   'use strict';
 
-  const { createDom, noExpectations } = j$.private.htmlReporterUtils;
+  const { createDom, noExpectations } = private$.htmlReporterUtils;
+
+  const specListTabId = 'jasmine-specListTab';
+  const failuresTabId = 'jasmine-failuresTab';
+  const perfTabId = 'jasmine-perfTab';
 
   /**
    * @class HtmlReporterV2
@@ -958,12 +701,12 @@ jasmineRequire.HtmlReporterV2 = function(j$) {
    * const reporter = new jasmine.HtmlReporterV2({
    *    env,
    *    urls,
-   *    container: document.body
+   *    // container is optional and defaults to document.body.
+   *    container: someElement
    * });
    */
   class HtmlReporterV2 {
-    #env;
-    #getContainer;
+    #container;
     #queryString;
     #urlBuilder;
     #filterSpecs;
@@ -974,14 +717,13 @@ jasmineRequire.HtmlReporterV2 = function(j$) {
     // Sub-views
     #alerts;
     #statusBar;
+    #tabBar;
     #progress;
     #banner;
     #failures;
 
     constructor(options) {
-      this.#env = options.env;
-
-      this.#getContainer = options.getContainer;
+      this.#container = options.container || document.body;
       this.#queryString =
         options.queryString ||
         new j$.QueryString({
@@ -994,29 +736,40 @@ jasmineRequire.HtmlReporterV2 = function(j$) {
         getSuiteById: id => this.#stateBuilder.suitesById[id]
       });
       this.#filterSpecs = options.urls.filteringSpecs();
-    }
 
-    /**
-     * Initializes the reporter. Should be called before {@link Env#execute}.
-     * @function
-     * @name HtmlReporter#initialize
-     */
-    initialize() {
-      this.#clearPrior();
-      this.#config = this.#env ? this.#env.configuration() : {};
+      this.#config = options.env ? options.env.configuration() : {};
 
-      this.#stateBuilder = new j$.private.ResultsStateBuilder();
+      this.#stateBuilder = new private$.ResultsStateBuilder();
 
-      this.#alerts = new j$.private.AlertsView(this.#urlBuilder);
-      this.#statusBar = new j$.private.OverallStatusBar(this.#urlBuilder);
+      this.#alerts = new private$.AlertsView(this.#urlBuilder);
+      this.#statusBar = new private$.OverallStatusBar(this.#urlBuilder);
       this.#statusBar.showRunning();
       this.#alerts.addBar(this.#statusBar.rootEl);
+
+      this.#tabBar = new private$.TabBar(
+        [
+          { id: specListTabId, label: 'Spec List' },
+          { id: failuresTabId, label: 'Failures' },
+          { id: perfTabId, label: 'Performance' }
+        ],
+        tabId => {
+          if (tabId === specListTabId) {
+            this.#setMenuModeTo('jasmine-spec-list');
+          } else if (tabId === failuresTabId) {
+            this.#setMenuModeTo('jasmine-failure-list');
+          } else {
+            this.#setMenuModeTo('jasmine-performance');
+          }
+        }
+      );
+      this.#alerts.addBar(this.#tabBar.rootEl);
+
       this.#progress = new ProgressView();
-      this.#banner = new j$.private.Banner(
+      this.#banner = new private$.Banner(
         this.#queryString.navigateWithNewParam.bind(this.#queryString),
         true
       );
-      this.#failures = new j$.private.FailuresView(this.#urlBuilder);
+      this.#failures = new private$.FailuresView(this.#urlBuilder);
       this.#htmlReporterMain = createDom(
         'div',
         { className: 'jasmine_html-reporter' },
@@ -1025,13 +778,17 @@ jasmineRequire.HtmlReporterV2 = function(j$) {
         this.#alerts.rootEl,
         this.#failures.rootEl
       );
-      this.#getContainer().appendChild(this.#htmlReporterMain);
+      this.#container.appendChild(this.#htmlReporterMain);
       this.#failures.show();
+
+      Object.freeze(this);
     }
 
     jasmineStarted(options) {
       this.#stateBuilder.jasmineStarted(options);
-      this.#progress.start(options.totalSpecsDefined);
+      this.#progress.start(
+        options.totalSpecsDefined - options.numExcludedSpecs
+      );
     }
 
     suiteStarted(result) {
@@ -1095,38 +852,32 @@ jasmineRequire.HtmlReporterV2 = function(j$) {
       }
 
       const results = this.#find('.jasmine-results');
-      const summary = new j$.private.SummaryTreeView(
+      const summary = new private$.SummaryTreeView(
         this.#urlBuilder,
         this.#filterSpecs
       );
       summary.addResults(this.#stateBuilder.topResults);
       results.appendChild(summary.rootEl);
+      const perf = new private$.PerformanceView();
+      perf.addResults(this.#stateBuilder.topResults);
+      results.appendChild(perf.rootEl);
+      this.#tabBar.showTab(specListTabId);
+      this.#tabBar.showTab(perfTabId);
 
       if (this.#stateBuilder.anyNonTopSuiteFailures) {
-        this.#alerts.addFailureToggle(
-          () => this.#setMenuModeTo('jasmine-failure-list'),
-          () => this.#setMenuModeTo('jasmine-spec-list')
-        );
-
-        this.#setMenuModeTo('jasmine-failure-list');
-        this.#failures.show();
+        this.#tabBar.showTab(failuresTabId);
+        this.#tabBar.selectTab(failuresTabId);
+      } else {
+        this.#tabBar.selectTab(specListTabId);
       }
     }
 
     #find(selector) {
-      return this.#getContainer().querySelector(
+      return this.#container.querySelector(
         '.jasmine_html-reporter ' + selector
       );
     }
 
-    #clearPrior() {
-      const oldReporter = this.#find('');
-
-      if (oldReporter) {
-        this.#getContainer().removeChild(oldReporter);
-      }
-    }
-
     #setMenuModeTo(mode) {
       this.#htmlReporterMain.setAttribute(
         'class',
@@ -1145,10 +896,11 @@ jasmineRequire.HtmlReporterV2 = function(j$) {
     }
 
     specDone(result) {
-      this.rootEl.value = this.rootEl.value + 1;
+      if (result.status !== 'excluded') {
+        this.rootEl.value = this.rootEl.value + 1;
+      }
 
       if (result.status === 'failed') {
-        // TODO: also a non-color indicator
         this.rootEl.classList.add('failed');
       }
     }
@@ -1207,10 +959,11 @@ jasmineRequire.HtmlReporterV2 = function(j$) {
     }
   }
 
+  Object.freeze(HtmlReporterV2.prototype);
   return HtmlReporterV2;
 };
 
-jasmineRequire.HtmlReporterV2Urls = function(j$) {
+getJasmineHtmlRequireObj().HtmlReporterV2Urls = function(j$, private$) {
   'use strict';
 
   // TODO unify with V2 UrlBuilder?
@@ -1230,10 +983,15 @@ jasmineRequire.HtmlReporterV2Urls = function(j$) {
             return window.location;
           }
         });
+
+      Object.freeze(this);
     }
 
     /**
-     * Creates a {@link Configuration} from the current page's URL.
+     * Creates a {@link Configuration} from the current page's URL. Supported
+     * query string parameters include all those set by {@link HtmlReporterV2}
+     * as well as spec=partialPath, which filters out specs whose paths don't
+     * contain partialPath.
      * @returns {Configuration}
      * @example
      * const urls = new jasmine.HtmlReporterV2Urls();
@@ -1258,10 +1016,11 @@ jasmineRequire.HtmlReporterV2Urls = function(j$) {
         config.seed = seed;
       }
 
-      const specFilter = new j$.private.HtmlSpecFilterV2({
-        filterString: () => {
-          return this.queryString.getParam('path');
-        }
+      const specFilter = new private$.HtmlSpecFilterV2({
+        filterParams: () => ({
+          path: this.queryString.getParam('path'),
+          spec: this.queryString.getParam('spec')
+        })
       });
 
       config.specFilter = function(spec) {
@@ -1276,40 +1035,41 @@ jasmineRequire.HtmlReporterV2Urls = function(j$) {
     }
   }
 
+  Object.freeze(HtmlReporterV2Urls.prototype);
   return HtmlReporterV2Urls;
 };
 
-jasmineRequire.HtmlSpecFilterV2 = function() {
+getJasmineHtmlRequireObj().HtmlSpecFilterV2 = function() {
   class HtmlSpecFilterV2 {
-    #getFilterString;
+    #getFilterParams;
 
     constructor(options) {
-      this.#getFilterString = options.filterString;
+      this.#getFilterParams = options.filterParams;
     }
 
-    /**
-     * Determines whether the spec with the specified name should be executed.
-     * @name HtmlSpecFilterV2#matches
-     * @function
-     * @param {Spec} spec
-     * @returns {boolean}
-     */
     matches(spec) {
-      const filterString = this.#getFilterString();
+      const params = this.#getFilterParams();
 
-      if (!filterString) {
-        return true;
+      if (params.path) {
+        return this.#matchesPath(spec, JSON.parse(params.path));
+      } else if (params.spec) {
+        // Like legacy HtmlSpecFilter, retained because it's convenient for
+        // hand-constructing filter URLs
+        return spec.getFullName().includes(params.spec);
       }
 
-      const filterPath = JSON.parse(this.#getFilterString());
+      return true;
+    }
+
+    #matchesPath(spec, path) {
       const specPath = spec.getPath();
 
-      if (filterPath.length > specPath.length) {
+      if (path.length > specPath.length) {
         return false;
       }
 
-      for (let i = 0; i < filterPath.length; i++) {
-        if (specPath[i] !== filterPath[i]) {
+      for (let i = 0; i < path.length; i++) {
+        if (specPath[i] !== path[i]) {
           return false;
         }
       }
@@ -1321,10 +1081,10 @@ jasmineRequire.HtmlSpecFilterV2 = function() {
   return HtmlSpecFilterV2;
 };
 
-jasmineRequire.OverallStatusBar = function(j$) {
+getJasmineHtmlRequireObj().OverallStatusBar = function(j$, private$) {
   'use strict';
 
-  const { createDom } = j$.private.htmlReporterUtils;
+  const { createDom } = private$.htmlReporterUtils;
   const staticClassNames = 'jasmine-overall-result jasmine-bar';
 
   class OverallStatusBar {
@@ -1430,12 +1190,111 @@ jasmineRequire.OverallStatusBar = function(j$) {
   return OverallStatusBar;
 };
 
-jasmineRequire.ResultsStateBuilder = function(j$) {
+getJasmineHtmlRequireObj().PerformanceView = function(j$, private$) {
+  const createDom = private$.htmlReporterUtils.createDom;
+  const MAX_SLOW_SPECS = 20;
+
+  class PerformanceView {
+    #summary;
+    #tbody;
+
+    constructor() {
+      this.#tbody = document.createElement('tbody');
+      this.#summary = document.createElement('div');
+      this.rootEl = createDom(
+        'div',
+        { className: 'jasmine-performance-view' },
+        createDom('h2', {}, 'Performance'),
+        this.#summary,
+        createDom('h3', {}, 'Slowest Specs'),
+        createDom(
+          'table',
+          {},
+          createDom(
+            'thead',
+            {},
+            createDom(
+              'tr',
+              {},
+              createDom('th', {}, 'Duration'),
+              createDom('th', {}, 'Spec Name')
+            )
+          ),
+          this.#tbody
+        )
+      );
+    }
+
+    addResults(resultsTree) {
+      const specResults = [];
+      getSpecResults(resultsTree, specResults);
+
+      if (specResults.length === 0) {
+        return;
+      }
+
+      specResults.sort(function(a, b) {
+        if (a.duration < b.duration) {
+          return 1;
+        } else if (a.duration > b.duration) {
+          return -1;
+        } else {
+          return 0;
+        }
+      });
+
+      this.#populateSumary(specResults);
+      this.#populateTable(specResults);
+    }
+
+    #populateSumary(specResults) {
+      const total = specResults.map(r => r.duration).reduce((a, b) => a + b, 0);
+      const mean = total / specResults.length;
+      const median = specResults[Math.floor(specResults.length / 2)].duration;
+      this.#summary.appendChild(
+        document.createTextNode(`Mean spec run time: ${mean.toFixed(0)}ms`)
+      );
+      this.#summary.appendChild(document.createElement('br'));
+      this.#summary.appendChild(
+        document.createTextNode(`Median spec run time: ${median}ms`)
+      );
+    }
+
+    #populateTable(specResults) {
+      specResults = specResults.slice(0, MAX_SLOW_SPECS);
+
+      for (const r of specResults) {
+        this.#tbody.appendChild(
+          createDom(
+            'tr',
+            {},
+            createDom('td', {}, `${r.duration}ms`),
+            createDom('td', {}, r.fullName)
+          )
+        );
+      }
+    }
+  }
+
+  function getSpecResults(resultsTree, dest) {
+    for (const node of resultsTree.children) {
+      if (node.type === 'suite') {
+        getSpecResults(node, dest);
+      } else if (node.result.status !== 'excluded') {
+        dest.push(node.result);
+      }
+    }
+  }
+
+  return PerformanceView;
+};
+
+getJasmineHtmlRequireObj().ResultsStateBuilder = function(j$, private$) {
   'use strict';
 
   class ResultsStateBuilder {
     constructor() {
-      this.topResults = new j$.private.ResultsNode({}, '', null);
+      this.topResults = new private$.ResultsNode({}, '', null);
       this.currentParent = this.topResults;
       this.suitesById = {};
       this.totalSpecsDefined = 0;
@@ -1513,10 +1372,10 @@ jasmineRequire.ResultsStateBuilder = function(j$) {
   return ResultsStateBuilder;
 };
 
-jasmineRequire.SummaryTreeView = function(j$) {
+getJasmineHtmlRequireObj().SummaryTreeView = function(j$, private$) {
   'use strict';
 
-  const { createDom, noExpectations } = j$.private.htmlReporterUtils;
+  const { createDom, noExpectations } = private$.htmlReporterUtils;
 
   class SummaryTreeView {
     #urlBuilder;
@@ -1622,42 +1481,87 @@ jasmineRequire.SummaryTreeView = function(j$) {
   return SummaryTreeView;
 };
 
-jasmineRequire.SymbolsView = function(j$) {
-  'use strict';
+getJasmineHtmlRequireObj().TabBar = function(j$, private$) {
+  const createDom = private$.htmlReporterUtils.createDom;
 
-  const { createDom, noExpectations } = j$.private.htmlReporterUtils;
+  class TabBar {
+    #tabs;
+    #onSelectTab;
 
-  class SymbolsView {
-    constructor() {
-      this.rootEl = createDom('ul', {
-        className: 'jasmine-symbol-summary'
-      });
-    }
+    // tabSpecs should be an array of {id, label}.
+    // All tabs are initially not visible and not selected.
+    constructor(tabSpecs, onSelectTab) {
+      this.#onSelectTab = onSelectTab;
+      this.#tabs = [];
+      this.#tabs = tabSpecs.map(ts => new Tab(ts, () => this.selectTab(ts.id)));
 
-    append(result, config) {
-      this.rootEl.appendChild(
-        createDom('li', {
-          className: this.#className(result, config),
-          id: 'spec_' + result.id,
-          title: result.fullName
-        })
+      this.rootEl = createDom(
+        'span',
+        { className: 'jasmine-menu jasmine-bar' },
+        this.#tabs.map(t => t.rootEl)
       );
     }
 
-    #className(result, config) {
-      if (noExpectations(result) && result.status === 'passed') {
-        return 'jasmine-empty';
-      } else if (result.status === 'excluded') {
-        if (config.hideDisabled) {
-          return 'jasmine-excluded-no-display';
-        } else {
-          return 'jasmine-excluded';
+    showTab(id) {
+      for (const tab of this.#tabs) {
+        if (tab.rootEl.id === id) {
+          tab.setVisibility(true);
         }
-      } else {
-        return 'jasmine-' + result.status;
       }
     }
+
+    selectTab(id) {
+      for (const tab of this.#tabs) {
+        tab.setSelected(tab.rootEl.id === id);
+      }
+
+      this.#onSelectTab(id);
+    }
   }
 
-  return SymbolsView;
+  class Tab {
+    #spec;
+    #onClick;
+
+    constructor(spec, onClick) {
+      this.#spec = spec;
+      this.#onClick = onClick;
+      this.rootEl = createDom(
+        'span',
+        { id: spec.id, className: 'jasmine-tab jasmine-hidden' },
+        this.#createLink()
+      );
+    }
+
+    setVisibility(visible) {
+      this.rootEl.classList.toggle('jasmine-hidden', !visible);
+    }
+
+    setSelected(selected) {
+      if (selected) {
+        this.rootEl.textContent = this.#spec.label;
+      } else {
+        this.rootEl.textContent = '';
+        this.rootEl.appendChild(this.#createLink());
+      }
+    }
+
+    #createLink() {
+      const link = createDom('a', { href: '#' }, this.#spec.label);
+      link.addEventListener('click', e => {
+        e.preventDefault();
+        this.#onClick();
+      });
+      return link;
+    }
+  }
+
+  return TabBar;
 };
+
+(function() {
+  'use strict';
+  getJasmineHtmlRequireObj().html(jasmine);
+})();
+
+})()

lib/jasmine-core/jasmine.css

@@ -8,7 +8,7 @@ body {
   background-color: #eee;
   padding: 5px;
   margin: -8px;
-  font-size: 11px;
+  font-size: 12px;
   font-family: Monaco, "Lucida Console", monospace;
   line-height: 14px;
   color: #333;
@@ -24,7 +24,6 @@ body {
   line-height: 14px;
 }
 .jasmine_html-reporter .jasmine-banner,
-.jasmine_html-reporter .jasmine-symbol-summary,
 .jasmine_html-reporter .jasmine-summary,
 .jasmine_html-reporter .jasmine-result-message,
 .jasmine_html-reporter .jasmine-spec .jasmine-description,
@@ -63,58 +62,7 @@ body {
   float: right;
   line-height: 28px;
   padding-right: 9px;
-  font-size: 11px;
-}
-.jasmine_html-reporter .jasmine-symbol-summary {
-  overflow: hidden;
-  margin: 14px 0;
-}
-.jasmine_html-reporter .jasmine-symbol-summary li {
-  display: inline-block;
-  height: 10px;
-  width: 14px;
-  font-size: 16px;
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-passed {
-  font-size: 14px;
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-passed:before {
-  color: #007069;
-  content: "•";
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-failed {
-  line-height: 9px;
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-failed:before {
-  color: #ca3a11;
-  content: "×";
-  font-weight: bold;
-  margin-left: -1px;
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-excluded {
-  font-size: 14px;
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-excluded:before {
-  color: #bababa;
-  content: "•";
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-excluded-no-display {
-  font-size: 14px;
-  display: none;
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-pending {
-  line-height: 17px;
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-pending:before {
-  color: #ba9d37;
-  content: "*";
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-empty {
-  font-size: 14px;
-}
-.jasmine_html-reporter .jasmine-symbol-summary li.jasmine-empty:before {
-  color: #ba9d37;
-  content: "•";
+  font-size: 12px;
 }
 .jasmine_html-reporter progress {
   width: 100%;
@@ -197,12 +145,16 @@ body {
 .jasmine_html-reporter .jasmine-bar a {
   color: white;
 }
-.jasmine_html-reporter.jasmine-spec-list .jasmine-bar.jasmine-menu.jasmine-failure-list,
-.jasmine_html-reporter.jasmine-spec-list .jasmine-results .jasmine-failures {
+.jasmine_html-reporter.jasmine-spec-list .jasmine-results .jasmine-failures,
+.jasmine_html-reporter.jasmine-spec-list .jasmine-performance-view {
   display: none;
 }
-.jasmine_html-reporter.jasmine-failure-list .jasmine-bar.jasmine-menu.jasmine-spec-list,
-.jasmine_html-reporter.jasmine-failure-list .jasmine-summary {
+.jasmine_html-reporter.jasmine-failure-list .jasmine-summary,
+.jasmine_html-reporter.jasmine-failure-list .jasmine-performance-view {
+  display: none;
+}
+.jasmine_html-reporter.jasmine-performance .jasmine-results .jasmine-failures,
+.jasmine_html-reporter.jasmine-performance .jasmine-summary {
   display: none;
 }
 .jasmine_html-reporter .jasmine-results {
@@ -323,4 +275,23 @@ body {
 }
 .jasmine_html-reporter .jasmine-debug-log .jasmine-debug-log-msg {
   white-space: pre;
+}
+
+.jasmine-hidden {
+  display: none;
+}
+
+.jasmine-tab + .jasmine-tab:before {
+  content: " | ";
+}
+
+.jasmine-performance-view h2, .jasmine-performance-view h3 {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+.jasmine-performance-view table {
+  border-spacing: 5px;
+}
+.jasmine-performance-view th, .jasmine-performance-view td {
+  text-align: left;
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "jasmine-core",
   "license": "MIT",
-  "version": "6.0.0-alpha.1",
+  "version": "7.0.0-pre.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/jasmine/jasmine.git"
@@ -28,6 +28,9 @@
   "description": "Simple JavaScript testing framework for browsers and node.js",
   "homepage": "https://jasmine.github.io",
   "main": "./lib/jasmine-core.js",
+  "exports": {
+    ".": "./lib/jasmine-core.js"
+  },
   "files": [
     "LICENSE",
     "README.md",
@@ -43,10 +46,10 @@
     "ejs": "^3.1.10",
     "eslint": "^9.24.0",
     "eslint-plugin-compat": "^6.0.2",
-    "glob": "^10.2.3",
+    "glob": "^13.0.0",
     "globals": "^16.0.0",
-    "jasmine": "github:jasmine/jasmine-npm#6.0",
-    "jasmine-browser-runner": "github:jasmine/jasmine-browser-runner#4.0",
+    "jasmine": "github:jasmine/jasmine-npm#7.0",
+    "jasmine-browser-runner": "github:jasmine/jasmine-browser-runner#5.0",
     "jsdom": "^26.0.0",
     "prettier": "1.17.1",
     "sass": "^1.58.3"

release_notes/5.12.1.md

@@ -0,0 +1,29 @@
+Jasmine Core 5.12.1 Release Notes
+
+## Bug fixes
+
+* Fix custom matchers in top-level specs
+  * Merges [#2088](https://github.com/jasmine/jasmine/pull/2088) from @bonkevin
+
+## Supported environments
+
+This version has been tested in the following environments.
+
+| Environment | Supported versions             |
+|-------------|--------------------------------|
+| Node        | 18.20.5**, 20, 22, 24          |
+| Safari      | 16**, 17**                     |
+| Chrome      | 141*                           |
+| Firefox     | 102**, 115**, 128**, 140, 144* |
+| Edge        | 141*                           |
+
+\* Evergreen browser. Each version of Jasmine is tested against the latest
+version available at release time.<br>
+\** Supported on a best-effort basis. Support for these versions may be dropped
+if it becomes impractical, and bugs affecting only these versions may not be
+treated as release blockers.
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/5.13.0.md

@@ -0,0 +1,44 @@
+# Jasmine Core 5.13.0 Release Notes
+
+## Changes to supported environments
+
+Safari 26 is now supported on a best-effort basis.
+
+Due to the limited availability of Safari 18 and later on free CI services,
+Safari support in future jasmine-core versions will be limited to:
+
+* Best-effort support for the latest Safari version available on GitHub Actions,
+  which may change at any time.
+* Best-effort support for Safari 16 and 17 for as long as it remains practical.
+
+## New Features
+
+* New `extraItStackFrames` and `extraDescribeStackFrames` config options to fix
+  the filename properties of reporter events in configurations that wrap
+  `it`/`describe`, such as zone.js. The `filename` properties of reporter events
+  are no longer deprecated.
+* `jasmine.allOf` asymmetric equality tester
+  * Merges [#2087](https://github.com/jasmine/jasmine/issues/2083) from @jonahd-g
+  * Fixes [#2083](https://github.com/jasmine/jasmine/pull/2087)
+
+## Supported environments
+
+This version has been tested in the following environments.
+
+| Environment | Supported versions             |
+|-------------|--------------------------------|
+| Node        | 18.20.5**, 20, 22, 24          |
+| Safari**    | 16, 17, 26.1                   |
+| Chrome      | 142*                           |
+| Firefox     | 102**, 115**, 128**, 140, 145* |
+| Edge        | 142*                           |
+
+\* Evergreen browser. Each version of Jasmine is tested against the latest
+version available at release time.<br>
+\** Supported on a best-effort basis. Support for these versions may be dropped
+if it becomes impractical, and bugs affecting only these versions may not be
+treated as release blockers.
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/6.0.0-alpha.2.md

@@ -0,0 +1,90 @@
+# Jasmine Core 6.0.0-alpha.2 Release Notes
+
+This is a pre-release, intended to offer a preview of upcoming changes and to
+solicit feedback.
+
+## A Note About Pre-Release Compatibility
+
+There may be additional breaking changes in future 6.0 pre-releases or in the
+final 6.0 release. That's allowed by the semver specification, but users are
+sometimes unpleasantly surprised by it.
+
+NPM's implementation of carat version ranges assumes that subsequent
+pre-releases and final releases are fully compatible with earlier pre-releases.
+If your package.json contains `"jasmine-core": "^6.0.0-alpha.2`,
+NPM might install any later 6.x version even though there is no guarantee of
+compatibility. If that isn't ok, you should specify an exact pre-release version:
+`"jasmine-core": "6.0.0-alpha.2`.
+
+
+## Changes to supported environments
+
+Safari 26 is now supported on a best-effort basis.†
+
+Due to the limited availability of Safari 18 and later on free CI services,
+Safari support in future jasmine-core versions will be limited to:
+
+* Best-effort support for the latest Safari version available on GitHub Actions,
+  which may change at any time.
+* Best-effort support for Safari 16 and 17 for as long as it remains practical.
+
+## Bug Fixes
+
+* Fix custom matchers in top-level specs††
+  * Merges [#2088](https://github.com/jasmine/jasmine/pull/2088) from @bonkevin
+
+## New features
+
+* Larger body font size in HTML reporters
+* New Performance tab in HtmlReporterV2 shows metrics and a list of the slowest 
+  specs.
+* Experimental `safariYieldStrategy: "time"` config option, which may make
+  Jasmine run significantly faster in Safari and similar browsers. So far, this 
+  option has not been tested on a wide variety of workloads. Feedback is
+  appreciated.
+* New `extraItStackFrames` and `extraDescribeStackFrames` config options to fix
+  the filename properties of reporter events in configurations that wrap
+  `it`/`describe`, such as zone.js.†
+* `jasmine.allOf asymmetric` equality tester†
+  * Merges [#2087](https://github.com/jasmine/jasmine/pull/2087) from @jonahd-g
+  * Fixes [#2083](https://github.com/jasmine/jasmine/issues/2083)
+* Re-add support for partial spec name filtering via `spec` query parameter
+  * Fixes [#2085](https://github.com/jasmine/jasmine/issues/2085).
+* Require spec/suite property keys to be strings, not just anything that's 
+  cloneable and serializable. This matches the existing API reference
+  documentation.
+
+## Documentation improvements
+
+* Fix HtmlReporterV2 ctor example
+
+## Internal Improvements
+
+* Remove code to support browsers that don't have MessageChannel. Jasmine hasn't
+  run in any such browsers since 2.x.
+
+† Also likely to be included in a future 5.x release.<br>
+†† Also released in 5.12.1.
+
+## Supported environments
+
+This version has been tested in the following environments.
+
+| Environment       | Supported versions             |
+|-------------------|--------------------------------|
+| Node              | 20, 22, 24                     |
+| Safari            | 16**, 17**, 26**               |
+| Chrome            | 142*                           |
+| Firefox           | 102**, 115**, 128**, 140, 145* |
+| Edge              | 142*                           |
+
+\* Evergreen browser. Each version of Jasmine is tested against the latest
+version available at release time.<br>
+\** Supported on a best-effort basis. Support for these versions may be dropped
+if it becomes impractical, and bugs affecting only these versions may not be
+treated as release blockers.
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/6.0.0-beta.0.md

@@ -0,0 +1,74 @@
+# Jasmine Core 6.0.0-beta.0 Release Notes
+
+This is a pre-release, intended to offer a preview of upcoming changes and to
+solicit feedback.
+
+## A Note About Pre-Release Compatibility
+
+There may be additional breaking changes in future 6.0 pre-releases or in the
+final 6.0 release. That's allowed by the semver specification, but users are
+sometimes unpleasantly surprised by it.
+
+NPM's implementation of carat version ranges assumes that subsequent
+pre-releases and final releases are fully compatible with earlier pre-releases.
+If your package.json contains `"jasmine-core": "^6.0.0-beta.0`,
+NPM might install any later 6.x version even though there is no guarantee of
+compatibility. If that isn't ok, you should specify an exact pre-release version:
+`"jasmine-core": "6.0.0-beta.0`.
+
+
+## Breaking changes
+
+* boot1.js no longer adds jsApiReporter to the env.
+* HtmlReporterV2 initialization and boot1.js have been simplified. If you 
+  maintain your own boot file, update it to match the boot1.js included in this
+  package.
+
+
+## New features
+
+* Statically exposed pretty printer as jasmine.pp().
+
+## Bug fixes
+
+* Fixed HtmlReporterV2 progress bar when running a subset of specs.
+
+
+## Deprecations
+
+* jsApiReporter is deprecated.
+* Detect monkey patching and emit a deprecation warning.
+
+## Documentation improvements
+
+* Documented the set of possible spec statuses.
+
+
+## Internal improvements
+
+* Replaced isArray helper with native Array.isArray
+
+
+## Supported environments
+
+This version has been tested in the following environments.
+
+| Environment       | Supported versions             |
+|-------------------|--------------------------------|
+| Node              | 20, 22, 24                     |
+| Safari            | 16**, 17**, 26.1**             |
+| Chrome            | 142*                           |
+| Firefox           | 102**, 115**, 128**, 140, 145* |
+| Edge              | 142*                           |
+
+\* Evergreen browser. Each version of Jasmine is tested against the latest
+version available at release time.<br>
+\** Supported on a best-effort basis. Support for these versions may be dropped
+if it becomes impractical, and bugs affecting only these versions may not be
+treated as release blockers.
+
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/6.0.0-beta.1.md

@@ -0,0 +1,47 @@
+# Jasmine Core 6.0.0-beta.1 Release Notes
+
+This is a pre-release, intended to offer a preview of upcoming changes and to
+solicit feedback.
+
+A corresponding release of the `jasmine` package is not planned because the 
+change in this release only affects browser users.
+
+## A Note About Pre-Release Compatibility
+
+There may be additional breaking changes in future 6.0 pre-releases or in the
+final 6.0 release. That's allowed by the semver specification, but users are
+sometimes unpleasantly surprised by it.
+
+NPM's implementation of carat version ranges assumes that subsequent
+pre-releases and final releases are fully compatible with earlier pre-releases.
+If your package.json contains `"jasmine-core": "^6.0.0-beta.1`,
+NPM might install any later 6.x version even though there is no guarantee of
+compatibility. If that isn't ok, you should specify an exact pre-release version:
+`"jasmine-core": "6.0.0-beta.1`.
+
+## Bug Fixes
+
+* Revert to using window.onload in boot1.js. This fixes top level await in
+  jasmine-browser-runner.
+
+## Supported environments
+
+This version has been tested in the following environments.
+
+| Environment       | Supported versions             |
+|-------------------|--------------------------------|
+| Node              | 20, 22, 24                     |
+| Safari**          | 16, 17, 26.1                   |
+| Chrome            | 143*                           |
+| Firefox           | 102**, 115**, 128**, 140, 145* |
+| Edge              | 142*                           |
+
+\* Evergreen browser. Each version of Jasmine is tested against the latest
+version available at release time.<br>
+\** Supported on a best-effort basis. Support for these versions may be dropped
+if it becomes impractical, and bugs affecting only these versions may not be
+treated as release blockers.
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/6.0.0.md

@@ -0,0 +1,190 @@
+# Jasmine Core 6.0.0 Release Notes
+
+## Summary
+
+This is a major release that includes breaking changes as well as significant
+new features. Many of the breaking changes and deprecations in this release are 
+intended to improve the stability of the Jasmine ecosystem by making the
+distinction between public and private APIs more obvious, reducing exposure of
+jasmine-core's internal state, removing ambiguities from the reporter API, and
+warning about monkey patching.
+
+6.x is intended to ba a relatively short-lived, transitional series. It is 
+compatible with the current versions of karma-jasmine and other legacy Angular 
+tools but emits deprecation warnings when used with them. 7.0 will drop 
+compatibility with those tools. If you use Karma in a non-Angular context,
+consider migrating to a maintained alternative such as jasmine-browser-runner or
+web-test-runner. If you use Angular, please direct any questions about support
+for future versions of Jasmine to the Angular team.
+
+Please see the [migration guide](https://jasmine.github.io/upgrade-guides/6.0)
+for more information. If you use Jasmine via the `jasmine` package, please see 
+[its release notes](https://github.com/jasmine/jasmine-npm/blob/main/release_notes/6.0.0.md)
+as well.
+
+
+## Changes to supported environments
+
+* Node 18 is no longer supported.
+
+
+## Breaking changes
+
+### General
+
+* Private APIs have been removed from the `jasmine` namespace.
+
+  The purpose of this change is to reduce the risk of users inadvertently
+  depending on private APIs. Anything not covered by
+  [the documentation](https://jasmine.github.io/pages/docs_home.html) remains
+  private regardless of namespacing. Private APIs may be changed or removed in
+  any release. This change is being made in a major release as a courtesy to 
+  users of libraries that depend on private APIs.
+
+### Changes that affect spec writing
+
+* Global error spies always receive a single argument. Previously, the browser
+  error event was passed as the second argument.
+* If a spy is invoked via `.call(null, ...)` or `.apply(null, ...)`, the spy's
+  `this` argument will be `null`. Previously it was `globalThis`.
+* Mock clock timing functions cannot be spied on. Previously this "worked" but
+  prevented the mock clock from uninstalling itself.
+* The mock clock no longer supports the eval forms of `setTimeout` and
+  `setInterval`.
+* Keys passed to `setSpecProperty`/`setSuiteProperty` must be strings. Values
+  must be both structured-cloneable and JSON-serializable.
+
+### Changes that affect configuration
+
+* HTML reporters cache configuration throughout each run. Configuration changes
+  made while specs are running will not affect reporter behavior.
+* If an execution order is passed to `Env#execute`, it must not enter any suite
+  more than once.
+* The argument passed to spec filters is a
+  [spec metadata](https://jasmine.github.io/api/6.0/Spec.html)
+  instance, not the internal spec object.
+* The default value of the `forbidDuplicateNames` config option has been
+  changed to true.
+
+### Changes that affect reporters
+
+This release includes changes that are intended to streamline and clarify the
+reporter interface, prevent sharing of mutable state, and prevent bugs involving
+non-serializable objects. These changes should be compatible with most existing
+reporters but could break reporters that manage their internal state in unusual
+ways.
+
+* Meaningless properties such as `status` and `failedExpectations` are omitted
+  from the events passed to [suiteStarted](https://jasmine.github.io/api/6.0/global.html#SuiteStartedEvent)
+  and [specStarted](https://jasmine.github.io/api/6.0/global.html#SpecStartedEvent).
+* Reporter events are deep-cloned before being passed to each reporter. This
+  protects reporters against later mutation by jasmine-core or other reporters.
+* The `expected` and `actual` properties of
+  [passed and failed expectations](https://jasmine.github.io/api/6.0/global.html#ExpectationResult)
+  have been removed.
+* The [order](https://jasmine.github.io/api/6.0/global.html#Order)
+  property of the`jasmineStarted` and `jasmineDone` reporter events no longer
+  includes undocumented properties.
+* boot1.js no longer adds `jsApiReporter` to the env.
+
+### Changes that affect browser boot files
+
+* The `createElement` and `createTextNode` options of the legacy `HtmlReporter`
+  are ignored. `HtmlReporter` now unconditionally uses `document.createElement`
+  and `document.createTextNode`.
+
+### Changes to Node boot functions
+
+* [boot](https://jasmine.github.io/api/6.0/module-jasmine-core.html#.boot)
+  defaults to creating a new core instance each time it's called. This restores
+  the pre-5.0 default behavior.
+* [noGlobals](https://jasmine.github.io/api/6.0/module-jasmine-core.html#.noGlobals)
+  no longer takes a parameter. It always returns the same object when called
+  repeatedly.
+
+
+## New features
+
+* A new `HtmlReporterV2` with several improvements over the old `HtmlReporter`:
+    * Clicking a spec/suite link does exact filtering rather than a substring
+      match.
+    * The old dots are replaced with a progress bar. This improves usability with
+      large suites and fixes an accessibility problem.
+    * Details of failed specs are displayed as soon as each spec finishes.
+    * A Performance tab shows metrics and a list of the slowest specs.
+    * Initialization and wire-up in boot files are much simpler.
+
+  If you're using jasmine-browser-runner or copying boot1.js from the standalone
+  distribution, you'll automatically get the new reporter. If you maintain your
+  own boot files, you'll get the old reporter unless you update your boot files
+  to match the one that's in this package.
+
+  The new reporter produces `spec` query string parameters that are different
+  from those created by the old reporter. If you use other software that
+  interprets the `spec` parameter, such as karma-jasmine, you won't be able to
+  adopt `HtmlReporterV2` unlesss that other software is updated.
+
+* Larger body font size in HTML reporters
+* `globalThis` is used to determine the global object during initialization
+  This makes jasmine-core more tolerant of buggy bundlers or loaders that
+  cause `this` to be undefined in the global context.
+* Experimental [`safariYieldStrategy: "time"`](https://jasmine.github.io/api/6.0/Configuration.html#safariYieldStrategy)
+  config option, which may make Jasmine run significantly faster in Safari and 
+  similar browsers. So far, this option has not been tested on a wide variety of
+  workloads. Feedback is appreciated.
+* Statically exposed pretty printer as `jasmine.pp()`.
+
+
+## Deprecations
+
+* Common monkey patching patterns are detected and result in a deprecation
+  warning. Code that overwrites anything provided by jasmine-core (other than
+  globals like `it`/`expect`/etc or configuration properties like
+  `jasmine.DEFAULT_TIMEOUT_INTERVAL`) may be broken by any jasmine-core release.
+* Warn if jasmine-core is loaded as an ES module in a browser.
+  This is an untested and unsupported configuration that has been known to cause
+  problems.
+* `HtmlReporter` and `HtmlSpecFilter` are deprecated in favor of `HtmlReporterV2`.
+* `jsApiReporter` is deprecated.
+
+
+## Documentation improvements
+
+* Improved API reference documentation for APIs that are used from browser boot
+  files.
+* Documented the set of possible spec statuses.
+* Documented that globals are overwriteable.
+
+
+## Internal improvements
+
+* Encapsulated suite and spec result and status management.
+* Adopted strict mode throughout the codebase.
+* Decomposed `HtmlReporter` into components and converted to ES6 classes.
+* Made global error handling more uniform between browsers and Node.
+* Removed code to support browsers that don't have `MessageChannel`. Jasmine 
+  hasn't run in any such browsers since 2.x.
+* Replaced `isArray` helper with native `Array.isArray`.
+
+## Supported environments
+
+This version has been tested in the following environments.
+
+| Environment       | Supported versions             |
+|-------------------|--------------------------------|
+| Node              | 20, 22, 24                     |
+| Safari**          | 16, 17, 26.2                   |
+| Chrome            | 143*                           |
+| Firefox           | 102**, 115**, 128**, 140, 147* |
+| Edge              | 143*                           |
+
+\* Evergreen browser. Each version of Jasmine is tested against the latest
+version available at release time.<br>
+\** Supported on a best-effort basis. Support for these versions may be dropped
+if it becomes impractical, and bugs affecting only these versions may not be
+treated as release blockers.
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/6.0.1.md

@@ -0,0 +1,29 @@
+# Jasmine Core 6.0.1 Release Notes
+
+## Bug fixes
+
+* Don't emit a deprecation warning when `jasmineRequire.core` is called from an
+  ES module
+
+## Supported environments
+
+This version has been tested in the following environments.
+
+| Environment       | Supported versions             |
+|-------------------|--------------------------------|
+| Node              | 20, 22, 24                     |
+| Safari**          | 16, 17, 26.2                   |
+| Chrome            | 143*                           |
+| Firefox           | 102**, 115**, 128**, 140, 147* |
+| Edge              | 143*                           |
+
+\* Evergreen browser. Each version of Jasmine is tested against the latest
+version available at release time.<br>
+\** Supported on a best-effort basis. Support for these versions may be dropped
+if it becomes impractical, and bugs affecting only these versions may not be
+treated as release blockers.
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/6.1.0.md

@@ -0,0 +1,40 @@
+# Jasmine Core 6.1.0 Release Notes
+
+## Changes to supported environments
+
+* Safari 16 and 17 are no longer supported. Although jasmine-core may still work
+  in those versions, we no longer have a reliable way to test them and won't try
+  to maintain compatibility with them in future releases.
+
+## New features
+
+* Report the underlying errors that make up an `AggregateError`.
+    * Merges [#2093](https://github.com/jasmine/jasmine/pull/2093) from @puglyfe
+    * Fixes [#2063](https://github.com/jasmine/jasmine/issues/2063)
+
+## Documentation improvements
+
+* Fix default MAX_PRETTY_PRINT_CHARS in JsDoc.
+    * Merges [#2091](https://github.com/jasmine/jasmine/pull/2091) from @HolgerJeromin
+
+## Supported environments
+
+This version has been tested in the following environments.
+
+| Environment       | Supported versions             |
+|-------------------|--------------------------------|
+| Node              | 20, 22, 24                     |
+| Safari            | 26.3**                         |
+| Chrome            | 144*                           |
+| Firefox           | 102**, 115**, 128**, 140, 147* |
+| Edge              | 144*                           |
+
+\* Evergreen browser. Each version of Jasmine is tested against the latest
+version available at release time.<br>
+\** Supported on a best-effort basis. Support for these versions may be dropped
+if it becomes impractical, and bugs affecting only these versions may not be
+treated as release blockers.
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/7.0.0-pre.0.md

@@ -0,0 +1,58 @@
+# Jasmine Core 7.0.0-pre.0 Release Notes
+
+This is a pre-release, intended to offer a preview of breaking changes and to
+solicit feedback.
+
+Before installing this release, update to 6.0.1 or later and fix all
+deprecation warnings.
+
+## Breaking changes
+
+* `HtmlReporter`, `HtmlSpecFilter`, and `jsApiReporter`, which were deprecated
+  in 6.0, have been removed.
+* Most private APIs are no longer exposed.
+* Monkey patching is blocked. This does not affect globals (`describe`, 
+  `expect`, etc.) or properties that are explicitly documented as writeable.
+  Those can still be overwritten.
+* Redesigned boot process:
+  * `jasmineRequire`, `boot`, and `noGlobals` have been removed.
+  * The core instance is automatically created.
+  * In browsers, globals are automatically created.
+  * In Node, globals are not automatically created. Call the exported
+    `installGlobals` function to create them. If you're using the `jasmine`
+    package, this is done for you by default.
+  * In Node, the same instance is returned every time jasmine-core is imported.
+    If you need to do multiple consecutive independent test runs, call the
+    exported `reset` function to reset all state and configuration between runs.
+
+  If you maintain your own browser boot files, you may be able to update by just
+  removing `boot1.js`. See the `boot.js` file in this package for a working
+  example. If you boot jasmine-core in Node, remove the call to `boot` or
+  `noGlobals` and add a call to `installGlobals` if desired:
+
+  ```javascript
+  const jasmineCore = require('jasmine-core');
+  jasmineCore.installGlobals();
+  ```
+
+## Supported environments
+
+This version has been tested in the following environments.
+
+| Environment       | Supported versions             |
+|-------------------|--------------------------------|
+| Node              | 20, 22, 24                     |
+| Safari            | 26.3**                         |
+| Chrome            | 144*                           |
+| Firefox           | 102**, 115**, 128**, 140, 147* |
+| Edge              | 144*                           |
+
+\* Evergreen browser. Each version of Jasmine is tested against the latest
+version available at release time.<br>
+\** Supported on a best-effort basis. Support for these versions may be dropped
+if it becomes impractical, and bugs affecting only these versions may not be
+treated as release blockers.
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

scripts/buildStandaloneDist.js

@@ -42,8 +42,7 @@ async function zipStandaloneDist(jasmineVersion) {
         'lib/jasmine-core/jasmine.js',
         'lib/jasmine-core/jasmine-html.js',
         'lib/jasmine-core/jasmine.css',
-        'lib/jasmine-core/boot0.js',
-        'lib/jasmine-core/boot1.js',
+        'lib/jasmine-core/boot.js',
       ],
       destDir: 'lib/jasmine-' + jasmineVersion
     },

scripts/lib/buildDistribution.js

@@ -34,18 +34,20 @@ function concatFiles() {
   const configs = [
     {
       src: [
+        { literal: '(function() {' },
         'src/html/requireHtml.js',
-        'src/html/HtmlReporter.js',
-        'src/html/HtmlSpecFilter.js',
         'src/html/ResultsNode.js',
         'src/html/QueryString.js',
-        'src/html/**/*.js'
+        { glob: 'src/html/**/*.js', exclude: 'src/html/requireSuffix.js' },
+        'src/html/requireSuffix.js',
+        { literal: '})()' },
       ],
       dest: 'lib/jasmine-core/jasmine-html.js',
     },
     {
       dest: 'lib/jasmine-core/jasmine.js',
       src: [
+        { literal: '(function() {' },
         'src/core/requireCore.js',
         'src/core/matchers/requireMatchers.js',
         'src/core/base.js',
@@ -53,23 +55,20 @@ function concatFiles() {
         'src/core/Spec.js',
         'src/core/Order.js',
         'src/core/Env.js',
-        'src/core/JsApiReporter.js',
         'src/core/PrettyPrinter',
         'src/core/Suite',
-        'src/core/**/*.js',
+        { glob: 'src/core/**/*.js', exclude: 'src/core/requireSuffix.js'},
         {
           template: 'src/version.js',
           data: {version: pkg.version}
         },
+        'src/core/requireSuffix.js',
+        { literal: '})()' },
       ],
     },
     {
-      dest: 'lib/jasmine-core/boot0.js',
-      src: ['src/boot/boot0.js'],
-    },
-    {
-      dest: 'lib/jasmine-core/boot1.js',
-      src: ['src/boot/boot1.js'],
+      dest: 'lib/jasmine-core/boot.js',
+      src: ['src/boot/boot.js'],
     },
     {
       dest: 'lib/jasmine-core.js',
@@ -85,25 +84,28 @@ function concatFiles() {
     src.unshift(licenseBanner);
 
     function expand(srcListEntry) {
-      if (typeof srcListEntry === 'object') {
+      if (typeof srcListEntry === 'object' && !srcListEntry.glob) {
         return srcListEntry;
       }
 
-      return glob.sync(srcListEntry)
-        .sort(function (a, b) {
-          // Match the sort order of previous build tools, so that the
-          // output is the same.
-          a = a.toLowerCase();
-          b = b.toLowerCase();
+      const matches =  glob.sync(
+        srcListEntry.glob ?? srcListEntry,
+        {ignore: srcListEntry.exclude}
+      );
+      return matches.sort(function (a, b) {
+        // Match the sort order of previous build tools, so that the
+        // output is the same.
+        a = a.toLowerCase();
+        b = b.toLowerCase();
 
-          if (a < b) {
-            return -1;
-          } else if (a === b) {
-            return 0;
-          } else {
-            return 1;
-          }
-        });
+        if (a < b) {
+          return -1;
+        } else if (a === b) {
+          return 0;
+        } else {
+          return 1;
+        }
+      });
     }
 
     const srcs = src.flatMap(expand);
@@ -117,6 +119,8 @@ function concatFiles() {
         if (s.template) {
           const template = fs.readFileSync(s.template, {encoding: 'utf8'});
           content = ejs.render(template, s.data);
+        } else if (s.literal) {
+          content = s.literal;
         } else {
           content = fs.readFileSync(s, {encoding: 'utf8'});
         }

scripts/run-sauce-browsers

@@ -1,5 +1,10 @@
 #!/bin/sh
 
+# Run tests in supported browsers that are available on Saucelabs.
+# Note: Safari is tested via GitHub Actions because Saucelabs only makes Safari
+# 18 and later available to paid enterprise accounts. See
+# .github/workflows/safari.yml.
+
 run_browser() {
 	browser=$1
 	version=$2
@@ -39,9 +44,6 @@ else
 fi
 run_browser firefox 102
 
-run_browser safari 17
-run_browser safari 16
-
 run_browser MicrosoftEdge latest
 
 echo

scripts/runSpecsInNode.js

@@ -1,8 +1,9 @@
-verifyNoGlobals(() => require('../lib/jasmine-core.js').noGlobals());
+let jasmineCore;
+verifyNoGlobals(() => { jasmineCore = require('../lib/jasmine-core.js'); });
+jasmineCore.installGlobals();
 
 const Jasmine = require('jasmine');
-const jasmineCore = require('../lib/jasmine-core.js');
-const runner = new Jasmine({jasmineCore: jasmineCore});
+const runner = new Jasmine({jasmineCore});
 
 runner.loadConfigFile('./spec/support/jasmine.json');
 runner.exitOnCompletion = false;

spec/core/ClockSpec.js

@@ -1247,4 +1247,8 @@ describe('Clock (acceptance)', function() {
 
     clock.tick(400);
   });
+
+  isNonMonkeyPatchableClass(privateUnderTest.Clock, function() {
+    return new privateUnderTest.Clock({}, function() {}, {});
+  });
 });

spec/core/ConfigurationSpec.js

@@ -10,7 +10,14 @@ describe('Configuration', function() {
     'detectLateRejectionHandling',
     'verboseDeprecations'
   ];
-  const allKeys = [...standardBooleanKeys, 'seed', 'specFilter'];
+  const allKeys = [
+    ...standardBooleanKeys,
+    'seed',
+    'specFilter',
+    'extraItStackFrames',
+    'extraDescribeStackFrames',
+    'safariYieldStrategy'
+  ];
   Object.freeze(standardBooleanKeys);
   Object.freeze(allKeys);
 
@@ -28,6 +35,9 @@ describe('Configuration', function() {
     expect(subject.forbidDuplicateNames).toEqual(true);
     expect(subject.verboseDeprecations).toEqual(false);
     expect(subject.detectLateRejectionHandling).toEqual(false);
+    expect(subject.extraItStackFrames).toEqual(0);
+    expect(subject.extraDescribeStackFrames).toEqual(0);
+    expect(subject.safariYieldStrategy).toEqual('count');
   });
 
   describe('copy()', function() {
@@ -109,5 +119,48 @@ describe('Configuration', function() {
       subject.update({ seed: null });
       expect(subject.seed).toBeNull();
     });
+
+    it('sets extraItStackFrames when not undefined', function() {
+      const subject = new privateUnderTest.Configuration();
+
+      subject.update({ extraItStackFrames: undefined });
+      expect(subject.extraItStackFrames).toEqual(0);
+
+      subject.update({ extraItStackFrames: 100000 });
+      expect(subject.extraItStackFrames).toEqual(100000);
+    });
+
+    it('sets extraDescribeStackFrames when not undefined', function() {
+      const subject = new privateUnderTest.Configuration();
+
+      subject.update({ extraDescribeStackFrames: undefined });
+      expect(subject.extraDescribeStackFrames).toEqual(0);
+
+      subject.update({ extraDescribeStackFrames: 100000 });
+      expect(subject.extraDescribeStackFrames).toEqual(100000);
+    });
+
+    it('sets safariYieldStrategy when valid', function() {
+      const subject = new privateUnderTest.Configuration();
+
+      subject.update({ safariYieldStrategy: undefined });
+      expect(subject.safariYieldStrategy).toEqual('count');
+
+      subject.update({ safariYieldStrategy: 'time' });
+      expect(subject.safariYieldStrategy).toEqual('time');
+
+      subject.update({ safariYieldStrategy: 'count' });
+      expect(subject.safariYieldStrategy).toEqual('count');
+    });
+
+    it('rejcts invalid safariYieldStrategy values', function() {
+      const subject = new privateUnderTest.Configuration();
+
+      expect(function() {
+        subject.update({ safariYieldStrategy: 'thyme' });
+      }).toThrowError(
+        "Invalid safariYieldStrategy value. Valid values are 'count' and 'time'."
+      );
+    });
   });
 });

spec/core/EnvSpec.js

@@ -1,4 +1,3 @@
-// TODO: Fix these unit tests!
 describe('Env', function() {
   let env;
   beforeEach(function() {
@@ -27,8 +26,6 @@ describe('Env', function() {
 
   describe('#topSuite', function() {
     it('returns an object that describes the tree of suites and specs', function() {
-      spyOn(env, 'deprecated');
-
       env.it('a top level spec');
       env.describe('a suite', function() {
         env.it('a spec');
@@ -95,7 +92,7 @@ describe('Env', function() {
     });
   });
 
-  it('accepts its own current configureation', function() {
+  it('accepts its own current configuration', function() {
     env.configure(env.configuration());
   });
 
@@ -124,7 +121,6 @@ describe('Env', function() {
   });
 
   it('ignores configuration properties that are present but undefined', function() {
-    spyOn(env, 'deprecated');
     const initialConfig = {
       random: true,
       seed: '123',
@@ -198,6 +194,29 @@ describe('Env', function() {
       expect(innerSuite.parentSuite).toBe(suite);
       expect(spec.getFullName()).toEqual('outer suite inner suite a spec');
     });
+
+    it('sets the caller filename correctly when extraDescribeStackFrames is not set', function() {
+      // IIFE is used to match the stack depth when global describe() is called
+      const suite = (function() {
+        return env[methodName]('a suite', function() {
+          env.it('a spec');
+        });
+      })();
+      expect(suite.filename).toMatch(/EnvSpec\.js$/);
+    });
+
+    it('sets the caller filename correctly when extraDescribeStackFrames is set', function() {
+      env.configure({ extraDescribeStackFrames: 2 });
+      // IIFE is used to match the stack depth when global describe() is called
+      const suite = (function() {
+        return specHelpers.callerFilenameShim(function() {
+          return env[methodName]('a suite', function() {
+            env.it('a spec');
+          });
+        });
+      })();
+      expect(suite.filename).toMatch(/EnvSpec\.js$/);
+    });
   }
 
   describe('#describe', function() {
@@ -300,6 +319,25 @@ describe('Env', function() {
         .not.toEqual('');
       expect(spec.pend).toBeFalsy();
     });
+
+    it('sets the caller filename correctly when extraItStackFrames is not set', function() {
+      // IIFE is used to match the stack depth when global it() is called
+      const spec = (function() {
+        return env[methodName]('a spec', function() {});
+      })();
+      expect(spec.filename).toMatch(/EnvSpec\.js$/);
+    });
+
+    it('sets the caller filename correctly when extraItStackFrames is set', function() {
+      env.configure({ extraItStackFrames: 2 });
+      // IIFE is used to match the stack depth when global it() is called
+      const spec = (function() {
+        return specHelpers.callerFilenameShim(function() {
+          return env[methodName]('a spec', function() {});
+        });
+      })();
+      expect(spec.filename).toMatch(/EnvSpec\.js$/);
+    });
   }
 
   describe('#it', function() {
@@ -722,7 +760,6 @@ describe('Env', function() {
 
   it("does not expose the suite as 'this'", function() {
     let suiteThis;
-    spyOn(env, 'deprecated');
 
     env.describe('a suite', function() {
       suiteThis = this;
@@ -837,4 +874,8 @@ describe('Env', function() {
       }).toThrowError('Jasmine cannot be configured via Env in parallel mode');
     });
   });
+
+  isNonMonkeyPatchableClass(privateUnderTest.Env, function() {
+    return new privateUnderTest.Env();
+  });
 });

spec/core/ExceptionFormatterSpec.js

@@ -173,10 +173,13 @@ describe('ExceptionFormatter', function() {
     });
 
     it('filters Jasmine stack frames in this environment', function() {
+      const jasmineFile = (function() {
+        const trace = new privateUnderTest.StackTrace(new Error());
+        return trace.frames[2].file;
+      })();
+      expect(jasmineFile).toMatch(/\/jasmine.js$/);
       const error = new Error('an error');
-      const subject = new privateUnderTest.ExceptionFormatter({
-        jasmineFile: jasmine.private.util.jasmineFile()
-      });
+      const subject = new privateUnderTest.ExceptionFormatter({ jasmineFile });
       const result = subject.stack(error);
       jasmine.debugLog('Original stack trace: ' + error.stack);
       jasmine.debugLog('Filtered stack trace: ' + result);
@@ -196,15 +199,18 @@ describe('ExceptionFormatter', function() {
     });
 
     it('handles multiline error messages in this environment', function() {
+      const jasmineFile = (function() {
+        const trace = new privateUnderTest.StackTrace(new Error());
+        return trace.frames[2].file;
+      })();
+      expect(jasmineFile).toMatch(/\/jasmine.js$/);
       const msg = 'an error\nwith two lines';
       const error = new Error(msg);
 
       if (error.stack.indexOf(msg) === -1) {
         pending("Stack traces don't have messages in this environment");
       }
-      const subject = new privateUnderTest.ExceptionFormatter({
-        jasmineFile: jasmine.private.util.jasmineFile()
-      });
+      const subject = new privateUnderTest.ExceptionFormatter({ jasmineFile });
       const result = subject.stack(error);
       const lines = result.split('\n');
 
@@ -284,7 +290,7 @@ describe('ExceptionFormatter', function() {
       it('ensures that stack traces do not include the message in this environment', function() {
         const error = new Error('an error');
         const subject = new privateUnderTest.ExceptionFormatter({
-          jasmineFile: jasmine.private.util.jasmineFile()
+          jasmineFile: "doesn't matter"
         });
         const result = subject.stack(error, { omitMessage: true });
         expect(result).not.toContain('an error');
@@ -346,5 +352,184 @@ describe('ExceptionFormatter', function() {
         }).not.toThrowError();
       });
     });
+
+    describe('when the error has an errors array (AggregateError)', function() {
+      it('includes all aggregated errors in the stack trace', function() {
+        const subject = new privateUnderTest.ExceptionFormatter();
+        const error1 = (function fn1() {
+          return new Error('first error');
+        })();
+        const error2 = (function fn2() {
+          return new Error('second error');
+        })();
+        const aggregateError = (function fn3() {
+          return new Error('Multiple errors occurred');
+        })();
+        aggregateError.errors = [error1, error2];
+
+        const lines = subject.stack(aggregateError).split('\n');
+
+        // TODO: be consistent across environments about whether the message is
+        // included in the stack trace
+        if (lines[0] === 'Error: Multiple errors occurred') {
+          lines.shift();
+        }
+
+        // Exclude lines that vary from environment to environment
+        const filteredLines = lines.filter(
+          x =>
+            !x.includes('/jasmine.js:') &&
+            // Some Node 20 and 22 minors when running in parallel
+            !x.includes('process.processTicksAndRejections')
+        );
+
+        for (let i = 0; i < filteredLines.length; i++) {
+          jasmine.debugLog(`Line ${i} after filtering: ${filteredLines[i]}`);
+        }
+
+        // Inexact matching because stack frame formatting varies from runtime
+        // to runtime
+        const expectedPatterns = [
+          // Overall error
+          /fn3.*ExceptionFormatterSpec\.js/,
+          /ExceptionFormatterSpec\.js/,
+          /^$/,
+
+          // First nested error
+          /^   Error 1: Error: first error$/,
+          /^   .*fn1.*ExceptionFormatterSpec\.js/,
+          /^   .*ExceptionFormatterSpec\.js/,
+          /^$/,
+
+          // Second nested error
+          /^   .*Error 2: Error: second error$/,
+          /^   .*fn2.*ExceptionFormatterSpec\.js/,
+          /^   .*ExceptionFormatterSpec\.js/
+        ];
+
+        expect(filteredLines).toEqual(
+          expectedPatterns.map(p => jasmine.stringMatching(p))
+        );
+      });
+
+      it('handles empty errors array', function() {
+        const subject = new privateUnderTest.ExceptionFormatter();
+        const aggregateError = new Error('No errors');
+        aggregateError.errors = [];
+
+        expect(function() {
+          subject.stack(aggregateError);
+        }).not.toThrowError();
+      });
+
+      it('handles nested AggregateError', function() {
+        const subject = new privateUnderTest.ExceptionFormatter();
+        const innerError1 = new Error('inner error 1');
+        const innerError2 = new Error('inner error 2');
+        const innerAggregate = new Error('Inner aggregate');
+        innerAggregate.errors = [innerError1, innerError2];
+
+        const outerError = new Error('outer error');
+        const outerAggregate = new Error('Outer aggregate');
+        outerAggregate.errors = [innerAggregate, outerError];
+
+        const lines = subject.stack(outerAggregate).split('\n');
+
+        const innerAggMsgIx = lines.findIndex(line =>
+          line.includes('Error 1: Error: Inner aggregate')
+        );
+        expect(innerAggMsgIx).toBeGreaterThan(-1);
+
+        const innerError1MsgIx = lines.findIndex(line =>
+          line.includes('Error 1: Error: inner error 1')
+        );
+        expect(innerError1MsgIx).toBeGreaterThan(innerAggMsgIx);
+
+        const innerError2MsgIx = lines.findIndex(line =>
+          line.includes('Error 2: Error: inner error 2')
+        );
+        expect(innerError2MsgIx).toBeGreaterThan(innerError1MsgIx);
+
+        const outerErrorMsgIx = lines.findIndex(line =>
+          line.includes('Error 2: Error: outer error')
+        );
+        expect(outerErrorMsgIx).toBeGreaterThan(innerError2MsgIx);
+      });
+
+      it('handles AggregateError containing error with cause', function() {
+        const subject = new privateUnderTest.ExceptionFormatter();
+        const rootCause = new Error('root cause');
+        const errorWithCause = new Error('error with cause', {
+          cause: rootCause
+        });
+        const aggregateError = new Error('Aggregate with cause chain');
+        aggregateError.errors = [errorWithCause];
+
+        const lines = subject.stack(aggregateError).split('\n');
+
+        const error1MsgIx = lines.findIndex(line =>
+          line.includes('Error 1: Error: error with cause')
+        );
+        expect(error1MsgIx).toBeGreaterThan(-1);
+
+        const causeMsgIx = lines.findIndex(line =>
+          line.includes('Caused by: Error: root cause')
+        );
+        expect(causeMsgIx).toBeGreaterThan(error1MsgIx);
+      });
+
+      it('skips non-Error items in errors array', function() {
+        const subject = new privateUnderTest.ExceptionFormatter();
+        const error1 = new Error('real error');
+        const aggregateError = new Error('Mixed array');
+        aggregateError.errors = [
+          error1,
+          'string error',
+          { message: 'object error' },
+          null,
+          undefined,
+          42
+        ];
+
+        const lines = subject.stack(aggregateError).split('\n');
+
+        const error1MsgIx = lines.findIndex(line =>
+          line.includes('Error 1: Error: real error')
+        );
+        expect(error1MsgIx).toBeGreaterThan(-1);
+
+        const hasStringError = lines.some(line =>
+          line.includes('string error')
+        );
+        expect(hasStringError).toBe(false);
+
+        const hasObjectError = lines.some(line =>
+          line.includes('object error')
+        );
+        expect(hasObjectError).toBe(false);
+      });
+
+      it('works with native AggregateError constructor', function() {
+        const subject = new privateUnderTest.ExceptionFormatter();
+        const error1 = new Error('first error');
+        const error2 = new Error('second error');
+        const aggregateError = new AggregateError(
+          [error1, error2],
+          'Multiple errors'
+        );
+
+        const lines = subject.stack(aggregateError).split('\n');
+
+        const error1MsgIx = lines.findIndex(line =>
+          line.includes('Error 1: Error: first error')
+        );
+        expect(error1MsgIx).toBeGreaterThan(-1);
+
+        const error2MsgIx = lines.findIndex(line =>
+          line.includes('Error 2: Error: second error')
+        );
+        expect(error2MsgIx).toBeGreaterThan(error1MsgIx);
+      });
+    });
   });
 });

spec/core/JsApiReporterSpec.js

@@ -1,179 +0,0 @@
-describe('JsApiReporter', function() {
-  it('knows when a full environment is started', function() {
-    const reporter = new privateUnderTest.JsApiReporter({});
-
-    expect(reporter.started).toBe(false);
-    expect(reporter.finished).toBe(false);
-
-    reporter.jasmineStarted();
-
-    expect(reporter.started).toBe(true);
-    expect(reporter.finished).toBe(false);
-  });
-
-  it('knows when a full environment is done', function() {
-    const reporter = new privateUnderTest.JsApiReporter({});
-
-    expect(reporter.started).toBe(false);
-    expect(reporter.finished).toBe(false);
-
-    reporter.jasmineStarted();
-    reporter.jasmineDone({});
-
-    expect(reporter.finished).toBe(true);
-  });
-
-  it("defaults to 'loaded' status", function() {
-    const reporter = new privateUnderTest.JsApiReporter({});
-
-    expect(reporter.status()).toEqual('loaded');
-  });
-
-  it("reports 'started' when Jasmine has started", function() {
-    const reporter = new privateUnderTest.JsApiReporter({});
-
-    reporter.jasmineStarted();
-
-    expect(reporter.status()).toEqual('started');
-  });
-
-  it("reports 'done' when Jasmine is done", function() {
-    const reporter = new privateUnderTest.JsApiReporter({});
-
-    reporter.jasmineDone({});
-
-    expect(reporter.status()).toEqual('done');
-  });
-
-  it('tracks a suite', function() {
-    const reporter = new privateUnderTest.JsApiReporter({});
-
-    reporter.suiteStarted({
-      id: 123,
-      description: 'A suite'
-    });
-
-    const suites = reporter.suites();
-
-    expect(suites).toEqual({ 123: { id: 123, description: 'A suite' } });
-
-    reporter.suiteDone({
-      id: 123,
-      description: 'A suite',
-      status: 'passed'
-    });
-
-    expect(suites).toEqual({
-      123: { id: 123, description: 'A suite', status: 'passed' }
-    });
-  });
-
-  describe('#specResults', function() {
-    let reporter, specResult1, specResult2;
-    beforeEach(function() {
-      reporter = new privateUnderTest.JsApiReporter({});
-      specResult1 = {
-        id: 1,
-        description: 'A spec'
-      };
-      specResult2 = {
-        id: 2,
-        description: 'Another spec'
-      };
-
-      reporter.specDone(specResult1);
-      reporter.specDone(specResult2);
-    });
-
-    it('should return a slice of results', function() {
-      expect(reporter.specResults(0, 1)).toEqual([specResult1]);
-      expect(reporter.specResults(1, 1)).toEqual([specResult2]);
-    });
-
-    describe('when the results do not exist', function() {
-      it('should return a slice of shorter length', function() {
-        expect(reporter.specResults(0, 3)).toEqual([specResult1, specResult2]);
-        expect(reporter.specResults(2, 3)).toEqual([]);
-      });
-    });
-  });
-
-  describe('#suiteResults', function() {
-    let reporter, suiteStarted1, suiteResult1, suiteResult2;
-    beforeEach(function() {
-      reporter = new privateUnderTest.JsApiReporter({});
-      suiteStarted1 = {
-        id: 1
-      };
-      suiteResult1 = {
-        id: 1,
-        status: 'failed',
-        failedExpectations: [{ message: 'My After All Exception' }]
-      };
-      suiteResult2 = {
-        id: 2,
-        status: 'passed'
-      };
-
-      reporter.suiteStarted(suiteStarted1);
-      reporter.suiteDone(suiteResult1);
-      reporter.suiteDone(suiteResult2);
-    });
-
-    it('should not include suite starts', function() {
-      expect(reporter.suiteResults(0, 3).length).toEqual(2);
-    });
-
-    it('should return a slice of results', function() {
-      expect(reporter.suiteResults(0, 1)).toEqual([suiteResult1]);
-      expect(reporter.suiteResults(1, 1)).toEqual([suiteResult2]);
-    });
-
-    it('returns nothing for out of bounds indices', function() {
-      expect(reporter.suiteResults(0, 3)).toEqual([suiteResult1, suiteResult2]);
-      expect(reporter.suiteResults(2, 3)).toEqual([]);
-    });
-  });
-
-  describe('#executionTime', function() {
-    it('should start the timer when jasmine starts', function() {
-      const timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-        reporter = new privateUnderTest.JsApiReporter({
-          timer: timerSpy
-        });
-
-      reporter.jasmineStarted();
-      expect(timerSpy.start).toHaveBeenCalled();
-    });
-
-    it('should return the time it took the specs to run, in ms', function() {
-      const timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-        reporter = new privateUnderTest.JsApiReporter({
-          timer: timerSpy
-        });
-
-      timerSpy.elapsed.and.returnValue(1000);
-      reporter.jasmineDone();
-      expect(reporter.executionTime()).toEqual(1000);
-    });
-
-    describe("when the specs haven't finished being run", function() {
-      it('should return undefined', function() {
-        const timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-          reporter = new privateUnderTest.JsApiReporter({
-            timer: timerSpy
-          });
-
-        expect(reporter.executionTime()).toBeUndefined();
-      });
-    });
-  });
-
-  describe('#runDetails', function() {
-    it('should have details about the run', function() {
-      const reporter = new privateUnderTest.JsApiReporter({});
-      reporter.jasmineDone({ some: { run: 'details' } });
-      expect(reporter.runDetails).toEqual({ some: { run: 'details' } });
-    });
-  });
-});

spec/core/ParallelReportDispatcherSpec.js

@@ -160,6 +160,13 @@ describe('ParallelReportDispatcher', function() {
     );
   });
 
+  isNonMonkeyPatchableClass(
+    jasmineUnderTest.ParallelReportDispatcher,
+    function() {
+      return new jasmineUnderTest.ParallelReportDispatcher();
+    }
+  );
+
   function mockGlobalErrors() {
     const globalErrors = jasmine.createSpyObj('globalErrors', [
       'install',

spec/core/QueueRunnerSpec.js

@@ -486,7 +486,7 @@ describe('QueueRunner', function() {
             errorListeners.pop();
           }
         },
-        clearStack = jasmine.createSpy('clearStack'),
+        clearStack = jasmine.createSpyObj('clearStack', ['clearStack']),
         onException = jasmine.createSpy('onException'),
         queueRunner = new privateUnderTest.QueueRunner({
           queueableFns: [queueableFn],
@@ -498,10 +498,10 @@ describe('QueueRunner', function() {
 
       queueRunner.execute();
       jasmine.clock().tick();
-      expect(clearStack).toHaveBeenCalled();
+      expect(clearStack.clearStack).toHaveBeenCalled();
       expect(errorListeners.length).toEqual(1);
       errorListeners[0](error);
-      clearStack.calls.argsFor(0)[0]();
+      clearStack.clearStack.calls.argsFor(0)[0]();
       expect(onException).toHaveBeenCalledWith(error);
     });
   });
@@ -908,22 +908,22 @@ describe('QueueRunner', function() {
         },
         afterFn = { fn: jasmine.createSpy('afterFn') },
         completeCallback = jasmine.createSpy('completeCallback'),
-        clearStack = jasmine.createSpy('clearStack'),
+        clearStack = jasmine.createSpyObj('clearStack', ['clearStack']),
         queueRunner = new privateUnderTest.QueueRunner({
           queueableFns: [asyncFn, afterFn],
           clearStack: clearStack,
           onComplete: completeCallback
         });
 
-      clearStack.and.callFake(function(fn) {
+      clearStack.clearStack.and.callFake(function(fn) {
         fn();
       });
 
       queueRunner.execute();
       jasmine.clock().tick();
       expect(afterFn.fn).toHaveBeenCalled();
-      expect(clearStack).toHaveBeenCalled();
-      clearStack.calls.argsFor(0)[0]();
+      expect(clearStack.clearStack).toHaveBeenCalled();
+      clearStack.clearStack.calls.argsFor(0)[0]();
       expect(completeCallback).toHaveBeenCalled();
     });
   });

spec/core/RunnerSpec.js

@@ -87,7 +87,7 @@ describe('Runner', function() {
     function arrayNotContaining(item) {
       return {
         asymmetricMatch(other, matchersUtil) {
-          if (!jasmine.private.isArray(other)) {
+          if (!Array.isArray(other)) {
             return false;
           }
 

spec/core/SpecSpec.js

@@ -103,26 +103,14 @@ describe('Spec', function() {
       });
     });
 
-    it('throws if the key is not structured-cloneable', function() {
+    it('throws if the key is not a string', function() {
       const spec = new privateUnderTest.Spec({
         queueableFn: { fn: () => {} }
       });
 
       expect(function() {
-        spec.setSpecProperty(new Promise(() => {}), '');
-      }).toThrowError("Key can't be cloned");
-    });
-
-    it('throws if the key is not JSON-serializable', function() {
-      const spec = new privateUnderTest.Spec({
-        queueableFn: { fn: () => {} }
-      });
-
-      expect(function() {
-        const k = {};
-        k.self = k;
-        spec.setSpecProperty(k, '');
-      }).toThrowError("Key can't be cloned");
+        spec.setSpecProperty({}, '');
+      }).toThrowError('Key must be a string');
     });
 
     it('throws if the value is not structured-cloneable', function() {
@@ -290,7 +278,7 @@ describe('Spec', function() {
         spec.addExpectationResult(true, { message: 'passed' });
         expect(function() {
           spec.addExpectationResult(false, { message: 'failed' });
-        }).toThrowError(jasmineUnderTest.private.errors.ExpectationFailed);
+        }).toThrowError(privateUnderTest.errors.ExpectationFailed);
 
         expect(spec.doneEvent().failedExpectations).toEqual([
           jasmine.objectContaining({ message: 'failed' })
@@ -465,9 +453,7 @@ describe('Spec', function() {
         queueableFn: {}
       });
 
-      spec.handleException(
-        new jasmineUnderTest.private.errors.ExpectationFailed()
-      );
+      spec.handleException(new privateUnderTest.errors.ExpectationFailed());
 
       expect(spec.doneEvent().failedExpectations).toEqual([]);
     });

spec/core/StackClearerSpec.js

@@ -1,6 +1,6 @@
-describe('ClearStack', function() {
+describe('StackClearer', function() {
   it('works in an integrationy way', function(done) {
-    const clearStack = privateUnderTest.getClearStack(
+    const { clearStack } = privateUnderTest.getStackClearer(
       jasmineUnderTest.getGlobal()
     );
 
@@ -36,7 +36,7 @@ describe('ClearStack', function() {
         queueMicrotask
       };
 
-      const clearStack = privateUnderTest.getClearStack(global);
+      const { clearStack } = privateUnderTest.getStackClearer(global);
 
       for (let i = 0; i < 9; i++) {
         clearStack(function() {});
@@ -73,17 +73,6 @@ describe('ClearStack', function() {
         }
       };
     });
-
-    describe('when MessageChannel is unavailable', function() {
-      usesQueueMicrotaskWithSetTimeout(function() {
-        return {
-          navigator: {
-            userAgent: 'CERN-LineMode/2.15 libwww/2.17b3',
-            MessageChannel: undefined
-          }
-        };
-      });
-    });
   });
 
   describe('in Node', function() {
@@ -104,7 +93,7 @@ describe('ClearStack', function() {
         ...makeGlobal(),
         MessageChannel: fakeMessageChannel
       };
-      const clearStack = privateUnderTest.getClearStack(global);
+      const { clearStack } = privateUnderTest.getStackClearer(global);
       let called = false;
 
       clearStack(function() {
@@ -125,7 +114,7 @@ describe('ClearStack', function() {
           return fakeChannel;
         }
       };
-      const clearStack = privateUnderTest.getClearStack(global);
+      const { clearStack } = privateUnderTest.getStackClearer(global);
 
       for (let i = 0; i < 9; i++) {
         clearStack(function() {});
@@ -150,7 +139,7 @@ describe('ClearStack', function() {
         setTimeout,
         MessageChannel: fakeMessageChannel
       };
-      const clearStack = privateUnderTest.getClearStack(global);
+      const { clearStack } = privateUnderTest.getStackClearer(global);
       const fn = jasmine.createSpy('second clearStack function');
 
       clearStack(function() {
@@ -170,7 +159,7 @@ describe('ClearStack', function() {
           fn();
         }
       };
-      const clearStack = privateUnderTest.getClearStack(global);
+      const { clearStack } = privateUnderTest.getStackClearer(global);
       let called = false;
 
       clearStack(function() {
@@ -180,30 +169,82 @@ describe('ClearStack', function() {
       expect(called).toBe(true);
     });
 
-    it('uses setTimeout instead of queueMicrotask every 10 calls to make sure we release the CPU', function() {
-      const queueMicrotask = jasmine.createSpy('queueMicrotask');
-      const setTimeout = jasmine.createSpy('setTimeout');
-      const global = {
-        ...makeGlobal(),
-        queueMicrotask,
-        setTimeout
-      };
-      const clearStack = privateUnderTest.getClearStack(global);
+    function hasSetTimeoutBehavior(configure) {
+      it('uses setTimeout instead of queueMicrotask every 10 calls', function() {
+        const queueMicrotask = jasmine.createSpy('queueMicrotask');
+        const setTimeout = jasmine.createSpy('setTimeout');
+        const global = {
+          ...makeGlobal(),
+          queueMicrotask,
+          setTimeout
+        };
+        const stackClearer = privateUnderTest.getStackClearer(global);
 
-      for (let i = 0; i < 9; i++) {
-        clearStack(function() {});
-      }
+        if (configure) {
+          configure(stackClearer);
+        }
 
-      expect(queueMicrotask).toHaveBeenCalled();
-      expect(setTimeout).not.toHaveBeenCalled();
+        for (let i = 0; i < 9; i++) {
+          stackClearer.clearStack(function() {});
+        }
 
-      clearStack(function() {});
-      expect(queueMicrotask).toHaveBeenCalledTimes(9);
-      expect(setTimeout).toHaveBeenCalledTimes(1);
+        expect(queueMicrotask).toHaveBeenCalled();
+        expect(setTimeout).not.toHaveBeenCalled();
 
-      clearStack(function() {});
-      expect(queueMicrotask).toHaveBeenCalledTimes(10);
-      expect(setTimeout).toHaveBeenCalledTimes(1);
+        stackClearer.clearStack(function() {});
+        expect(queueMicrotask).toHaveBeenCalledTimes(9);
+        expect(setTimeout).toHaveBeenCalledTimes(1);
+
+        stackClearer.clearStack(function() {});
+        expect(queueMicrotask).toHaveBeenCalledTimes(10);
+        expect(setTimeout).toHaveBeenCalledTimes(1);
+      });
+    }
+
+    hasSetTimeoutBehavior();
+
+    describe('With yield strategy explicitly set to count', function() {
+      hasSetTimeoutBehavior(function(stackClearer) {
+        stackClearer.setSafariYieldStrategy('count');
+      });
+    });
+
+    describe('With yield strategy set to time', function() {
+      beforeEach(function() {
+        jasmine.clock().install();
+        jasmine.clock().mockDate();
+      });
+
+      afterEach(function() {
+        jasmine.clock().uninstall();
+      });
+
+      it('uses setTimeout instead of queueMicrotask every 25 milliseconds', function() {
+        const queueMicrotask = jasmine.createSpy('queueMicrotask');
+        const setTimeout = jasmine.createSpy('setTimeout');
+        const global = {
+          ...makeGlobal(),
+          queueMicrotask,
+          setTimeout
+        };
+        const stackClearer = privateUnderTest.getStackClearer(global);
+        stackClearer.setSafariYieldStrategy('time');
+
+        // 10+ counts should not trigger a setTimeout if they happen fast enough
+        jasmine.clock().tick(24);
+        for (let i = 0; i < 11; i++) {
+          stackClearer.clearStack(function() {});
+        }
+
+        expect(queueMicrotask).toHaveBeenCalled();
+        expect(setTimeout).not.toHaveBeenCalled();
+
+        queueMicrotask.calls.reset();
+        jasmine.clock().tick(1);
+        stackClearer.clearStack(function() {});
+        expect(queueMicrotask).not.toHaveBeenCalled();
+        expect(setTimeout).toHaveBeenCalledTimes(1);
+      });
     });
   }
 
@@ -215,7 +256,7 @@ describe('ClearStack', function() {
           fn();
         }
       };
-      const clearStack = privateUnderTest.getClearStack(global);
+      const { clearStack } = privateUnderTest.getStackClearer(global);
       let called = false;
 
       clearStack(function() {
@@ -233,7 +274,7 @@ describe('ClearStack', function() {
         queueMicrotask,
         setTimeout
       };
-      const clearStack = privateUnderTest.getClearStack(global);
+      const { clearStack } = privateUnderTest.getStackClearer(global);
 
       clearStack(function() {});
       clearStack(function() {});

spec/core/SuiteSpec.js

@@ -138,7 +138,7 @@ describe('Suite', function() {
 
     expect(function() {
       suite.addExpectationResult(false, { message: 'failed' });
-    }).toThrowError(jasmineUnderTest.private.errors.ExpectationFailed);
+    }).toThrowError(privateUnderTest.errors.ExpectationFailed);
 
     expect(suite.doneEvent().status).toBe('failed');
     expect(suite.doneEvent().failedExpectations).toEqual([
@@ -149,9 +149,7 @@ describe('Suite', function() {
   it('does not add an additional failure when an expectation fails', function() {
     const suite = new privateUnderTest.Suite({});
 
-    suite.handleException(
-      new jasmineUnderTest.private.errors.ExpectationFailed()
-    );
+    suite.handleException(new privateUnderTest.errors.ExpectationFailed());
 
     expect(suite.doneEvent().failedExpectations).toEqual([]);
   });
@@ -409,12 +407,12 @@ describe('Suite', function() {
   });
 
   describe('#setSuiteProperty', function() {
-    it('throws if the key is not structured-cloneable', function() {
+    it('throws if the key is not a string', function() {
       const suite = new privateUnderTest.Suite({});
 
       expect(function() {
-        suite.setSuiteProperty(new Promise(() => {}), '');
-      }).toThrowError("Key can't be cloned");
+        suite.setSuiteProperty({}, '');
+      }).toThrowError('Key must be a string');
     });
 
     it('throws if the value is not structured-cloneable', function() {
@@ -424,6 +422,16 @@ describe('Suite', function() {
         suite.setSuiteProperty('k', new Promise(() => {}));
       }).toThrowError("Value can't be cloned");
     });
+
+    it('throws if the value is not JSON-serializable', function() {
+      const suite = new privateUnderTest.Suite({});
+
+      expect(function() {
+        const v = {};
+        v.self = v;
+        suite.setSuiteProperty('k', v);
+      }).toThrowError("Value can't be cloned");
+    });
   });
 
   describe('#startedEvent', function() {

spec/core/TimerSpec.js

@@ -30,4 +30,8 @@ describe('Timer', function() {
       expect(timer.elapsed()).toEqual(jasmine.any(Number));
     });
   });
+
+  isNonMonkeyPatchableClass(jasmineUnderTest.Timer, function() {
+    return new jasmineUnderTest.Timer();
+  });
 });

spec/core/TreeProcessorSpec.js

@@ -246,4 +246,53 @@ describe('TreeProcessor', function() {
       { spec: leaf1 }
     ]);
   });
+
+  describe("The returned ExecutionTree's numExcludedSpecs method", function() {
+    it('counts filtered-out specs', function() {
+      const included = new Leaf();
+      const excluded1 = new Leaf();
+      const excluded2 = new Leaf();
+      const excluded3 = new Leaf();
+      const topSuite = new Node({
+        children: [
+          excluded1,
+          new Node({
+            children: [included, excluded2, new Node({ children: [excluded3] })]
+          })
+        ]
+      });
+      const processor = new privateUnderTest.TreeProcessor({
+        tree: topSuite,
+        runnableIds: [topSuite.id],
+        excludeNode(node) {
+          return node.id !== included.id;
+        }
+      });
+
+      const executionTree = processor.processTree();
+      expect(executionTree.numExcludedSpecs()).toEqual(3);
+    });
+
+    it("counts specs that aren't in or descendants of runnableIds", function() {
+      const includedSuite = new Node({
+        children: [new Node({ children: [new Leaf()] }), new Leaf()]
+      });
+      const directlyIncludedSpec = new Leaf();
+      const topSuite = new Node({
+        children: [
+          includedSuite,
+          new Node({
+            children: [new Leaf(), directlyIncludedSpec]
+          })
+        ]
+      });
+      const processor = new privateUnderTest.TreeProcessor({
+        tree: topSuite,
+        runnableIds: [includedSuite.id, directlyIncludedSpec.id]
+      });
+
+      const executionTree = processor.processTree();
+      expect(executionTree.numExcludedSpecs()).toEqual(1);
+    });
+  });
 });

spec/core/UtilSpec.js

@@ -1,20 +1,4 @@
 describe('util', function() {
-  describe('isArray', function() {
-    it('should return true if the argument is an array', function() {
-      expect(privateUnderTest.isArray([])).toBe(true);
-      expect(privateUnderTest.isArray(['a'])).toBe(true);
-    });
-
-    it('should return false if the argument is not an array', function() {
-      expect(privateUnderTest.isArray(undefined)).toBe(false);
-      expect(privateUnderTest.isArray({})).toBe(false);
-      expect(privateUnderTest.isArray(function() {})).toBe(false);
-      expect(privateUnderTest.isArray('foo')).toBe(false);
-      expect(privateUnderTest.isArray(5)).toBe(false);
-      expect(privateUnderTest.isArray(null)).toBe(false);
-    });
-  });
-
   describe('isObject', function() {
     it('should return true if the argument is an object', function() {
       expect(privateUnderTest.isObject({})).toBe(true);
@@ -179,7 +163,6 @@ describe('util', function() {
       // Chrome sometimes reports foo.js as foo.js/, so tolerate
       // a trailing slash if present.
       expect(privateUnderTest.util.jasmineFile()).toMatch(/util.js\/?$/);
-      expect(jasmine.private.util.jasmineFile()).toMatch(/jasmine.js\/?$/);
     });
   });
 });

spec/core/asymmetric_equality/AllOfSpec.js

@@ -0,0 +1,63 @@
+describe('AllOf', function() {
+  it('matches a single value', function() {
+    const matchersUtil = new privateUnderTest.MatchersUtil();
+    const allOf = new privateUnderTest.AllOf('foo');
+
+    expect(allOf.asymmetricMatch('foo', matchersUtil)).toBeTrue();
+  });
+
+  it('matches a single matcher', function() {
+    const matchersUtil = new privateUnderTest.MatchersUtil();
+    const allOf = new privateUnderTest.AllOf(
+      new privateUnderTest.StringContaining('oo')
+    );
+
+    expect(allOf.asymmetricMatch('foo', matchersUtil)).toBeTrue();
+  });
+
+  it('matches multiple matchers', function() {
+    const matchersUtil = new privateUnderTest.MatchersUtil();
+    const allOf = new privateUnderTest.AllOf(
+      new privateUnderTest.StringContaining('o'),
+      new privateUnderTest.StringContaining('f')
+    );
+
+    expect(allOf.asymmetricMatch('foo', matchersUtil)).toBeTrue();
+  });
+
+  it('does not match when value does not match', function() {
+    const matchersUtil = new privateUnderTest.MatchersUtil();
+    const allOf = new privateUnderTest.AllOf('bar');
+
+    expect(allOf.asymmetricMatch('foo', matchersUtil)).toBeFalse();
+  });
+
+  it('does not match when any matchers fail', function() {
+    const matchersUtil = new privateUnderTest.MatchersUtil();
+    const allOf = new privateUnderTest.AllOf(
+      new privateUnderTest.StringContaining('o'),
+      new privateUnderTest.StringContaining('x')
+    );
+
+    expect(allOf.asymmetricMatch('foo', matchersUtil)).toBeFalse();
+  });
+
+  it('jasmineToStrings itself', function() {
+    const matcher = new privateUnderTest.AllOf('o');
+    const pp = jasmine.createSpy('pp').and.returnValue('sample');
+
+    expect(matcher.jasmineToString(pp)).toEqual('<jasmine.allOf(sample)>');
+    expect(pp).toHaveBeenCalledWith(['o']);
+  });
+
+  describe('when called without an argument', function() {
+    it('tells the user to pass a constructor argument', function() {
+      expect(function() {
+        new privateUnderTest.AllOf();
+      }).toThrowError(
+        TypeError,
+        'jasmine.allOf() expects at least one argument to be passed.'
+      );
+    });
+  });
+});

spec/core/baseSpec.js

@@ -170,8 +170,15 @@ describe('base helpers', function() {
   });
 
   describe('debugLog', function() {
+    beforeEach(function() {
+      privateUnderTest.currentEnv_ = jasmine.createSpyObj('env', ['debugLog']);
+    });
+
+    afterEach(function() {
+      privateUnderTest.currentEnv_ = null;
+    });
+
     it("forwards to the current env's debugLog function", function() {
-      spyOn(jasmineUnderTest.getEnv(), 'debugLog');
       jasmineUnderTest.debugLog('a message');
       expect(jasmineUnderTest.getEnv().debugLog).toHaveBeenCalledWith(
         'a message'

spec/core/integration/EnvSpec.js

@@ -1114,8 +1114,17 @@ describe('Env integration', function() {
       global: {
         setTimeout: globalSetTimeout,
         clearTimeout: clearTimeout,
+        addEventListener() {},
+        removeEventListener() {},
         queueMicrotask: function(fn) {
           queueMicrotask(fn);
+        },
+        // Enough Node globals to make getStackClearer() return the microtask
+        // implementation, which is the easiest to mock
+        process: {
+          versions: {
+            node: ''
+          }
         }
       }
     });
@@ -1179,7 +1188,7 @@ describe('Env integration', function() {
         global: {
           setTimeout: function(cb, t) {
             const stack = new Error().stack;
-            if (stack.indexOf('ClearStack') >= 0) {
+            if (stack.indexOf('clearStack') >= 0) {
               return realSetTimeout(cb, t);
             } else {
               return setTimeout(cb, t);
@@ -1188,8 +1197,17 @@ describe('Env integration', function() {
           clearTimeout: clearTimeout,
           setInterval: setInterval,
           clearInterval: clearInterval,
+          addEventListener() {},
+          removeEventListener() {},
           queueMicrotask: function(fn) {
             queueMicrotask(fn);
+          },
+          // Enough Node globals to make getStackClearer() return the microtask
+          // implementation, which is the easiest to mock
+          process: {
+            versions: {
+              node: ''
+            }
           }
         }
       });
@@ -1271,9 +1289,7 @@ describe('Env integration', function() {
       await env.execute();
       expect(reporter.specDone).toHaveBeenCalledTimes(1);
       const event = reporter.specDone.calls.argsFor(0)[0];
-      jasmine.debugLog(
-        'Spec result: ' + jasmine.private.basicPrettyPrinter(event)
-      );
+      jasmine.debugLog('Spec result: ' + jasmine.pp(event));
       expect(event).toEqual(jasmine.objectContaining({ status: 'passed' }));
       jasmine.clock().tick(1);
 
@@ -1539,6 +1555,7 @@ describe('Env integration', function() {
 
       expect(reporter.jasmineStarted).toHaveBeenCalledWith({
         totalSpecsDefined: 1,
+        numExcludedSpecs: 0,
         order: { random: true, seed: jasmine.any(String) },
         parallel: false
       });
@@ -1574,6 +1591,7 @@ describe('Env integration', function() {
 
       expect(reporter.jasmineStarted).toHaveBeenCalledWith({
         totalSpecsDefined: 1,
+        numExcludedSpecs: 0,
         order: { random: true, seed: jasmine.any(String) },
         parallel: false
       });
@@ -1630,6 +1648,7 @@ describe('Env integration', function() {
 
     expect(reporter.jasmineStarted).toHaveBeenCalledWith({
       totalSpecsDefined: 6,
+      numExcludedSpecs: 3,
       order: { random: false },
       parallel: false
     });
@@ -2043,6 +2062,7 @@ describe('Env integration', function() {
 
     expect(reporter.jasmineStarted).toHaveBeenCalledWith({
       totalSpecsDefined: 1,
+      numExcludedSpecs: 1,
       order: { random: true, seed: jasmine.any(String) },
       parallel: false
     });
@@ -2274,6 +2294,34 @@ describe('Env integration', function() {
     await env.execute();
   });
 
+  it('Custom matchers set in top-level beforeAll should be available to all specs and suites', async function() {
+    const matchers = {
+      toFoo: function() {}
+    };
+
+    env.beforeAll(function() {
+      env.addMatchers(matchers);
+    });
+
+    env.describe('suite - top-level', function() {
+      env.it('has access to the custom matcher', function() {
+        expect(env.expect().toFoo).toBeDefined();
+      });
+
+      env.describe('suite - nested', function() {
+        env.it('has access to the custom matcher', function() {
+          expect(env.expect().toFoo).toBeDefined();
+        });
+      });
+    });
+
+    env.it('spec - top-level - has access to the custom matcher', function() {
+      expect(env.expect().toFoo).toBeDefined();
+    });
+
+    await env.execute();
+  });
+
   it('throws an exception if you try to create a spy outside of a runnable', async function() {
     const obj = { fn: function() {} };
     let exception;
@@ -2775,12 +2823,18 @@ describe('Env integration', function() {
           },
           queueMicrotask: function(fn) {
             queueMicrotask(fn);
+          },
+          // Enough Node globals to make getStackClearer() return the microtask
+          // implementation, which is the easiest to mock
+          process: {
+            versions: {
+              node: ''
+            }
           }
         };
-        spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
 
         env.cleanup_();
-        env = new privateUnderTest.Env();
+        env = new privateUnderTest.Env({ global });
         const reporter = jasmine.createSpyObj('reporter', [
           'jasmineDone',
           'suiteDone',
@@ -3228,13 +3282,11 @@ describe('Env integration', function() {
     });
 
     it('is resolved after the stack is cleared', function(done) {
-      const realClearStack = privateUnderTest.getClearStack(
-          jasmineUnderTest.getGlobal()
-        ),
-        clearStackSpy = jasmine
-          .createSpy('clearStack')
-          .and.callFake(realClearStack);
-      spyOn(privateUnderTest, 'getClearStack').and.returnValue(clearStackSpy);
+      const stackClearer = privateUnderTest.getStackClearer(
+        jasmineUnderTest.getGlobal()
+      );
+      spyOn(stackClearer, 'clearStack').and.callThrough();
+      spyOn(privateUnderTest, 'getStackClearer').and.returnValue(stackClearer);
 
       // Create a new env that has the clearStack defined above
       env.cleanup_();
@@ -3245,10 +3297,10 @@ describe('Env integration', function() {
       });
 
       env.execute(null).then(function() {
-        expect(clearStackSpy).toHaveBeenCalled(); // (many times)
-        clearStackSpy.calls.reset();
+        expect(stackClearer.clearStack).toHaveBeenCalled(); // (many times)
+        stackClearer.clearStack.calls.reset();
         setTimeout(function() {
-          expect(clearStackSpy).not.toHaveBeenCalled();
+          expect(stackClearer.clearStack).not.toHaveBeenCalled();
           done();
         });
       });
@@ -3337,13 +3389,11 @@ describe('Env integration', function() {
     });
 
     it('is called after the stack is cleared', async function() {
-      const realClearStack = privateUnderTest.getClearStack(
-          jasmineUnderTest.getGlobal()
-        ),
-        clearStackSpy = jasmine
-          .createSpy('clearStack')
-          .and.callFake(realClearStack);
-      spyOn(privateUnderTest, 'getClearStack').and.returnValue(clearStackSpy);
+      const stackClearer = privateUnderTest.getStackClearer(
+        jasmineUnderTest.getGlobal()
+      );
+      spyOn(stackClearer, 'clearStack').and.callThrough();
+      spyOn(privateUnderTest, 'getStackClearer').and.returnValue(stackClearer);
 
       // Create a new env that has the clearStack defined above
       env.cleanup_();
@@ -3355,12 +3405,12 @@ describe('Env integration', function() {
 
       await env.execute();
 
-      expect(clearStackSpy).toHaveBeenCalled(); // (many times)
-      clearStackSpy.calls.reset();
+      expect(stackClearer.clearStack).toHaveBeenCalled(); // (many times)
+      stackClearer.clearStack.calls.reset();
 
       await new Promise(resolve => setTimeout(resolve));
 
-      expect(clearStackSpy).not.toHaveBeenCalled();
+      expect(stackClearer.clearStack).not.toHaveBeenCalled();
     });
 
     it('is called after QueueRunner timeouts are cleared', async function() {
@@ -3794,6 +3844,34 @@ describe('Env integration', function() {
     });
   });
 
+  describe('pp', function() {
+    it("pretty-prints using the current runable's custom object formatters", async function() {
+      env.it('a spec', function() {
+        env.addCustomObjectFormatter(function(x) {
+          if (x === 1) {
+            return 'hi!';
+          }
+        });
+        env.expect(env.pp(1)).toEqual('hi!');
+      });
+
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
+      env.addReporter(reporter);
+
+      await env.execute();
+
+      expect(reporter.specDone).toHaveBeenCalledWith(
+        jasmine.objectContaining({
+          failedExpectations: []
+        })
+      );
+    });
+
+    it('works when there is no current runable', function() {
+      expect(env.pp({ some: 'thing' })).toEqual("Object({ some: 'thing' })");
+    });
+  });
+
   it('forbids duplicates when forbidDuplicateNames is true', function() {
     env.configure({ forbidDuplicateNames: true });
     env.it('a spec');

spec/core/integration/GlobalErrorHandlingSpec.js

@@ -11,8 +11,8 @@ describe('Global error handling (integration)', function() {
     env.cleanup_();
   });
 
-  it('reports errors that occur during loading', async function() {
-    const global = {
+  function mockGlobal() {
+    return {
       ...browserEventMethods(),
       setTimeout: function(fn, delay) {
         return setTimeout(fn, delay);
@@ -23,12 +23,21 @@ describe('Global error handling (integration)', function() {
       queueMicrotask: function(fn) {
         queueMicrotask(fn);
       },
-      onerror: function() {}
+      onerror: function() {},
+      // Enough Node globals to make getStackClearer() return the microtask
+      // implementation, which is the easiest to mock
+      process: {
+        versions: {
+          node: ''
+        }
+      }
     };
-    spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
+  }
 
+  it('reports errors that occur during loading', async function() {
+    const global = mockGlobal();
     env.cleanup_();
-    env = new privateUnderTest.Env();
+    env = new privateUnderTest.Env({ global });
     const reporter = jasmine.createSpyObj('reporter', [
       'jasmineDone',
       'suiteDone',
@@ -70,21 +79,9 @@ describe('Global error handling (integration)', function() {
 
   describe('If suppressLoadErrors: true was passed', function() {
     it('does not install a global error handler during loading', async function() {
+      const global = mockGlobal();
       const originalOnerror = jasmine.createSpy('original onerror');
-      const global = {
-        ...browserEventMethods(),
-        setTimeout: function(fn, delay) {
-          return setTimeout(fn, delay);
-        },
-        clearTimeout: function(fn, delay) {
-          clearTimeout(fn, delay);
-        },
-        queueMicrotask: function(fn) {
-          queueMicrotask(fn);
-        },
-        onerror: originalOnerror
-      };
-      spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
+      global.onerror = originalOnerror;
       const globalErrors = new privateUnderTest.GlobalErrors(global);
       const onerror = jasmine.createSpy('onerror');
       globalErrors.pushListener(onerror);
@@ -92,6 +89,7 @@ describe('Global error handling (integration)', function() {
       env.cleanup_();
       env = new privateUnderTest.Env({
         suppressLoadErrors: true,
+        global,
         GlobalErrors: function() {
           return globalErrors;
         }
@@ -115,21 +113,9 @@ describe('Global error handling (integration)', function() {
 
   describe('Handling unhandled exceptions', function() {
     it('routes unhandled exceptions to the running spec', async function() {
-      const global = {
-        ...browserEventMethods(),
-        setTimeout: function(fn, delay) {
-          return setTimeout(fn, delay);
-        },
-        clearTimeout: function(fn, delay) {
-          clearTimeout(fn, delay);
-        },
-        queueMicrotask: function(fn) {
-          queueMicrotask(fn);
-        }
-      };
-      spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
+      const global = mockGlobal();
       env.cleanup_();
-      env = new privateUnderTest.Env();
+      env = new privateUnderTest.Env({ global });
       const reporter = jasmine.createSpyObj('fakeReporter', [
         'specDone',
         'suiteDone'
@@ -156,24 +142,12 @@ describe('Global error handling (integration)', function() {
 
     describe('When the most recently running spec has reported specDone', function() {
       it('routes unhandled exceptions to an ancestor suite', async function() {
-        const global = {
-          ...browserEventMethods(),
-          setTimeout: function(fn, delay) {
-            return setTimeout(fn, delay);
-          },
-          clearTimeout: function(fn) {
-            clearTimeout(fn);
-          },
-          queueMicrotask: function(fn) {
-            queueMicrotask(fn);
-          }
-        };
-        spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
-
-        const realClearStack = privateUnderTest.getClearStack(global);
+        const global = mockGlobal();
+        const stackClearer = privateUnderTest.getStackClearer(global);
+        const realClearStack = stackClearer.clearStack;
         const clearStackCallbacks = {};
         let clearStackCallCount = 0;
-        spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) {
+        spyOn(stackClearer, 'clearStack').and.callFake(function(fn) {
           clearStackCallCount++;
 
           if (clearStackCallbacks[clearStackCallCount]) {
@@ -182,9 +156,12 @@ describe('Global error handling (integration)', function() {
 
           realClearStack(fn);
         });
+        spyOn(privateUnderTest, 'getStackClearer').and.returnValue(
+          stackClearer
+        );
 
         env.cleanup_();
-        env = new privateUnderTest.Env();
+        env = new privateUnderTest.Env({ global });
 
         let suiteErrors = [];
         env.addReporter({
@@ -220,21 +197,9 @@ describe('Global error handling (integration)', function() {
     });
 
     it('routes unhandled exceptions to the running suite', async function() {
-      const global = {
-        ...browserEventMethods(),
-        setTimeout: function(fn, delay) {
-          return setTimeout(fn, delay);
-        },
-        clearTimeout: function(fn, delay) {
-          clearTimeout(fn, delay);
-        },
-        queueMicrotask: function(fn) {
-          queueMicrotask(fn);
-        }
-      };
-      spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
+      const global = mockGlobal();
       env.cleanup_();
-      env = new privateUnderTest.Env();
+      env = new privateUnderTest.Env({ global });
       const reporter = jasmine.createSpyObj('fakeReporter', [
         'specDone',
         'suiteDone'
@@ -273,24 +238,12 @@ describe('Global error handling (integration)', function() {
 
     describe('When the most recently suite has reported suiteDone', function() {
       it('routes unhandled exceptions to an ancestor suite', async function() {
-        const global = {
-          ...browserEventMethods(),
-          setTimeout: function(fn, delay) {
-            return setTimeout(fn, delay);
-          },
-          clearTimeout: function(fn, delay) {
-            clearTimeout(fn, delay);
-          },
-          queueMicrotask: function(fn) {
-            queueMicrotask(fn);
-          }
-        };
-        spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
-
-        const realClearStack = privateUnderTest.getClearStack(global);
+        const global = mockGlobal();
+        const stackClearer = privateUnderTest.getStackClearer(global);
+        const realClearStack = stackClearer.clearStack;
         const clearStackCallbacks = {};
         let clearStackCallCount = 0;
-        spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) {
+        spyOn(stackClearer, 'clearStack').and.callFake(function(fn) {
           clearStackCallCount++;
 
           if (clearStackCallbacks[clearStackCallCount]) {
@@ -299,9 +252,12 @@ describe('Global error handling (integration)', function() {
 
           realClearStack(fn);
         });
+        spyOn(privateUnderTest, 'getStackClearer').and.returnValue(
+          stackClearer
+        );
 
         env.cleanup_();
-        env = new privateUnderTest.Env();
+        env = new privateUnderTest.Env({ global });
 
         let suiteErrors = [];
         env.addReporter({
@@ -341,21 +297,9 @@ describe('Global error handling (integration)', function() {
 
     describe('When the env has started reporting jasmineDone', function() {
       it('logs the error to the console', async function() {
-        const global = {
-          ...browserEventMethods(),
-          setTimeout: function(fn, delay) {
-            return setTimeout(fn, delay);
-          },
-          clearTimeout: function(fn, delay) {
-            clearTimeout(fn, delay);
-          },
-          queueMicrotask: function(fn) {
-            queueMicrotask(fn);
-          }
-        };
-        spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
+        const global = mockGlobal();
         env.cleanup_();
-        env = new privateUnderTest.Env();
+        env = new privateUnderTest.Env({ global });
 
         spyOn(console, 'error');
 
@@ -384,26 +328,14 @@ describe('Global error handling (integration)', function() {
     });
 
     it('routes all errors that occur during stack clearing somewhere', async function() {
-      const global = {
-        ...browserEventMethods(),
-        setTimeout: function(fn, delay) {
-          return setTimeout(fn, delay);
-        },
-        clearTimeout: function(fn) {
-          clearTimeout(fn);
-        },
-        queueMicrotask: function(fn) {
-          queueMicrotask(fn);
-        }
-      };
-      spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
-
-      const realClearStack = privateUnderTest.getClearStack(global);
+      const global = mockGlobal();
+      const stackClearer = privateUnderTest.getStackClearer(global);
+      const realClearStack = stackClearer.clearStack;
       let clearStackCallCount = 0;
       let jasmineDone = false;
       const expectedErrors = [];
       const expectedErrorsAfterJasmineDone = [];
-      spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) {
+      spyOn(stackClearer, 'clearStack').and.callFake(function(fn) {
         clearStackCallCount++;
         const msg = `Error in clearStack #${clearStackCallCount}`;
 
@@ -416,10 +348,11 @@ describe('Global error handling (integration)', function() {
         dispatchErrorEvent(global, 'error', { error: msg });
         realClearStack(fn);
       });
+      spyOn(privateUnderTest, 'getStackClearer').and.returnValue(stackClearer);
       spyOn(console, 'error');
 
       env.cleanup_();
-      env = new privateUnderTest.Env();
+      env = new privateUnderTest.Env({ global });
 
       const receivedErrors = [];
       function logErrors(event) {
@@ -459,21 +392,9 @@ describe('Global error handling (integration)', function() {
 
   describe('Handling unhandled promise rejections', function() {
     it('routes unhandled promise rejections to the running spec', async function() {
-      const global = {
-        ...browserEventMethods(),
-        setTimeout: function(fn, delay) {
-          return setTimeout(fn, delay);
-        },
-        clearTimeout: function(fn, delay) {
-          clearTimeout(fn, delay);
-        },
-        queueMicrotask: function(fn) {
-          queueMicrotask(fn);
-        }
-      };
-      spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
+      const global = mockGlobal();
       env.cleanup_();
-      env = new privateUnderTest.Env();
+      env = new privateUnderTest.Env({ global });
       const reporter = jasmine.createSpyObj('fakeReporter', [
         'specDone',
         'suiteDone'
@@ -502,24 +423,12 @@ describe('Global error handling (integration)', function() {
 
     describe('When the most recently running spec has reported specDone', function() {
       it('routes unhandled promise rejections to an ancestor suite', async function() {
-        const global = {
-          ...browserEventMethods(),
-          setTimeout: function(fn, delay) {
-            return setTimeout(fn, delay);
-          },
-          clearTimeout: function(fn) {
-            clearTimeout(fn);
-          },
-          queueMicrotask: function(fn) {
-            queueMicrotask(fn);
-          }
-        };
-        spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
-
-        const realClearStack = privateUnderTest.getClearStack(global);
+        const global = mockGlobal();
+        const stackClearer = privateUnderTest.getStackClearer(global);
+        const realClearStack = stackClearer.clearStack;
         const clearStackCallbacks = {};
         let clearStackCallCount = 0;
-        spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) {
+        spyOn(stackClearer, 'clearStack').and.callFake(function(fn) {
           clearStackCallCount++;
 
           if (clearStackCallbacks[clearStackCallCount]) {
@@ -528,9 +437,12 @@ describe('Global error handling (integration)', function() {
 
           realClearStack(fn);
         });
+        spyOn(privateUnderTest, 'getStackClearer').and.returnValue(
+          stackClearer
+        );
 
         env.cleanup_();
-        env = new privateUnderTest.Env();
+        env = new privateUnderTest.Env({ global });
 
         let suiteErrors = [];
         env.addReporter({
@@ -566,21 +478,9 @@ describe('Global error handling (integration)', function() {
     });
 
     it('routes unhandled promise rejections to the running suite', async function() {
-      const global = {
-        ...browserEventMethods(),
-        setTimeout: function(fn, delay) {
-          return setTimeout(fn, delay);
-        },
-        clearTimeout: function(fn, delay) {
-          clearTimeout(fn, delay);
-        },
-        queueMicrotask: function(fn) {
-          queueMicrotask(fn);
-        }
-      };
-      spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
+      const global = mockGlobal();
       env.cleanup_();
-      env = new privateUnderTest.Env();
+      env = new privateUnderTest.Env({ global });
       const reporter = jasmine.createSpyObj('fakeReporter', [
         'specDone',
         'suiteDone'
@@ -621,24 +521,12 @@ describe('Global error handling (integration)', function() {
 
     describe('When the most recently suite has reported suiteDone', function() {
       it('routes unhandled promise rejections to an ancestor suite', async function() {
-        const global = {
-          ...browserEventMethods(),
-          setTimeout: function(fn, delay) {
-            return setTimeout(fn, delay);
-          },
-          clearTimeout: function(fn, delay) {
-            clearTimeout(fn, delay);
-          },
-          queueMicrotask: function(fn) {
-            queueMicrotask(fn);
-          }
-        };
-        spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
-
-        const realClearStack = privateUnderTest.getClearStack(global);
+        const global = mockGlobal();
+        const stackClearer = privateUnderTest.getStackClearer(global);
+        const realClearStack = stackClearer.clearStack;
         const clearStackCallbacks = {};
         let clearStackCallCount = 0;
-        spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) {
+        spyOn(stackClearer, 'clearStack').and.callFake(function(fn) {
           clearStackCallCount++;
 
           if (clearStackCallbacks[clearStackCallCount]) {
@@ -647,9 +535,12 @@ describe('Global error handling (integration)', function() {
 
           realClearStack(fn);
         });
+        spyOn(privateUnderTest, 'getStackClearer').and.returnValue(
+          stackClearer
+        );
 
         env.cleanup_();
-        env = new privateUnderTest.Env();
+        env = new privateUnderTest.Env({ global });
 
         let suiteErrors = [];
         env.addReporter({
@@ -689,21 +580,9 @@ describe('Global error handling (integration)', function() {
 
     describe('When the env has started reporting jasmineDone', function() {
       it('logs the rejection to the console', async function() {
-        const global = {
-          ...browserEventMethods(),
-          setTimeout: function(fn, delay) {
-            return setTimeout(fn, delay);
-          },
-          clearTimeout: function(fn, delay) {
-            clearTimeout(fn, delay);
-          },
-          queueMicrotask: function(fn) {
-            queueMicrotask(fn);
-          }
-        };
-        spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
+        const global = mockGlobal();
         env.cleanup_();
-        env = new privateUnderTest.Env();
+        env = new privateUnderTest.Env({ global });
 
         spyOn(console, 'error');
 
@@ -734,26 +613,14 @@ describe('Global error handling (integration)', function() {
     });
 
     it('routes all unhandled promise rejections that occur during stack clearing somewhere', async function() {
-      const global = {
-        ...browserEventMethods(),
-        setTimeout: function(fn, delay) {
-          return setTimeout(fn, delay);
-        },
-        clearTimeout: function(fn) {
-          clearTimeout(fn);
-        },
-        queueMicrotask: function(fn) {
-          queueMicrotask(fn);
-        }
-      };
-      spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
-
-      const realClearStack = privateUnderTest.getClearStack(global);
+      const global = mockGlobal();
+      const stackClearer = privateUnderTest.getStackClearer(global);
+      const realClearStack = stackClearer.clearStack;
       let clearStackCallCount = 0;
       let jasmineDone = false;
       const expectedErrors = [];
       const expectedErrorsAfterJasmineDone = [];
-      spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) {
+      spyOn(stackClearer, 'clearStack').and.callFake(function(fn) {
         clearStackCallCount++;
         const reason = `Error in clearStack #${clearStackCallCount}`;
         const expectedMsg = `Unhandled promise rejection: ${reason} thrown`;
@@ -767,10 +634,11 @@ describe('Global error handling (integration)', function() {
         dispatchErrorEvent(global, 'unhandledrejection', { reason });
         realClearStack(fn);
       });
+      spyOn(privateUnderTest, 'getStackClearer').and.returnValue(stackClearer);
       spyOn(console, 'error');
 
       env.cleanup_();
-      env = new privateUnderTest.Env();
+      env = new privateUnderTest.Env({ global });
 
       const receivedErrors = [];
       function logErrors(event) {
@@ -819,21 +687,9 @@ describe('Global error handling (integration)', function() {
         let global, reporter;
 
         beforeEach(function() {
-          global = {
-            ...browserEventMethods(),
-            setTimeout: function(fn, delay) {
-              return setTimeout(fn, delay);
-            },
-            clearTimeout: function(fn, delay) {
-              clearTimeout(fn, delay);
-            },
-            queueMicrotask: function(fn) {
-              queueMicrotask(fn);
-            }
-          };
-          spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
+          global = mockGlobal();
           env.cleanup_();
-          env = new privateUnderTest.Env();
+          env = new privateUnderTest.Env({ global });
           env.configure({ detectLateRejectionHandling: true });
 
           reporter = jasmine.createSpyObj('fakeReporter', [
@@ -966,21 +822,8 @@ describe('Global error handling (integration)', function() {
 
       describe("When the unhandled rejection event doesn't have a promise", function() {
         it('reports the rejection', async function() {
-          const global = {
-            ...browserEventMethods(),
-            setTimeout: function(fn, delay) {
-              return setTimeout(fn, delay);
-            },
-            clearTimeout: function(fn, delay) {
-              clearTimeout(fn, delay);
-            },
-            queueMicrotask: function(fn) {
-              queueMicrotask(fn);
-            }
-          };
-          spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
-          env.cleanup_();
-          env = new privateUnderTest.Env();
+          const global = mockGlobal();
+          env = new privateUnderTest.Env({ global });
           env.configure({ detectLateRejectionHandling: true });
           const reporter = jasmine.createSpyObj('fakeReporter', [
             'specDone',
@@ -1012,21 +855,9 @@ describe('Global error handling (integration)', function() {
   });
 
   it('works when the suite is run multiple times', async function() {
-    const global = {
-      ...browserEventMethods(),
-      setTimeout: function(fn, delay) {
-        return setTimeout(fn, delay);
-      },
-      clearTimeout: function(fn, delay) {
-        clearTimeout(fn, delay);
-      },
-      queueMicrotask: function(fn) {
-        queueMicrotask(fn);
-      }
-    };
-    spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
+    const global = mockGlobal();
     env.cleanup_();
-    env = new privateUnderTest.Env();
+    env = new privateUnderTest.Env({ global });
     env.configure({ autoCleanClosures: false });
     const reporter = jasmine.createSpyObj('fakeReporter', ['specDone']);
 

spec/core/jasmineNamespaceSpec.js

@@ -13,23 +13,71 @@ describe('The jasmine namespace', function() {
     expect(setDifference(actualKeys, expectedKeys())).toEqual(new Set());
   });
 
+  describe('Preventing monkey patching', function() {
+    const mutable = mutableKeys();
+
+    for (const key of expectedKeys()) {
+      if (mutable.includes(key)) {
+        it(`allows overwriting of jasmine.${key}`, function() {
+          const existingVal = jasmineUnderTest[key];
+
+          try {
+            jasmineUnderTest[key] = 'new value';
+            expect(jasmineUnderTest[key]).toEqual('new value');
+          } finally {
+            jasmineUnderTest[key] = existingVal;
+          }
+        });
+      } else {
+        it(`prevents overwriting of jasmine.${key}`, function() {
+          const existingVal = jasmineUnderTest[key];
+
+          try {
+            jasmineUnderTest[key] = 'monkey patch';
+            expect(jasmineUnderTest[key]).toBe(existingVal);
+          } finally {
+            // This will be a no-op if the test passed, but will prevent state
+            // leakage if it failed.
+            jasmineUnderTest[key] = existingVal;
+          }
+        });
+      }
+    }
+
+    it('allows additions', function() {
+      try {
+        jasmineUnderTest.Ajax = 'it worked';
+        expect(jasmineUnderTest.Ajax).toEqual('it worked');
+      } finally {
+        delete jasmineUnderTest.Ajax;
+      }
+    });
+  });
+
+  function mutableKeys() {
+    return [
+      'MAX_PRETTY_PRINT_ARRAY_LENGTH',
+      'MAX_PRETTY_PRINT_CHARS',
+      'MAX_PRETTY_PRINT_DEPTH',
+      'DEFAULT_TIMEOUT_INTERVAL'
+    ];
+  }
+
   function expectedKeys() {
     // Does not include properties added by requireInterface(), since that isn't
     // called by defineJasmineUnderTest.js/nodeDefineJasmineUnderTest.js.
     const result = new Set([
-      'MAX_PRETTY_PRINT_ARRAY_LENGTH',
-      'MAX_PRETTY_PRINT_CHARS',
-      'MAX_PRETTY_PRINT_DEPTH',
+      ...mutableKeys(),
       'debugLog',
       'getEnv',
       'isSpy',
       'ParallelReportDispatcher',
-      'private',
       'spyOnGlobalErrorsAsync',
       'Timer',
       'version',
 
       // Asymmetric equality testers
+      'allOf',
       'any',
       'anything',
       'arrayContaining',
@@ -52,10 +100,8 @@ describe('The jasmine namespace', function() {
 
     if (typeof window !== 'undefined') {
       // jasmine-html.js
-      result.add('HtmlReporter');
       result.add('HtmlReporterV2');
       result.add('HtmlReporterV2Urls');
-      result.add('HtmlSpecFilter');
       result.add('QueryString');
     }
 

spec/core/matchers/matchersUtilSpec.js

@@ -768,7 +768,16 @@ describe('matchersUtil', function() {
             a2[0] = 1;
             const diffBuilder = new privateUnderTest.DiffBuilder();
             expect(matchersUtil.equals(a1, a2, diffBuilder)).toBe(false);
-            jasmine.debugLog('Diff: ' + diffBuilder.getMessage());
+            jasmine.debugLog(
+              'a1 keys: ' + jasmine.pp(privateUnderTest.MatchersUtil.keys(a1))
+            );
+            jasmine.debugLog(
+              'a2 keys: ' + jasmine.pp(privateUnderTest.MatchersUtil.keys(a2))
+            );
+            jasmine.debugLog('a1 length:' + a1.length);
+            jasmine.debugLog('a2 length:' + a2.length);
+            jasmine.debugLog('a1[0]: ' + a1[0]);
+            jasmine.debugLog('a2[0]: ' + a2[0]);
           }
         );
 

spec/helpers/callerFilenameShim.js

@@ -0,0 +1,5 @@
+(function() {
+  specHelpers.callerFilenameShim = function(fn) {
+    return fn();
+  };
+})();

spec/helpers/defineJasmineUnderTest.js

@@ -1,9 +1,11 @@
 (function() {
-  // By the time onload is called, jasmineRequire will be redefined to point
-  // to the Jasmine source files (and not jasmine.js). So re-require
-  window.jasmineUnderTest = jasmineRequire.core(jasmineRequire);
-  jasmineRequire.html(jasmineUnderTest);
+  // By the time onload is called, getJasmineRequireObj() and
+  // getJasmineHtmlRequireObj() will be redefined to point
+  // to the Jasmine source files (and not jasmine.js). So re-require.
+  const jasmineRequire = getJasmineRequireObj();
+  const coreUnderTest = jasmineRequire.core(jasmineRequire);
+  window.jasmineUnderTest = coreUnderTest.jasmine;
+  window.privateUnderTest = coreUnderTest.private;
 
-  // Alias the private namespace so tests can be less verbose
-  window.privateUnderTest = window.jasmineUnderTest.private;
+  getJasmineHtmlRequireObj().html(jasmineUnderTest, privateUnderTest);
 })();

spec/helpers/integrationMatchers.js

@@ -42,9 +42,9 @@
                 : 'Expected runnable "' +
                   fullName +
                   '" to have failures ' +
-                  jasmine.private.basicPrettyPrinter(expectedFailures) +
+                  jasmine.pp(expectedFailures) +
                   ' but it had ' +
-                  jasmine.private.basicPrettyPrinter(foundFailures)
+                  jasmine.pp(foundFailures)
             };
           }
         };

spec/helpers/monkeyPatchingSpecs.js

@@ -0,0 +1,67 @@
+globalThis.isNonMonkeyPatchableClass = function(ctor, makeInstance) {
+  describe('Monkey patching prevention', function() {
+    it(`prevents overwriting ${ctor.name}.prototype`, function() {
+      const existing = ctor.prototype;
+
+      try {
+        ctor.prototype = {};
+        expect(ctor.prototype).toBe(existing);
+      } finally {
+        // This will be a no-op if the test passed, but will prevent state
+        // leakage if it failed.
+        ctor.prototype = existing;
+      }
+    });
+
+    it("prevents overwriting an instance's prototype", function() {
+      const instance = makeInstance();
+      let thrown;
+
+      // The message varies from browser to browser, so we can't rely on it
+      try {
+        instance.__proto__ = {};
+      } catch (e) {
+        thrown = e;
+      }
+
+      expect(thrown).toBeInstanceOf(TypeError);
+    });
+
+    it('prevents overwriting prototype properties', function() {
+      let any = false;
+
+      for (const k of Object.getOwnPropertyNames(ctor.prototype)) {
+        any = true;
+        const existingValue = ctor.prototype[k];
+
+        try {
+          ctor.prototype[k] = {};
+          expect(ctor.prototype[k])
+            .withContext(k)
+            .toBe(existingValue);
+        } finally {
+          // This will be a no-op if the test passed, but will prevent state
+          // leakage if it failed.
+          ctor.prototype[k] = existingValue;
+        }
+      }
+
+      expect(any).toBe(true);
+    });
+
+    it('prevents overriding prototype properties', function() {
+      const instance = makeInstance();
+      let any = false;
+
+      for (const k of Object.getOwnPropertyNames(ctor.prototype)) {
+        any = true;
+        instance[k] = {};
+        expect(instance[k])
+          .withContext(k)
+          .toBe(ctor.prototype[k]);
+      }
+
+      expect(any).toBe(true);
+    });
+  });
+};

spec/helpers/nodeDefineJasmineUnderTest.js

@@ -7,24 +7,29 @@
     '../../src/core/requireCore.js'
   ));
 
+  // Individual source files call getJasmineRequireObj. It's normally defined
+  // by requireCore.js which is concatenated into jasmine.js before other source
+  // files. Since we're bypassing that mechanism, we need to provide our own.
   global.getJasmineRequireObj = function() {
     return jasmineUnderTestRequire;
   };
 
-  function getSourceFiles() {
-    const globs = ['../../src/core/**/*.js', '../../src/version.js'];
-    const srcFiles = globs.flatMap(g => glob.sync(g, { cwd: __dirname }));
+  const srcFiles = [
+    ...glob.sync('../../src/core/**/*.js', {
+      ignore: '../../src/core/requireSuffix.js',
+      cwd: __dirname
+    }),
+    '../../src/version.js',
+    '../../src/core/requireCore.js'
+  ];
 
-    for (const file of srcFiles) {
-      require(file);
-    }
+  for (const file of srcFiles) {
+    require(file);
   }
 
-  getSourceFiles();
-  global.jasmineUnderTest = jasmineUnderTestRequire.core(
-    jasmineUnderTestRequire
-  );
+  delete global.getJasmineRequireObj;
 
-  // Alias the private namespace so tests can be less verbose
-  global.privateUnderTest = global.jasmineUnderTest.private;
+  const built = jasmineUnderTestRequire.core(jasmineUnderTestRequire);
+  global.jasmineUnderTest = built.jasmine;
+  global.privateUnderTest = built.private;
 })();

spec/html/HtmlReporterV2Spec.js

@@ -14,9 +14,7 @@ describe('HtmlReporterV2', function() {
   function setup(options = {}) {
     return new jasmineUnderTest.HtmlReporterV2({
       env,
-      getContainer() {
-        return container;
-      },
+      container,
       urls: new jasmineUnderTest.HtmlReporterV2Urls(),
       queryString: new jasmineUnderTest.QueryString({
         getWindowLocation() {
@@ -28,8 +26,7 @@ describe('HtmlReporterV2', function() {
   }
 
   it('builds the initial DOM elements, including the title banner', function() {
-    const reporter = setup();
-    reporter.initialize();
+    setup();
 
     // Main top-level elements
     expect(container.querySelector('div.jasmine_html-reporter')).toBeTruthy();
@@ -50,17 +47,6 @@ describe('HtmlReporterV2', function() {
     expect(version.textContent).toEqual(jasmineUnderTest.version);
   });
 
-  it('builds a single reporter even if initialized multiple times', function() {
-    const reporter = setup();
-    reporter.initialize();
-    reporter.initialize();
-    reporter.initialize();
-
-    expect(
-      container.querySelectorAll('div.jasmine_html-reporter').length
-    ).toEqual(1);
-  });
-
   describe('when a spec is done', function() {
     describe('and no expectations ran', function() {
       let reporter;
@@ -70,8 +56,6 @@ describe('HtmlReporterV2', function() {
 
         spyOn(console, 'warn');
         spyOn(console, 'error');
-
-        reporter.initialize();
       });
 
       it('logs a warning to the console when the spec passed', function() {
@@ -103,7 +87,6 @@ describe('HtmlReporterV2', function() {
 
     it('updates the progress bar', function() {
       const reporter = setup();
-      reporter.initialize();
       const progress = container.querySelector('progress');
 
       reporter.specDone({
@@ -125,7 +108,6 @@ describe('HtmlReporterV2', function() {
 
     it('changes the progress bar status if the spec failed', function() {
       const reporter = setup();
-      reporter.initialize();
 
       reporter.specDone({
         id: 345,
@@ -142,9 +124,8 @@ describe('HtmlReporterV2', function() {
   describe('when there are deprecation warnings', function() {
     it('displays the messages in their own alert bars', function() {
       const reporter = setup();
-      reporter.initialize();
 
-      reporter.jasmineStarted({ totalSpecsDefined: 0 });
+      reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
       reporter.specDone({
         status: 'passed',
         fullName: 'a spec with a deprecation',
@@ -167,25 +148,24 @@ describe('HtmlReporterV2', function() {
         '.jasmine-alert .jasmine-bar'
       );
 
-      expect(alertBars.length).toEqual(4);
-      expect(alertBars[1].innerHTML).toMatch(
+      expect(alertBars.length).toEqual(5);
+      expect(alertBars[2].innerHTML).toMatch(
         /spec deprecation.*\(in spec: a spec with a deprecation\)/
       );
-      expect(alertBars[1].getAttribute('class')).toEqual(
+      expect(alertBars[2].getAttribute('class')).toEqual(
         'jasmine-bar jasmine-warning'
       );
-      expect(alertBars[2].innerHTML).toMatch(
+      expect(alertBars[3].innerHTML).toMatch(
         /suite deprecation.*\(in suite: a suite with a deprecation\)/
       );
-      expect(alertBars[3].innerHTML).toMatch(/global deprecation/);
-      expect(alertBars[3].innerHTML).not.toMatch(/in /);
+      expect(alertBars[4].innerHTML).toMatch(/global deprecation/);
+      expect(alertBars[4].innerHTML).not.toMatch(/in /);
     });
 
     it('displays expandable stack traces', function() {
       const reporter = setup();
-      reporter.initialize();
 
-      reporter.jasmineStarted({ totalSpecsDefined: 0 });
+      reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
       reporter.jasmineDone({
         deprecationWarnings: [
           {
@@ -219,9 +199,8 @@ describe('HtmlReporterV2', function() {
 
     it('omits the expander when there is no stack trace', function() {
       const reporter = setup();
-      reporter.initialize();
 
-      reporter.jasmineStarted({ totalSpecsDefined: 0 });
+      reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
       reporter.jasmineDone({
         deprecationWarnings: [
           {
@@ -238,9 +217,8 @@ describe('HtmlReporterV2', function() {
 
     it('nicely formats the verboseDeprecations note', function() {
       const reporter = setup();
-      reporter.initialize();
 
-      reporter.jasmineStarted({ totalSpecsDefined: 0 });
+      reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
       reporter.jasmineDone({
         deprecationWarnings: [
           {
@@ -259,13 +237,228 @@ describe('HtmlReporterV2', function() {
     });
   });
 
+  describe('The tab bar', function() {
+    function checkHidden(tabs, expected) {
+      const actual = Array.from(tabs).map(t =>
+        t.classList.contains('jasmine-hidden')
+      );
+      expect(actual)
+        .withContext('tab hiddenness')
+        .toEqual(expected);
+    }
+
+    describe('while Jasmine is running', function() {
+      it('hides all tabs', function() {
+        const reporter = setup();
+        reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
+        const tabs = container.querySelectorAll('.jasmine-tab');
+        expect(tabs.length).toEqual(3);
+        expect(tabs[0].textContent).toEqual('Spec List');
+        expect(tabs[1].textContent).toEqual('Failures');
+        expect(tabs[2].textContent).toEqual('Performance');
+        checkHidden(tabs, [true, true, true]);
+
+        // Results, even failures, should not show any tabs
+        reporter.specDone({
+          id: 1,
+          description: 'a failing spec',
+          fullName: 'a failing spec',
+          status: 'failed',
+          failedExpectations: [{}],
+          passedExpectations: []
+        });
+        checkHidden(tabs, [true, true, true]);
+      });
+    });
+
+    describe('when Jasmine is done', function() {
+      function hasSpecOrSuiteFailureBehavior(reportEvents) {
+        let reporter;
+
+        beforeEach(function() {
+          reporter = setup();
+          reportEvents(reporter);
+        });
+
+        it('shows all three tabs', function() {
+          const tabs = container.querySelectorAll('.jasmine-tab');
+          checkHidden(tabs, [false, false, false]);
+        });
+
+        it('selects the Failures tab', function() {
+          const reporterNode = container.querySelector(
+            '.jasmine_html-reporter'
+          );
+          expect(reporterNode).toHaveClass('jasmine-failure-list');
+        });
+
+        it('switches between failure details and the spec summary', function() {
+          const tabs = container.querySelectorAll('.jasmine-tab');
+          let specListLink = () => tabs[0].querySelector('a');
+          let failuresLink = () => tabs[1].querySelector('a');
+          const reporterNode = container.querySelector(
+            '.jasmine_html-reporter'
+          );
+          expect(specListLink().textContent).toEqual('Spec List');
+          expect(failuresLink())
+            .withContext('failures link')
+            .toBeFalsy();
+
+          specListLink().click();
+          expect(reporterNode).toHaveClass('jasmine-spec-list');
+          expect(reporterNode).not.toHaveClass('jasmine-failure-list');
+          expect(specListLink())
+            .withContext('spec list link')
+            .toBeFalsy();
+          expect(failuresLink().textContent).toEqual('Failures');
+
+          failuresLink().click();
+          expect(reporterNode.getAttribute('class')).toMatch(
+            'jasmine-failure-list'
+          );
+          expect(failuresLink())
+            .withContext('failures link')
+            .toBeFalsy();
+          expect(specListLink().textContent).toEqual('Spec List');
+          expect(reporterNode).toHaveClass('jasmine-failure-list');
+          expect(reporterNode).not.toHaveClass('jasmine-spec-list');
+        });
+      }
+
+      function hasSpecAndSuiteSuccessBehavior(reportEvents) {
+        let reporter;
+
+        beforeEach(function() {
+          reporter = setup();
+          reportEvents(reporter);
+        });
+
+        it('shows the Spec List and Performance tabs', function() {
+          const tabs = container.querySelectorAll('.jasmine-tab');
+          checkHidden(tabs, [false, true, false]);
+        });
+
+        it('shows the spec list view', function() {
+          const reporterNode = container.querySelector(
+            '.jasmine_html-reporter'
+          );
+          expect(reporterNode).toHaveClass('jasmine-spec-list');
+          expect(reporterNode).not.toHaveClass('jasmine-failure-list');
+        });
+      }
+
+      describe('with spec failures', function() {
+        hasSpecOrSuiteFailureBehavior(function(reporter) {
+          reporter.jasmineStarted({
+            totalSpecsDefined: 0,
+            numExcludedSpecs: 0
+          });
+          reporter.specDone({
+            id: 1,
+            description: 'a failing spec',
+            fullName: 'a failing spec',
+            status: 'failed',
+            failedExpectations: [{}],
+            passedExpectations: []
+          });
+          reporter.specDone({
+            id: 2,
+            description: 'a passing spec',
+            fullName: 'a passing spec',
+            status: 'passed',
+            failedExpectations: [],
+            passedExpectations: []
+          });
+          reporter.jasmineDone({});
+        });
+      });
+
+      describe('with suite failures', function() {
+        hasSpecOrSuiteFailureBehavior(function(reporter) {
+          reporter.jasmineStarted({
+            totalSpecsDefined: 0,
+            numExcludedSpecs: 0
+          });
+          reporter.specDone({
+            id: 1,
+            description: 'a failing spec',
+            fullName: 'a failing spec',
+            status: 'failed',
+            failedExpectations: [{}],
+            passedExpectations: []
+          });
+          reporter.specDone({
+            id: 2,
+            description: 'a passing spec',
+            fullName: 'a passing spec',
+            status: 'passed',
+            failedExpectations: [],
+            passedExpectations: []
+          });
+          reporter.jasmineDone({});
+        });
+      });
+
+      describe('without any failures', function() {
+        hasSpecAndSuiteSuccessBehavior(function(reporter) {
+          reporter.jasmineStarted({
+            totalSpecsDefined: 0,
+            numExcludedSpecs: 0
+          });
+          reporter.specDone({
+            id: 1,
+            description: 'a passing spec',
+            fullName: 'a passing spec',
+            status: 'passed',
+            failedExpectations: [],
+            passedExpectations: []
+          });
+          reporter.suiteDone({ id: 1 });
+          reporter.jasmineDone({});
+        });
+      });
+
+      describe('with only top suite failures', function() {
+        // Top suite failures are displayed in their own alert bars, so they
+        // don't cause the failures tab to be shown.
+        hasSpecAndSuiteSuccessBehavior(function(reporter) {
+          reporter.jasmineStarted({
+            totalSpecsDefined: 0,
+            numExcludedSpecs: 0
+          });
+          reporter.jasmineDone({
+            failedExpectations: [{}]
+          });
+        });
+      });
+
+      it('shows the slow spec view when the Performance tab is clicked', function() {
+        const reporter = setup();
+        reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
+        reporter.specDone({
+          duration: 1.2,
+          failedExpectations: [],
+          passedExpectations: []
+        });
+        reporter.jasmineDone({});
+        const tabs = container.querySelectorAll('.jasmine-tab');
+        let perfLink = tabs[2].querySelector('a');
+        const reporterNode = container.querySelector('.jasmine_html-reporter');
+        expect(perfLink.textContent).toEqual('Performance');
+        perfLink.click();
+        expect(reporterNode).toHaveClass('jasmine-performance');
+        expect(reporterNode.innerHTML).toContain('<h2>Performance</h2>');
+        expect(reporterNode.innerHTML).toContain('<td>1.2ms</td>');
+      });
+    });
+  });
+
   describe('when Jasmine is done', function() {
     it('adds a warning to the link title of specs that have no expectations', function() {
       const reporter = setup();
       spyOn(console, 'error');
 
-      reporter.initialize();
-      reporter.jasmineStarted({ totalSpecsDefined: 0 });
+      reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
       reporter.suiteStarted({ id: 1 });
       reporter.specDone({
         id: 1,
@@ -287,9 +480,8 @@ describe('HtmlReporterV2', function() {
 
     it('reports the run time', function() {
       const reporter = setup();
-      reporter.initialize();
 
-      reporter.jasmineStarted({ totalSpecsDefined: 0 });
+      reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
 
       reporter.jasmineDone({ totalTime: 100 });
 
@@ -305,9 +497,8 @@ describe('HtmlReporterV2', function() {
           return '?foo=bar&' + key + '=' + value;
         }
       });
-      reporter.initialize();
 
-      reporter.jasmineStarted({ totalSpecsDefined: 0 });
+      reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
       reporter.suiteStarted({
         id: 1,
         description: 'A Suite',
@@ -412,7 +603,6 @@ describe('HtmlReporterV2', function() {
 
     it('has an options menu', function() {
       const reporter = setup();
-      reporter.initialize();
       reporter.jasmineDone({});
 
       const trigger = container.querySelector(
@@ -436,9 +626,8 @@ describe('HtmlReporterV2', function() {
     describe('when there are global errors', function() {
       it('displays the exceptions in their own alert bars', function() {
         const reporter = setup();
-        reporter.initialize();
 
-        reporter.jasmineStarted({ totalSpecsDefined: 0 });
+        reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
         reporter.jasmineDone({
           failedExpectations: [
             {
@@ -449,28 +638,24 @@ describe('HtmlReporterV2', function() {
           ]
         });
 
-        const alertBars = container.querySelectorAll(
-          '.jasmine-alert .jasmine-bar'
+        const errorBars = container.querySelectorAll(
+          '.jasmine-alert .jasmine-bar.jasmine-errored'
         );
 
-        expect(alertBars.length).toEqual(3);
-        expect(alertBars[1].getAttribute('class')).toEqual(
-          'jasmine-bar jasmine-errored'
-        );
-        expect(alertBars[1].innerHTML).toMatch(
+        expect(errorBars.length).toEqual(2);
+        expect(errorBars[0].innerHTML).toMatch(
           /AfterAll Global After All Failure/
         );
-        expect(alertBars[2].innerHTML).toMatch(
+        expect(errorBars[1].innerHTML).toMatch(
           /Error during loading: Your JS is borken/
         );
-        expect(alertBars[2].innerHTML).not.toMatch(/line/);
+        expect(errorBars[1].innerHTML).not.toMatch(/line/);
       });
 
       it('does not display the "AfterAll" prefix for other error types', function() {
         const reporter = setup();
-        reporter.initialize();
 
-        reporter.jasmineStarted({ totalSpecsDefined: 0 });
+        reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
         reporter.jasmineDone({
           failedExpectations: [
             { message: 'load error', globalErrorType: 'load' },
@@ -482,25 +667,24 @@ describe('HtmlReporterV2', function() {
           ]
         });
 
-        const alertBars = container.querySelectorAll(
-          '.jasmine-alert .jasmine-bar'
+        const errorBars = container.querySelectorAll(
+          '.jasmine-alert .jasmine-bar.jasmine-errored'
         );
 
-        expect(alertBars.length).toEqual(4);
-        expect(alertBars[1].textContent).toContain('load error');
-        expect(alertBars[2].textContent).toContain('lateExpectation error');
-        expect(alertBars[3].textContent).toContain('lateError error');
+        expect(errorBars.length).toEqual(3);
+        expect(errorBars[0].textContent).toContain('load error');
+        expect(errorBars[1].textContent).toContain('lateExpectation error');
+        expect(errorBars[2].textContent).toContain('lateError error');
 
-        for (let bar of alertBars) {
+        for (let bar of errorBars) {
           expect(bar.textContent).not.toContain('AfterAll');
         }
       });
 
       it('displays file and line information if available', function() {
         const reporter = setup();
-        reporter.initialize();
 
-        reporter.jasmineStarted({ totalSpecsDefined: 0 });
+        reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
         reporter.jasmineDone({
           failedExpectations: [
             {
@@ -512,12 +696,12 @@ describe('HtmlReporterV2', function() {
           ]
         });
 
-        const alertBars = container.querySelectorAll(
-          '.jasmine-alert .jasmine-bar'
+        const alertBar = container.querySelector(
+          '.jasmine-alert .jasmine-bar.jasmine-errored'
         );
 
-        expect(alertBars.length).toEqual(2);
-        expect(alertBars[1].innerHTML).toMatch(
+        expect(alertBar).toBeTruthy();
+        expect(alertBar.innerHTML).toMatch(
           /Error during loading: Your JS is borken in some\/file.js line 42/
         );
       });
@@ -526,7 +710,6 @@ describe('HtmlReporterV2', function() {
     describe('UI for stop on spec failure', function() {
       it('should be unchecked for full execution', function() {
         const reporter = setup();
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const stopOnFailureUI = container.querySelector('.jasmine-fail-fast');
@@ -534,10 +717,9 @@ describe('HtmlReporterV2', function() {
       });
 
       it('should be checked if stopping short', function() {
-        const reporter = setup();
         env.configure({ stopOnSpecFailure: true });
+        const reporter = setup();
 
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const stopOnFailureUI = container.querySelector('.jasmine-fail-fast');
@@ -547,7 +729,6 @@ describe('HtmlReporterV2', function() {
       it('should navigate and turn the setting on', function() {
         const reporter = setup();
 
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const stopOnFailureUI = container.querySelector('.jasmine-fail-fast');
@@ -557,10 +738,9 @@ describe('HtmlReporterV2', function() {
       });
 
       it('should navigate and turn the setting off', function() {
-        const reporter = setup();
         env.configure({ stopOnSpecFailure: true });
+        const reporter = setup();
 
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const stopOnFailureUI = container.querySelector('.jasmine-fail-fast');
@@ -573,7 +753,6 @@ describe('HtmlReporterV2', function() {
     describe('UI for throwing errors on expectation failures', function() {
       it('should be unchecked if not throwing', function() {
         const reporter = setup();
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const throwingExpectationsUI = container.querySelector(
@@ -583,10 +762,9 @@ describe('HtmlReporterV2', function() {
       });
 
       it('should be checked if throwing', function() {
-        const reporter = setup();
         env.configure({ stopSpecOnExpectationFailure: true });
+        const reporter = setup();
 
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const throwingExpectationsUI = container.querySelector(
@@ -597,7 +775,6 @@ describe('HtmlReporterV2', function() {
 
       it('should navigate and change the setting to on', function() {
         const reporter = setup();
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const throwingExpectationsUI = container.querySelector(
@@ -609,11 +786,9 @@ describe('HtmlReporterV2', function() {
       });
 
       it('should navigate and change the setting to off', function() {
+        env.configure({ stopSpecOnExpectationFailure: true });
         const reporter = setup();
 
-        env.configure({ stopSpecOnExpectationFailure: true });
-
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const throwingExpectationsUI = container.querySelector(
@@ -627,9 +802,8 @@ describe('HtmlReporterV2', function() {
 
     describe('UI for running tests in random order', function() {
       it('should be unchecked if not randomizing', function() {
-        const reporter = setup();
         env.configure({ random: false });
-        reporter.initialize();
+        const reporter = setup();
         reporter.jasmineDone({});
 
         const randomUI = container.querySelector('.jasmine-random');
@@ -637,9 +811,8 @@ describe('HtmlReporterV2', function() {
       });
 
       it('should be checked if randomizing', function() {
-        const reporter = setup();
         env.configure({ random: true });
-        reporter.initialize();
+        const reporter = setup();
         reporter.jasmineDone({});
 
         const randomUI = container.querySelector('.jasmine-random');
@@ -647,10 +820,9 @@ describe('HtmlReporterV2', function() {
       });
 
       it('should navigate and change the setting to on', function() {
+        env.configure({ random: false });
         const reporter = setup();
 
-        env.configure({ random: false });
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const randomUI = container.querySelector('.jasmine-random');
@@ -660,10 +832,9 @@ describe('HtmlReporterV2', function() {
       });
 
       it('should navigate and change the setting to off', function() {
+        env.configure({ random: true });
         const reporter = setup();
 
-        env.configure({ random: true });
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const randomUI = container.querySelector('.jasmine-random');
@@ -674,7 +845,6 @@ describe('HtmlReporterV2', function() {
 
       it('should show the seed bar if randomizing', function() {
         const reporter = setup();
-        reporter.initialize();
         reporter.jasmineDone({
           order: {
             random: true,
@@ -690,7 +860,6 @@ describe('HtmlReporterV2', function() {
 
       it('should not show the current seed bar if not randomizing', function() {
         const reporter = setup();
-        reporter.initialize();
         reporter.jasmineDone({});
 
         const seedBar = container.querySelector('.jasmine-seed-bar');
@@ -700,13 +869,12 @@ describe('HtmlReporterV2', function() {
       it('includes the number of specs in the text of the jasmine-skipped link', function() {
         const reporter = setup();
 
-        reporter.initialize();
         const minimalSpecDone = {
           failedExpectations: [],
           passedExpectations: []
         };
 
-        reporter.jasmineStarted({ totalSpecsDefined: 3 });
+        reporter.jasmineStarted({ totalSpecsDefined: 3, numExcludedSpecs: 0 });
         reporter.specDone({ ...minimalSpecDone });
         reporter.specDone({ ...minimalSpecDone });
         reporter.specDone({ ...minimalSpecDone, status: 'excluded' });
@@ -723,8 +891,7 @@ describe('HtmlReporterV2', function() {
           }
         });
 
-        reporter.initialize();
-        reporter.jasmineStarted({ totalSpecsDefined: 1 });
+        reporter.jasmineStarted({ totalSpecsDefined: 1, numExcludedSpecs: 0 });
         reporter.jasmineDone({ order: { random: true } });
 
         const skippedLink = container.querySelector('.jasmine-skipped a');
@@ -735,9 +902,8 @@ describe('HtmlReporterV2', function() {
     describe('and all specs pass', function() {
       beforeEach(function() {
         const reporter = setup();
-        reporter.initialize();
 
-        reporter.jasmineStarted({ totalSpecsDefined: 2 });
+        reporter.jasmineStarted({ totalSpecsDefined: 2, numExcludedSpecs: 0 });
         reporter.specDone({
           id: 123,
           description: 'with a spec',
@@ -758,12 +924,12 @@ describe('HtmlReporterV2', function() {
       });
 
       it('reports the specs counts', function() {
-        const alertBars = container.querySelectorAll(
-          '.jasmine-alert .jasmine-bar'
+        const resultBar = container.querySelector(
+          '.jasmine-alert .jasmine-bar.jasmine-overall-result'
         );
 
-        expect(alertBars.length).toEqual(1);
-        expect(alertBars[0].innerHTML).toMatch(/2 specs, 0 failures/);
+        expect(resultBar).toBeTruthy();
+        expect(resultBar.innerHTML).toMatch(/2 specs, 0 failures/);
       });
 
       it('reports no failure details', function() {
@@ -802,8 +968,10 @@ describe('HtmlReporterV2', function() {
               }
             }
           });
-          reporter.initialize();
-          reporter.jasmineStarted({ totalSpecsDefined: 1 });
+          reporter.jasmineStarted({
+            totalSpecsDefined: 1,
+            numExcludedSpecs: 0
+          });
           reporter.specDone(specStatus);
           reporter.jasmineDone({});
         });
@@ -824,8 +992,10 @@ describe('HtmlReporterV2', function() {
               }
             }
           });
-          reporter.initialize();
-          reporter.jasmineStarted({ totalSpecsDefined: 1 });
+          reporter.jasmineStarted({
+            totalSpecsDefined: 1,
+            numExcludedSpecs: 0
+          });
           reporter.specDone(specStatus);
           reporter.jasmineDone({});
         });
@@ -859,9 +1029,8 @@ describe('HtmlReporterV2', function() {
 
       beforeEach(function() {
         reporter = setup();
-        reporter.initialize();
 
-        reporter.jasmineStarted({ totalSpecsDefined: 1 });
+        reporter.jasmineStarted({ totalSpecsDefined: 1, numExcludedSpecs: 0 });
       });
 
       it('reports the pending specs count', function() {
@@ -912,9 +1081,8 @@ describe('HtmlReporterV2', function() {
 
       beforeEach(function() {
         reporter = setup();
-        reporter.initialize();
 
-        reporter.jasmineStarted({ totalSpecsDefined: 1 });
+        reporter.jasmineStarted({ totalSpecsDefined: 1, numExcludedSpecs: 0 });
         reporter.suiteStarted({
           id: 1,
           description: 'A suite'
@@ -1072,23 +1240,6 @@ describe('HtmlReporterV2', function() {
           )}`
         );
       });
-
-      it('allows switching between failure details and the spec summary', function() {
-        const menuBar = container.querySelectorAll('.jasmine-bar')[1];
-
-        expect(menuBar.getAttribute('class')).not.toMatch(/hidden/);
-
-        const link = menuBar.querySelector('a');
-        expect(link.innerHTML).toEqual('Failures');
-        expect(link.getAttribute('href')).toEqual('#');
-      });
-
-      it("sets the reporter to 'Failures List' mode", function() {
-        const reporterNode = container.querySelector('.jasmine_html-reporter');
-        expect(reporterNode.getAttribute('class')).toMatch(
-          'jasmine-failure-list'
-        );
-      });
     });
 
     it('counts failures that are reported in the jasmineDone event', function() {
@@ -1097,9 +1248,8 @@ describe('HtmlReporterV2', function() {
           return '?' + key + '=' + value;
         }
       });
-      reporter.initialize();
 
-      reporter.jasmineStarted({ totalSpecsDefined: 1 });
+      reporter.jasmineStarted({ totalSpecsDefined: 1, numExcludedSpecs: 0 });
 
       const failingSpecResult = {
         id: 124,
@@ -1139,7 +1289,6 @@ describe('HtmlReporterV2', function() {
       describe('When nothing has failed', function() {
         it('shows "Running..." and the has class jasmine-in-progress', function() {
           const reporter = setup();
-          reporter.initialize();
           const alertBar = container.querySelector('.jasmine-overall-result');
 
           expect(alertBar.textContent).toEqual('Running...');
@@ -1166,7 +1315,6 @@ describe('HtmlReporterV2', function() {
       describe('When a spec has failed', function() {
         it('shows "Failing..." and the has class jasmine-failed', function() {
           const reporter = setup();
-          reporter.initialize();
           const alertBar = container.querySelector('.jasmine-overall-result');
 
           reporter.specDone({
@@ -1185,7 +1333,6 @@ describe('HtmlReporterV2', function() {
       describe('When a suite has failed', function() {
         it('shows "Failing..." and the has class jasmine-failed', function() {
           const reporter = setup();
-          reporter.initialize();
           const alertBar = container.querySelector('.jasmine-overall-result');
 
           reporter.suiteDone({
@@ -1205,9 +1352,8 @@ describe('HtmlReporterV2', function() {
     describe("When the jasmineDone event's overallStatus is 'passed'", function() {
       it('has class jasmine-passed', function() {
         const reporter = setup();
-        reporter.initialize();
 
-        reporter.jasmineStarted({ totalSpecsDefined: 0 });
+        reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
         reporter.jasmineDone({
           overallStatus: 'passed',
           failedExpectations: []
@@ -1221,9 +1367,8 @@ describe('HtmlReporterV2', function() {
     describe("When the jasmineDone event's overallStatus is 'failed'", function() {
       it('has class jasmine-failed', function() {
         const reporter = setup();
-        reporter.initialize();
 
-        reporter.jasmineStarted({ totalSpecsDefined: 0 });
+        reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
         reporter.jasmineDone({
           overallStatus: 'failed',
           failedExpectations: []
@@ -1237,9 +1382,8 @@ describe('HtmlReporterV2', function() {
     describe("When the jasmineDone event's overallStatus is 'incomplete'", function() {
       it('has class jasmine-incomplete', function() {
         const reporter = setup();
-        reporter.initialize();
 
-        reporter.jasmineStarted({ totalSpecsDefined: 0 });
+        reporter.jasmineStarted({ totalSpecsDefined: 0, numExcludedSpecs: 0 });
         reporter.jasmineDone({
           overallStatus: 'incomplete',
           incompleteReason: 'because nope',
@@ -1252,4 +1396,6 @@ describe('HtmlReporterV2', function() {
       });
     });
   });
+
+  isNonMonkeyPatchableClass(jasmineUnderTest.HtmlReporterV2, setup);
 });

spec/html/HtmlReporterV2UrlsSpec.js

@@ -63,4 +63,8 @@ describe('HtmlReporterV2Urls', function() {
       return qs;
     }
   });
+
+  isNonMonkeyPatchableClass(jasmineUnderTest.HtmlReporterV2Urls, function() {
+    return new jasmineUnderTest.HtmlReporterV2Urls({});
+  });
 });

spec/html/HtmlSpecFilterSpec.js

@@ -1,30 +0,0 @@
-describe('HtmlSpecFilter', function() {
-  beforeEach(function() {
-    spyOn(jasmineUnderTest.getEnv(), 'deprecated');
-  });
-
-  it('emits a deprecation warning', function() {
-    new jasmineUnderTest.HtmlSpecFilter();
-    expect(jasmineUnderTest.getEnv().deprecated).toHaveBeenCalledWith(
-      'HtmlReporter and HtmlSpecFilter are deprecated. Use HtmlReporterV2 instead.'
-    );
-  });
-
-  it('should match when no string is provided', function() {
-    const specFilter = new jasmineUnderTest.HtmlSpecFilter();
-
-    expect(specFilter.matches('foo')).toBe(true);
-    expect(specFilter.matches('*bar')).toBe(true);
-  });
-
-  it('should only match the provided string', function() {
-    const specFilter = new jasmineUnderTest.HtmlSpecFilter({
-      filterString: function() {
-        return 'foo';
-      }
-    });
-
-    expect(specFilter.matches('foo')).toBe(true);
-    expect(specFilter.matches('bar')).toBe(false);
-  });
-});

spec/html/HtmlSpecFilterV2Spec.js

@@ -1,48 +1,69 @@
 describe('HtmlSpecFilterV2', function() {
-  it('matches everything when no string is provided', function() {
-    const specFilter = new privateUnderTest.HtmlSpecFilterV2({
-      filterString() {
-        return '';
-      }
-    });
+  describe('When both query parameters are falsy', function() {
+    it('matches everything', function() {
+      const specFilter = new privateUnderTest.HtmlSpecFilterV2({
+        filterParams() {
+          return { path: '', spec: '' };
+        }
+      });
 
-    expect(specFilter.matches({})).toBeTrue();
+      expect(specFilter.matches({})).toBeTrue();
+    });
   });
 
-  it('matches a spec with the exact same path', function() {
-    const specFilter = new privateUnderTest.HtmlSpecFilterV2({
-      filterString() {
-        return '["a","b","c"]';
-      }
+  describe('When the path parameter is truthy', function() {
+    it('matches a spec with the exact same path', function() {
+      const specFilter = new privateUnderTest.HtmlSpecFilterV2({
+        filterParams() {
+          return { path: '["a","b","c"]', spec: '' };
+        }
+      });
+
+      expect(specFilter.matches(stubSpec(['a', 'b', 'c']))).toBeTrue();
     });
 
-    expect(specFilter.matches(stubSpec(['a', 'b', 'c']))).toBeTrue();
-  });
+    it('matches a spec whose path has the filter path as a prefix', function() {
+      const specFilter = new privateUnderTest.HtmlSpecFilterV2({
+        filterParams() {
+          return { path: '["a","b"]', spec: '' };
+        }
+      });
 
-  it('matches a spec whose path has the filter path as a prefix', function() {
-    const specFilter = new privateUnderTest.HtmlSpecFilterV2({
-      filterString() {
-        return '["a","b"]';
-      }
+      expect(specFilter.matches(stubSpec(['a', 'b', 'c']))).toBeTrue();
     });
 
-    expect(specFilter.matches(stubSpec(['a', 'b', 'c']))).toBeTrue();
-  });
+    it('does not match a spec with a different path', function() {
+      const specFilter = new privateUnderTest.HtmlSpecFilterV2({
+        filterParams() {
+          return { path: '["a","b","c"]', spec: '' };
+        }
+      });
 
-  it('does not match a spec with a different path', function() {
-    const specFilter = new privateUnderTest.HtmlSpecFilterV2({
-      filterString() {
-        return '["a","b","c"]';
-      }
+      expect(specFilter.matches(stubSpec(['a', 'd', 'c']))).toBeFalse();
     });
-
-    expect(specFilter.matches(stubSpec(['a', 'd', 'c']))).toBeFalse();
   });
 
-  function stubSpec(path) {
+  describe('When the path parameter is falsy and the spec parameter is truthy', function() {
+    it('matches specs with full names containing the parameter value', function() {
+      const specFilter = new privateUnderTest.HtmlSpecFilterV2({
+        filterParams() {
+          return { path: '', spec: 'bar' };
+        }
+      });
+
+      expect(specFilter.matches(stubSpec('', 'foo bar baz'))).toBeTrue();
+      expect(specFilter.matches(stubSpec('', 'foo baz'))).toBeFalse();
+      expect(specFilter.matches(stubSpec('', 'sandbars'))).toBeTrue();
+    });
+  });
+
+  function stubSpec(path, fullName) {
     return {
       getPath() {
         return path;
+      },
+      getFullName() {
+        return fullName;
       }
     };
   }

spec/html/PerformanceViewSpec.js

@@ -0,0 +1,107 @@
+'use strict';
+
+describe('PerformanceView', function() {
+  it('shows specs ordered by execution time', function() {
+    const stateBuilder = new privateUnderTest.ResultsStateBuilder();
+    stateBuilder.suiteStarted({});
+    stateBuilder.specDone({
+      fullName: 'spec A',
+      duration: 2
+    });
+    stateBuilder.suiteDone({});
+    stateBuilder.specDone({
+      fullName: 'spec B',
+      duration: 1
+    });
+    stateBuilder.specDone({
+      fullName: 'spec C',
+      duration: 3
+    });
+    const subject = new privateUnderTest.PerformanceView();
+    subject.addResults(stateBuilder.topResults);
+
+    const rows = Array.from(subject.rootEl.querySelectorAll('tbody tr'));
+    const durations = rows.map(r => r.querySelectorAll('td')[0].textContent);
+    const names = rows.map(r => r.querySelectorAll('td')[1].textContent);
+    expect(names).toEqual(['spec C', 'spec A', 'spec B']);
+    expect(durations).toEqual(['3ms', '2ms', '1ms']);
+  });
+
+  it('shows at most 20 specs', function() {
+    const stateBuilder = new privateUnderTest.ResultsStateBuilder();
+    const subject = new privateUnderTest.PerformanceView();
+
+    for (let i = 0; i < 21; i++) {
+      stateBuilder.specDone({
+        fullName: `spec ${i}`,
+        duration: i
+      });
+    }
+
+    subject.addResults(stateBuilder.topResults);
+
+    expect(subject.rootEl.querySelectorAll('tbody tr').length).toEqual(20);
+    expect(subject.textContent).not.toContain('spec 0');
+  });
+
+  it('shows mean and median run times for an odd number of specs', function() {
+    const stateBuilder = new privateUnderTest.ResultsStateBuilder();
+    const subject = new privateUnderTest.PerformanceView();
+
+    stateBuilder.specDone({ duration: 1 });
+    stateBuilder.specDone({ duration: 2 });
+    stateBuilder.specDone({ duration: 5 });
+    subject.addResults(stateBuilder.topResults);
+
+    expect(subject.rootEl.textContent).toContain('Mean spec run time: 3ms');
+    expect(subject.rootEl.textContent).toContain('Median spec run time: 2ms');
+  });
+
+  it('shows mean and median run times for an even number of specs', function() {
+    const stateBuilder = new privateUnderTest.ResultsStateBuilder();
+    const subject = new privateUnderTest.PerformanceView();
+
+    stateBuilder.specDone({ duration: 1 });
+    stateBuilder.specDone({ duration: 3 });
+    stateBuilder.specDone({ duration: 10 });
+    stateBuilder.specDone({ duration: 2 });
+    subject.addResults(stateBuilder.topResults);
+
+    expect(subject.rootEl.textContent).toContain('Mean spec run time: 4ms');
+    expect(subject.rootEl.textContent).toContain('Median spec run time: 2ms');
+  });
+
+  it('copes with 0 specs', function() {
+    const stateBuilder = new privateUnderTest.ResultsStateBuilder();
+    const subject = new privateUnderTest.PerformanceView();
+
+    expect(function() {
+      subject.addResults(stateBuilder.topResults);
+    }).not.toThrow();
+  });
+
+  it('filters out excluded specs', function() {
+    const stateBuilder = new privateUnderTest.ResultsStateBuilder();
+    stateBuilder.specDone({
+      fullName: 'spec A',
+      duration: 2
+    });
+    stateBuilder.specDone({
+      fullName: 'spec B',
+      duration: 1,
+      status: 'excluded'
+    });
+    stateBuilder.specDone({
+      fullName: 'spec C',
+      duration: 3
+    });
+    const subject = new privateUnderTest.PerformanceView();
+    subject.addResults(stateBuilder.topResults);
+
+    const rows = Array.from(subject.rootEl.querySelectorAll('tbody tr'));
+    const names = rows.map(r => r.querySelectorAll('td')[1].textContent);
+    expect(names).toEqual(['spec C', 'spec A']);
+    expect(subject.rootEl.textContent).toContain('Mean spec run time: 3ms');
+    expect(subject.rootEl.textContent).toContain('Median spec run time: 2ms');
+  });
+});

spec/html/QueryStringSpec.js

@@ -77,4 +77,12 @@ describe('QueryString', function() {
       expect(queryString.getParam('baz')).toBeFalsy();
     });
   });
+
+  isNonMonkeyPatchableClass(jasmineUnderTest.QueryString, function() {
+    return new jasmineUnderTest.QueryString({
+      getWindowLocation: function() {
+        return { search: '' };
+      }
+    });
+  });
 });

spec/html/TabBarSpec.js

@@ -0,0 +1,97 @@
+describe('TabBar', function() {
+  it('initially renders but hides the tabs', function() {
+    const subject = new privateUnderTest.TabBar([
+      { id: 'tab1', label: 'tab 1' }
+    ]);
+    const tabs = subject.rootEl.querySelectorAll('.jasmine-tab');
+    expect(tabs.length).toEqual(1);
+    expect(tabs[0].id).toEqual('tab1');
+    expect(tabs[0]).toHaveClass('jasmine-hidden');
+    const link = tabs[0].querySelector('a');
+    expect(link).toBeTruthy();
+    expect(link.textContent).toEqual('tab 1');
+  });
+
+  it('does not initially call the onSelect callback', function() {
+    const onSelect = jasmine.createSpy('onSelect');
+    new privateUnderTest.TabBar([{ id: 'tab1', label: '' }], onSelect);
+    expect(onSelect).not.toHaveBeenCalled();
+  });
+
+  describe('#showTab', function() {
+    it('shows the specified tab', function() {
+      const subject = new privateUnderTest.TabBar([
+        { id: 'tab1' },
+        { id: 'tab2' }
+      ]);
+
+      subject.showTab('tab2');
+
+      const tabs = subject.rootEl.querySelectorAll('.jasmine-tab');
+      expect(tabs[0]).toHaveClass('jasmine-hidden');
+      expect(tabs[1]).not.toHaveClass('jasmine-hidden');
+    });
+
+    it('does not hide previously shown tabs', function() {
+      const subject = new privateUnderTest.TabBar([
+        { id: 'tab1' },
+        { id: 'tab2' }
+      ]);
+
+      subject.showTab('tab1');
+      subject.showTab('tab2');
+
+      const tabs = subject.rootEl.querySelectorAll('.jasmine-tab');
+      expect(tabs[0]).not.toHaveClass('jasmine-hidden');
+    });
+  });
+
+  describe("When a tab's link is clicked", function() {
+    it("calls the onSelect callback with the tab's id", function() {
+      const onSelect = jasmine.createSpy('onSelect');
+      const subject = new privateUnderTest.TabBar(
+        [{ id: 'tab1', label: '' }],
+        onSelect
+      );
+
+      subject.rootEl.querySelector('.jasmine-tab a').click();
+
+      expect(onSelect).toHaveBeenCalledWith('tab1');
+    });
+
+    it('shows links on all non-selected tabs only', function() {
+      const subject = new privateUnderTest.TabBar(
+        [
+          { id: 'tab1', label: 'tab 1' },
+          { id: 'tab2', label: 'tab 2' },
+          { id: 'tab3', label: 'tab 3' }
+        ],
+        () => {}
+      );
+
+      subject.rootEl.querySelectorAll('.jasmine-tab a')[1].click();
+      let tabs = subject.rootEl.querySelectorAll('.jasmine-tab');
+      expect(tabs[0].querySelector('a'))
+        .withContext('tab 1')
+        .toBeTruthy();
+      expect(tabs[1].querySelector('a'))
+        .withContext('tab 1')
+        .toBeFalsy();
+      expect(tabs[2].querySelector('a'))
+        .withContext('tab 1')
+        .toBeTruthy();
+
+      subject.rootEl.querySelectorAll('.jasmine-tab a')[0].click();
+      tabs = subject.rootEl.querySelectorAll('.jasmine-tab');
+      expect(tabs[0].querySelector('a'))
+        .withContext('tab 1')
+        .toBeFalsy();
+      expect(tabs[1].querySelector('a'))
+        .withContext('tab 1')
+        .toBeTruthy();
+      expect(tabs[2].querySelector('a'))
+        .withContext('tab 1')
+        .toBeTruthy();
+    });
+  });
+});

spec/npmPackage/npmPackageSpec.js

@@ -77,7 +77,7 @@ describe('npm package', function() {
   });
 
   it('has bootFiles', function() {
-    expect(this.packagedCore.files.bootFiles).toEqual(['boot0.js', 'boot1.js']);
+    expect(this.packagedCore.files.bootFiles).toEqual(['boot.js']);
 
     for (const fileName of this.packagedCore.files.bootFiles) {
       expect(fileName).toExistInPath(this.packagedCore.files.bootDir);

spec/support/ci.js

@@ -1,4 +1,3 @@
-/* eslint-env node, es6 */
 const path = require('path'),
   jasmineBrowser = require('jasmine-browser-runner'),
   jasmineCore = require('../../lib/jasmine-core');

spec/support/jasmine-browser.js

@@ -1,4 +1,3 @@
-/* eslint-env node, es6 */
 module.exports = {
   srcDir: 'src',
   srcFiles: [
@@ -7,13 +6,14 @@ module.exports = {
     'core/util.js',
     'core/Spec.js',
     'core/Env.js',
-    'core/JsApiReporter.js',
     'core/PrettyPrinter.js',
     'core/Suite.js',
     'core/**/*.js',
     'html/**/*.js',
     '**/*.js',
-    '!boot/**.js'
+    '!boot/**.js',
+    '!core/requireSuffix.js',
+    '!html/requireSuffix.js'
   ],
   specDir: 'spec',
   specFiles: ['**/*[Ss]pec.js', '!npmPackage/**/*'],
@@ -23,11 +23,14 @@ module.exports = {
     'helpers/BrowserFlags.js',
     'helpers/domHelpers.js',
     'helpers/integrationMatchers.js',
+    'helpers/callerFilenameShim.js',
+    'helpers/monkeyPatchingSpecs.js',
     'helpers/defineJasmineUnderTest.js',
     'helpers/resetEnv.js'
   ],
   env: {
-    forbidDuplicateNames: true
+    forbidDuplicateNames: true,
+    safariYieldStrategy: 'time'
   },
   random: true,
   browser: {

spec/support/jasmine.json

@@ -8,7 +8,9 @@
     "helpers/init.js",
     "helpers/domHelpers.js",
     "helpers/integrationMatchers.js",
+    "helpers/callerFilenameShim.js",
     "helpers/overrideConsoleLogForCircleCi.js",
+    "helpers/monkeyPatchingSpecs.js",
     "helpers/nodeDefineJasmineUnderTest.js",
     "helpers/resetEnv.js"
   ],

src/SpecRunner.html.ejs

@@ -8,10 +8,10 @@
   <link rel="stylesheet" href="lib/jasmine-<%= jasmineVersion %>/jasmine.css">
 
   <script src="lib/jasmine-<%= jasmineVersion %>/jasmine.js"></script>
-  <script src="lib/jasmine-<%= jasmineVersion %>/jasmine-html.js"></script>
   <script src="lib/jasmine-<%= jasmineVersion %>/boot0.js"></script>
+  <script src="lib/jasmine-<%= jasmineVersion %>/jasmine-html.js"></script>
   <!-- optional: include a file here that configures the Jasmine env -->
-  <script src="lib/jasmine-<%= jasmineVersion %>/boot1.js"></script>
+  <script src="lib/jasmine-<%= jasmineVersion %>/boot.js"></script>
 
   <!-- include source files here... -->
   <script src="src/Player.js"></script>

src/boot/boot.js

@@ -0,0 +1,27 @@
+'use strict';
+
+(function() {
+  const env = jasmine.getEnv();
+  const urls = new jasmine.HtmlReporterV2Urls();
+
+  /**
+   * Configures Jasmine based on the current set of query parameters. This
+   * supports all parameters set by the HTML reporter as well as
+   * spec=partialPath, which filters out specs whose paths don't contain the
+   * parameter.
+   */
+  env.configure(urls.configFromCurrentUrl());
+
+  const currentWindowOnload = window.onload;
+  window.onload = function() {
+    if (currentWindowOnload) {
+      currentWindowOnload();
+    }
+
+    // The HTML reporter needs to be set up here so it can access the DOM. Other
+    // reporters can be added at any time before env.execute() is called.
+    const htmlReporter = new jasmine.HtmlReporterV2({ env, urls });
+    env.addReporter(htmlReporter);
+    env.execute();
+  };
+})();

src/boot/boot0.js

@@ -1,44 +0,0 @@
-'use strict';
-
-/**
- This file starts the process of "booting" Jasmine. It initializes Jasmine,
- makes its globals available, and creates the env. This file should be loaded
- after `jasmine.js` and `jasmine_html.js`, but before `boot1.js` or any project
- source files or spec files are loaded.
- */
-(function() {
-  const jasmineRequire = window.jasmineRequire || require('./jasmine.js');
-
-  /**
-   * ## Require & Instantiate
-   *
-   * Require Jasmine's core files. Specifically, this requires and attaches all of Jasmine's code to the `jasmine` reference.
-   */
-  const jasmine = jasmineRequire.core(jasmineRequire),
-    global = jasmine.getGlobal();
-  global.jasmine = jasmine;
-
-  /**
-   * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference.
-   */
-  jasmineRequire.html(jasmine);
-
-  /**
-   * Create the Jasmine environment. This is used to run all specs in a project.
-   */
-  const env = jasmine.getEnv();
-
-  /**
-   * ## The Global Interface
-   *
-   * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged.
-   */
-  const jasmineInterface = jasmineRequire.interface(jasmine, env);
-
-  /**
-   * Add all of the Jasmine global/public interface to the global scope, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`.
-   */
-  for (const property in jasmineInterface) {
-    global[property] = jasmineInterface[property];
-  }
-})();

src/boot/boot1.js

@@ -1,53 +0,0 @@
-'use strict';
-
-/**
- This file finishes 'booting' Jasmine, performing all of the necessary
- initialization before executing the loaded environment and all of a project's
- specs. This file should be loaded after `boot0.js` but before any project
- source files or spec files are loaded. Thus this file can also be used to
- customize Jasmine for a project.
-
- If a project is using Jasmine via the standalone distribution, this file can
- be customized directly. If you only wish to configure the Jasmine env, you
- can load another file that calls `jasmine.getEnv().configure({...})`
- after `boot0.js` is loaded and before this file is loaded.
- */
-
-(function() {
-  const env = jasmine.getEnv();
-  const urls = new jasmine.HtmlReporterV2Urls();
-
-  /**
-   * ## Reporters
-   * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any).
-   */
-  const htmlReporter = new jasmine.HtmlReporterV2({
-    env,
-    urls,
-    getContainer() {
-      return document.body;
-    }
-  });
-
-  /**
-   * The `jsApiReporter` also receives spec results, and is used by any environment that needs to extract the results  from JavaScript.
-   */
-  env.addReporter(jsApiReporter);
-  env.addReporter(htmlReporter);
-  env.configure(urls.configFromCurrentUrl());
-
-  /**
-   * ## Execution
-   *
-   * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded.
-   */
-  const currentWindowOnload = window.onload;
-
-  window.onload = function() {
-    if (currentWindowOnload) {
-      currentWindowOnload();
-    }
-    htmlReporter.initialize();
-    env.execute();
-  };
-})();

src/boot/jasmine-core.js

@@ -1,69 +1,25 @@
 'use strict';
 
-/**
- * Note: Only available on Node.
- * @module jasmine-core
- */
+const path = require('path');
+const fs = require('fs');
+const {
+  globals,
+  installGlobals,
+  version,
+  private$
+} = require('./jasmine-core/jasmine.js');
 
-const jasmineRequire = require('./jasmine-core/jasmine.js');
-module.exports = jasmineRequire;
-
-const bootWithoutGlobals = (function() {
-  let jasmine, jasmineInterface;
-
-  return function bootWithoutGlobals(reinitialize) {
-    if (!jasmineInterface || reinitialize === true) {
-      jasmine = jasmineRequire.core(jasmineRequire);
-      const env = jasmine.getEnv({ suppressLoadErrors: true });
-      jasmineInterface = jasmineRequire.interface(jasmine, env);
-    }
-
-    return { jasmine, jasmineInterface };
-  };
-})();
-
-/**
- * Boots a copy of Jasmine and returns an object as described in {@link jasmine}.
- * @param {boolean} [reinitialize=true] Whether to create a new copy of Jasmine if one already exists
- * @type {function}
- * @return {jasmine}
- */
-module.exports.boot = function(reinitialize) {
-  if (reinitialize === undefined) {
-    reinitialize = true;
-  }
-
-  const { jasmine, jasmineInterface } = bootWithoutGlobals(reinitialize);
-
-  for (const k in jasmineInterface) {
-    global[k] = jasmineInterface[k];
-  }
-
-  return jasmine;
-};
-
-/**
- * Boots a copy of Jasmine and returns an object containing the properties
- * that would normally be added to the global object. If noGlobals is called
- * multiple times, the same object is returned every time.
- *
- * @example
- * const {describe, beforeEach, it, expect, jasmine} = require('jasmine-core').noGlobals();
- */
-module.exports.noGlobals = function() {
-  const { jasmineInterface } = bootWithoutGlobals(false);
-  return jasmineInterface;
-};
-
-const path = require('path'),
-  fs = require('fs');
+function reset() {
+  private$.currentEnv_ = null;
+  const env = jasmine.getEnv({ suppressLoadErrors: true });
+  rebindInterface(env);
+}
 
 const rootPath = path.join(__dirname, 'jasmine-core'),
-  bootFiles = ['boot0.js', 'boot1.js'],
-  legacyBootFiles = ['boot.js'],
+  bootFiles = ['boot.js'],
   cssFiles = [],
   jsFiles = [],
-  jsFilesToSkip = ['jasmine.js'].concat(bootFiles, legacyBootFiles);
+  jsFilesToSkip = ['jasmine.js'].concat(bootFiles);
 
 fs.readdirSync(rootPath).forEach(function(file) {
   if (fs.statSync(path.join(rootPath, file)).isFile()) {
@@ -80,12 +36,40 @@ fs.readdirSync(rootPath).forEach(function(file) {
   }
 });
 
-module.exports.files = {
-  self: __filename,
-  path: rootPath,
-  bootDir: rootPath,
-  bootFiles: bootFiles,
-  cssFiles: cssFiles,
-  jsFiles: ['jasmine.js'].concat(jsFiles),
-  imagesDir: path.join(__dirname, '../images')
+/**
+ * Note: Only available on Node.
+ *
+ * In addition to the members documented here, this module's exports include all
+ * {@link globals}.
+ * @module jasmine-core
+ */
+module.exports = {
+  ...globals,
+  /**
+   * Copies Jasmine globals (jasmine, describe, it, etc) to the specified
+   * object or to globalThis.
+   * @function
+   * @param {object} [dest] - The object to copy globals to.
+   */
+  installGlobals,
+  /**
+   * Returns the jasmine-core version.
+   * @function
+   */
+  version,
+  /**
+   * Resets all of jasmine-core's state, including removing specs, suites, and
+   * reporters, and resetting configuration to the default.
+   * @function
+   */
+  reset,
+  files: {
+    self: __filename,
+    path: rootPath,
+    bootDir: rootPath,
+    bootFiles: bootFiles,
+    cssFiles: cssFiles,
+    jsFiles: ['jasmine.js'].concat(jsFiles),
+    imagesDir: path.join(__dirname, '../images')
+  }
 };

src/core/CallTracker.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().CallTracker = function(j$) {
+getJasmineRequireObj().CallTracker = function(j$, private$) {
   'use strict';
 
   /**
@@ -125,9 +125,7 @@ getJasmineRequireObj().CallTracker = function(j$) {
      * @param {Function} [argsCloner] A function to use to clone the arguments. Defaults to a shallow cloning function.
      * @function
      */
-    this.saveArgumentsByValue = function(
-      argsCloner = j$.private.util.cloneArgs
-    ) {
+    this.saveArgumentsByValue = function(argsCloner = private$.util.cloneArgs) {
       opts.cloneArgs = true;
       opts.argsCloner = argsCloner;
     };

src/core/Clock.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().Clock = function() {
+getJasmineRequireObj().Clock = function(j$, private$) {
   'use strict';
 
   /* global process */
@@ -191,6 +191,9 @@ callbacks to execute _before_ running the next one.
     clearTimeout[IsMockClockTimingFn] = true;
     setInterval[IsMockClockTimingFn] = true;
     clearInterval[IsMockClockTimingFn] = true;
+
+    Object.freeze(this);
+
     return this;
 
     // Advances the Clock's time until the mode changes.
@@ -344,5 +347,7 @@ callbacks to execute _before_ running the next one.
   };
 
   Clock.IsMockClockTimingFn = IsMockClockTimingFn;
+  Object.freeze(Clock);
+  Object.freeze(Clock.prototype);
   return Clock;
 };

src/core/CompleteOnFirstErrorSkipPolicy.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().CompleteOnFirstErrorSkipPolicy = function(j$) {
+getJasmineRequireObj().CompleteOnFirstErrorSkipPolicy = function(j$, private$) {
   'use strict';
 
   function CompleteOnFirstErrorSkipPolicy(queueableFns) {

src/core/Configuration.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().Configuration = function(j$) {
+getJasmineRequireObj().Configuration = function(j$, private$) {
   'use strict';
 
   /**
@@ -128,7 +128,45 @@ getJasmineRequireObj().Configuration = function(j$) {
      * @type Boolean
      * @default false
      */
-    detectLateRejectionHandling: false
+    detectLateRejectionHandling: false,
+
+    /**
+     * The number of extra stack frames inserted by a wrapper around {@link it}
+     * or by some other local modification. Jasmine uses this to determine the
+     * filename for {@link SpecStartedEvent} and {@link SpecDoneEvent}.
+     * @name Configuration#extraItStackFrames
+     * @since 5.13.0
+     * @type number
+     * @default 0
+     */
+    extraItStackFrames: 0,
+
+    /**
+     * The number of extra stack frames inserted by a wrapper around
+     * {@link describe} or by some other local modification. Jasmine uses this
+     * to determine the filename for {@link SpecStartedEvent} and
+     * {@link SpecDoneEvent}.
+     * @name Configuration#extraDescribeStackFrames
+     * @since 5.13.0
+     * @type number
+     * @default 0
+     */
+    extraDescribeStackFrames: 0,
+
+    /**
+     * The strategy to use in Safari and similar browsers to determine how often
+     * to yield control by calling setTimeout. If set to "count", the default,
+     * the frequency of setTimeout calls is based on the number of relevant
+     * function calls. If set to "time", the frequency of setTimeout calls is
+     * based on elapsed time. Using "time" may provide a significant performance
+     * improvement, but as of 6.0 it hasn't been tested with a wide variety of
+     * workloads and should be considered experimental.
+     * @name Configuration#safariYieldStrategy
+     * @since 6.0.0
+     * @type 'count' | 'time'
+     * @default 'count'
+     */
+    safariYieldStrategy: 'count'
   };
   Object.freeze(defaultConfig);
 
@@ -179,6 +217,28 @@ getJasmineRequireObj().Configuration = function(j$) {
       if (typeof changes.seed !== 'undefined') {
         this.#values.seed = changes.seed;
       }
+
+      // 0 is a valid value for both of these, so a truthiness check wouldn't work
+      if (typeof changes.extraItStackFrames !== 'undefined') {
+        this.#values.extraItStackFrames = changes.extraItStackFrames;
+      }
+
+      if (typeof changes.extraDescribeStackFrames !== 'undefined') {
+        this.#values.extraDescribeStackFrames =
+          changes.extraDescribeStackFrames;
+      }
+
+      if (typeof changes.safariYieldStrategy !== 'undefined') {
+        const v = changes.safariYieldStrategy;
+
+        if (v === 'count' || v === 'time') {
+          this.#values.safariYieldStrategy = v;
+        } else {
+          throw new Error(
+            "Invalid safariYieldStrategy value. Valid values are 'count' and 'time'."
+          );
+        }
+      }
     }
   }
 

src/core/DelayedFunctionScheduler.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().DelayedFunctionScheduler = function(j$) {
+getJasmineRequireObj().DelayedFunctionScheduler = function(j$, private$) {
   'use strict';
 
   function DelayedFunctionScheduler() {

src/core/Deprecator.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().Deprecator = function(j$) {
+getJasmineRequireObj().Deprecator = function(j$, private$) {
   'use strict';
 
   function Deprecator(topSuite) {
@@ -25,7 +25,7 @@ getJasmineRequireObj().Deprecator = function(j$) {
   ) {
     options = options || {};
 
-    if (!this.verbose_ && !j$.private.isError(deprecation)) {
+    if (!this.verbose_ && !private$.isError(deprecation)) {
       if (this.toSuppress_.indexOf(deprecation) !== -1) {
         return;
       }
@@ -37,7 +37,7 @@ getJasmineRequireObj().Deprecator = function(j$) {
   };
 
   Deprecator.prototype.log_ = function(runnable, deprecation, options) {
-    if (j$.private.isError(deprecation)) {
+    if (private$.isError(deprecation)) {
       // eslint-disable-next-line no-console
       console.error(deprecation);
       return;
@@ -66,7 +66,7 @@ getJasmineRequireObj().Deprecator = function(j$) {
   };
 
   Deprecator.prototype.stackTrace_ = function() {
-    const formatter = new j$.private.ExceptionFormatter();
+    const formatter = new private$.ExceptionFormatter();
     return formatter.stack(new Error()).replace(/^Error\n/m, '');
   };
 
@@ -75,7 +75,7 @@ getJasmineRequireObj().Deprecator = function(j$) {
       runnable = this.topSuite_;
     }
 
-    if (j$.private.isError(deprecation)) {
+    if (private$.isError(deprecation)) {
       runnable.addDeprecationWarning(deprecation);
       return;
     }

src/core/Env.js

@@ -1,6 +1,8 @@
-getJasmineRequireObj().Env = function(j$) {
+getJasmineRequireObj().Env = function(j$, private$) {
   'use strict';
 
+  const DEFAULT_IT_DESCRIBE_STACK_DEPTH = 3;
+
   /**
    * @class Env
    * @since 2.0.0
@@ -13,22 +15,22 @@ getJasmineRequireObj().Env = function(j$) {
     envOptions = envOptions || {};
 
     const self = this;
-    const GlobalErrors = envOptions.GlobalErrors || j$.private.GlobalErrors;
+    const GlobalErrors = envOptions.GlobalErrors || private$.GlobalErrors;
     const global = envOptions.global || j$.getGlobal();
 
     const realSetTimeout = global.setTimeout;
     const realClearTimeout = global.clearTimeout;
-    const clearStack = j$.private.getClearStack(global);
-    this.clock = new j$.private.Clock(
+    const stackClearer = private$.getStackClearer(global);
+    this.clock = new private$.Clock(
       global,
       function() {
-        return new j$.private.DelayedFunctionScheduler();
+        return new private$.DelayedFunctionScheduler();
       },
-      new j$.private.MockDate(global)
+      new private$.MockDate(global)
     );
 
     const globalErrors = new GlobalErrors(
-      undefined,
+      global,
       // Configuration is late-bound because GlobalErrors needs to be constructed
       // before it's set to detect load-time errors in browsers
       () => this.configuration()
@@ -52,7 +54,7 @@ getJasmineRequireObj().Env = function(j$) {
       };
     })();
 
-    const runableResources = new j$.private.RunableResources({
+    const runableResources = new private$.RunableResources({
       getCurrentRunableId: function() {
         const r = runner.currentRunable();
         return r ? r.id : null;
@@ -65,7 +67,7 @@ getJasmineRequireObj().Env = function(j$) {
     let runner;
     let parallelLoadingState = null; // 'specs', 'helpers', or null for non-parallel
 
-    const config = new j$.private.Configuration();
+    const config = new private$.Configuration();
 
     if (!envOptions.suppressLoadErrors) {
       installGlobalErrors();
@@ -97,6 +99,7 @@ getJasmineRequireObj().Env = function(j$) {
 
       config.update(changes);
       deprecator.verboseDeprecations(config.verboseDeprecations);
+      stackClearer.setSafariYieldStrategy(config.safariYieldStrategy);
     };
 
     /**
@@ -134,11 +137,11 @@ getJasmineRequireObj().Env = function(j$) {
       runableResources.customObjectFormatters().push(formatter);
     };
 
-    j$.private.Expectation.addCoreMatchers(j$.private.matchers);
-    j$.private.Expectation.addAsyncCoreMatchers(j$.private.asyncMatchers);
+    private$.Expectation.addCoreMatchers(private$.matchers);
+    private$.Expectation.addAsyncCoreMatchers(private$.asyncMatchers);
 
     const expectationFactory = function(actual, spec) {
-      return j$.private.Expectation.factory({
+      return private$.Expectation.factory({
         matchersUtil: runableResources.makeMatchersUtil(),
         customMatchers: runableResources.customMatchers(),
         actual: actual,
@@ -171,7 +174,7 @@ getJasmineRequireObj().Env = function(j$) {
     };
 
     const throwUnlessFactory = function(actual, spec) {
-      return j$.private.Expectation.factory({
+      return private$.Expectation.factory({
         matchersUtil: runableResources.makeMatchersUtil(),
         customMatchers: runableResources.customMatchers(),
         actual: actual,
@@ -180,7 +183,7 @@ getJasmineRequireObj().Env = function(j$) {
     };
 
     const throwUnlessAsyncFactory = function(actual, spec) {
-      return j$.private.Expectation.asyncFactory({
+      return private$.Expectation.asyncFactory({
         matchersUtil: runableResources.makeMatchersUtil(),
         customAsyncMatchers: runableResources.customAsyncMatchers(),
         actual: actual,
@@ -195,7 +198,7 @@ getJasmineRequireObj().Env = function(j$) {
         error.matcherName !== undefined && error.passed !== undefined;
       const result = isExpectationResult
         ? error
-        : j$.private.buildExpectationResult({
+        : private$.buildExpectationResult({
             error,
             passed: false,
             matcherName: '',
@@ -256,7 +259,7 @@ getJasmineRequireObj().Env = function(j$) {
     }
 
     const asyncExpectationFactory = function(actual, spec, runableType) {
-      return j$.private.Expectation.asyncFactory({
+      return private$.Expectation.asyncFactory({
         matchersUtil: runableResources.makeMatchersUtil(),
         customAsyncMatchers: runableResources.customAsyncMatchers(),
         actual: actual,
@@ -293,13 +296,16 @@ getJasmineRequireObj().Env = function(j$) {
      * @param {String|Error} deprecation The deprecation message
      * @param {Object} [options] Optional extra options, as described above
      */
-    this.deprecated = function(deprecation, options) {
-      const runable = runner.currentRunable() || topSuite;
-      deprecator.addDeprecationWarning(runable, deprecation, options);
-    };
+    Object.defineProperty(this, 'deprecated', {
+      enumerable: true,
+      value: function(deprecation, options) {
+        const runable = runner.currentRunable() || topSuite;
+        deprecator.addDeprecationWarning(runable, deprecation, options);
+      }
+    });
 
     function runQueue(options) {
-      options.clearStack = options.clearStack || clearStack;
+      options.clearStack = options.clearStack || stackClearer;
       options.timeout = {
         setTimeout: realSetTimeout,
         clearTimeout: realClearTimeout
@@ -312,10 +318,10 @@ getJasmineRequireObj().Env = function(j$) {
           (runner.currentRunable() || topSuite).handleException(e);
         };
 
-      new j$.private.QueueRunner(options).execute();
+      new private$.QueueRunner(options).execute();
     }
 
-    const suiteBuilder = new j$.private.SuiteBuilder({
+    const suiteBuilder = new private$.SuiteBuilder({
       env: this,
       expectationFactory,
       asyncExpectationFactory,
@@ -323,7 +329,8 @@ getJasmineRequireObj().Env = function(j$) {
       runQueue
     });
     topSuite = suiteBuilder.topSuite;
-    const deprecator = new j$.private.Deprecator(topSuite);
+    const deprecator =
+      envOptions?.deprecator ?? new private$.Deprecator(topSuite);
 
     /**
      * Provides the root suite, through which all suites and specs can be
@@ -343,23 +350,23 @@ getJasmineRequireObj().Env = function(j$) {
      * @interface Reporter
      * @see custom_reporter
      */
-    reportDispatcher = new j$.private.ReportDispatcher(
-      j$.private.reporterEvents,
+    reportDispatcher = new private$.ReportDispatcher(
+      private$.reporterEvents,
       function(options) {
-        options.SkipPolicy = j$.private.NeverSkipPolicy;
+        options.SkipPolicy = private$.NeverSkipPolicy;
         return runQueue(options);
       },
       recordLateError
     );
 
-    runner = new j$.private.Runner({
+    runner = new private$.Runner({
       topSuite,
       totalSpecsDefined: () => suiteBuilder.totalSpecsDefined,
       focusedRunables: () => suiteBuilder.focusedRunables,
       runableResources,
       reportDispatcher,
       runQueue,
-      TreeProcessor: j$.private.TreeProcessor,
+      TreeProcessor: private$.TreeProcessor,
       globalErrors,
       getConfig: () => config
     });
@@ -404,7 +411,7 @@ getJasmineRequireObj().Env = function(j$) {
 
       // Karma incorrectly loads jasmine-core as an ES module. It isn't one,
       // and we don't test that configuration. Warn about it.
-      if (j$.private.loadedAsBrowserEsm) {
+      if (private$.loadedAsBrowserEsm) {
         this.deprecated(
           "jasmine-core isn't an ES module but it was loaded as one. This is not a supported configuration."
         );
@@ -533,7 +540,7 @@ getJasmineRequireObj().Env = function(j$) {
       try {
         const maybePromise = fn(spy);
 
-        if (!j$.private.isPromiseLike(maybePromise)) {
+        if (!private$.isPromiseLike(maybePromise)) {
           throw new Error(
             'The callback to spyOnGlobalErrorsAsync must be an async or promise-returning function'
           );
@@ -591,14 +598,14 @@ getJasmineRequireObj().Env = function(j$) {
 
     this.describe = function(description, definitionFn) {
       ensureIsNotNested('describe');
-      const filename = callerCallerFilename();
+      const filename = indirectCallerFilename(describeStackDepth());
       return suiteBuilder.describe(description, definitionFn, filename)
         .metadata;
     };
 
     this.xdescribe = function(description, definitionFn) {
       ensureIsNotNested('xdescribe');
-      const filename = callerCallerFilename();
+      const filename = indirectCallerFilename(describeStackDepth());
       return suiteBuilder.xdescribe(description, definitionFn, filename)
         .metadata;
     };
@@ -606,30 +613,38 @@ getJasmineRequireObj().Env = function(j$) {
     this.fdescribe = function(description, definitionFn) {
       ensureIsNotNested('fdescribe');
       ensureNonParallel('fdescribe');
-      const filename = callerCallerFilename();
+      const filename = indirectCallerFilename(describeStackDepth());
       return suiteBuilder.fdescribe(description, definitionFn, filename)
         .metadata;
     };
 
     this.it = function(description, fn, timeout) {
       ensureIsNotNested('it');
-      const filename = callerCallerFilename();
+      const filename = indirectCallerFilename(itStackDepth());
       return suiteBuilder.it(description, fn, timeout, filename).metadata;
     };
 
     this.xit = function(description, fn, timeout) {
       ensureIsNotNested('xit');
-      const filename = callerCallerFilename();
+      const filename = indirectCallerFilename(itStackDepth());
       return suiteBuilder.xit(description, fn, timeout, filename).metadata;
     };
 
     this.fit = function(description, fn, timeout) {
       ensureIsNotNested('fit');
       ensureNonParallel('fit');
-      const filename = callerCallerFilename();
+      const filename = indirectCallerFilename(itStackDepth());
       return suiteBuilder.fit(description, fn, timeout, filename).metadata;
     };
 
+    function itStackDepth() {
+      return DEFAULT_IT_DESCRIBE_STACK_DEPTH + config.extraItStackFrames;
+    }
+
+    function describeStackDepth() {
+      return DEFAULT_IT_DESCRIBE_STACK_DEPTH + config.extraDescribeStackFrames;
+    }
+
     /**
      * Get a user-defined property as part of the properties field of {@link SpecDoneEvent}
      * @name Env#getSpecProperty
@@ -768,7 +783,7 @@ getJasmineRequireObj().Env = function(j$) {
     };
 
     this.pending = function(message) {
-      let fullMessage = j$.private.Spec.pendingSpecExceptionMessage;
+      let fullMessage = private$.Spec.pendingSpecExceptionMessage;
       if (message) {
         fullMessage += message;
       }
@@ -787,7 +802,7 @@ getJasmineRequireObj().Env = function(j$) {
         message += ': ';
         if (error.message) {
           message += error.message;
-        } else if (j$.private.isString(error)) {
+        } else if (private$.isString(error)) {
           message += error;
         } else {
           // pretty print all kind of objects. This includes arrays.
@@ -810,17 +825,29 @@ getJasmineRequireObj().Env = function(j$) {
       }
     };
 
+    this.pp = function(value) {
+      const pp = runner.currentRunable()
+        ? runableResources.makePrettyPrinter()
+        : private$.basicPrettyPrinter;
+      return pp(value);
+    };
+
     this.cleanup_ = function() {
       uninstallGlobalErrors();
     };
+
+    Object.freeze(this);
   }
 
-  function callerCallerFilename() {
-    const frames = new j$.private.StackTrace(new Error()).frames;
-    // frames[3] should always exist except in Jasmine's own tests, which bypass
-    // the global it/describe layer, but don't crash if it doesn't.
-    return frames[3] && frames[3].file;
+  function indirectCallerFilename(depth) {
+    const frames = new private$.StackTrace(new Error()).frames;
+    // The specified frame should always exist except in Jasmine's own tests,
+    // which bypass the global it/describe layer, but could be absent in case
+    // of misconfiguration. Don't crash if it's absent.
+    return frames[depth] && frames[depth].file;
   }
 
+  Object.freeze(Env);
+  Object.freeze(Env.prototype);
   return Env;
 };

src/core/ExceptionFormatter.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().ExceptionFormatter = function(j$) {
+getJasmineRequireObj().ExceptionFormatter = function(j$, private$) {
   'use strict';
 
   const ignoredProperties = [
@@ -11,12 +11,13 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
     'lineNumber',
     'column',
     'description',
-    'jasmineMessage'
+    'jasmineMessage',
+    'errors'
   ];
 
   function ExceptionFormatter(options) {
     const jasmineFile =
-      (options && options.jasmineFile) || j$.private.util.jasmineFile();
+      (options && options.jasmineFile) || private$.util.jasmineFile();
     this.message = function(error) {
       let message = '';
 
@@ -60,7 +61,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
         lines.pop();
       }
 
-      const stackTrace = new j$.private.StackTrace(error);
+      const stackTrace = new private$.StackTrace(error);
       lines = lines.concat(filterJasmine(stackTrace));
 
       if (messageHandling === 'require') {
@@ -77,6 +78,19 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
         lines = lines.concat(substack);
       }
 
+      if (Array.isArray(error.errors)) {
+        for (let i = 0; i < error.errors.length; i++) {
+          if (error.errors[i] instanceof Error) {
+            lines.push('');
+            const substack = this.stack_(error.errors[i], {
+              messageHandling: 'require'
+            });
+            substack[0] = 'Error ' + (i + 1) + ': ' + substack[0];
+            lines = lines.concat(substack.map(x => '   ' + x));
+          }
+        }
+      }
+
       return lines;
     };
 
@@ -114,7 +128,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
 
       if (!empty) {
         return (
-          'error properties: ' + j$.private.basicPrettyPrinter(result) + '\n'
+          'error properties: ' + private$.basicPrettyPrinter(result) + '\n'
         );
       }
 

src/core/Expectation.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().Expectation = function(j$) {
+getJasmineRequireObj().Expectation = function(j$, private$) {
   'use strict';
 
   /**
@@ -6,7 +6,7 @@ getJasmineRequireObj().Expectation = function(j$) {
    * @namespace matchers
    */
   function Expectation(options) {
-    this.expector = new j$.private.Expector(options);
+    this.expector = new private$.Expector(options);
 
     const customMatchers = options.customMatchers || {};
     for (const matcherName in customMatchers) {
@@ -82,7 +82,7 @@ getJasmineRequireObj().Expectation = function(j$) {
    * @namespace async-matchers
    */
   function AsyncExpectation(options) {
-    this.expector = new j$.private.Expector(options);
+    this.expector = new private$.Expector(options);
 
     const customAsyncMatchers = options.customAsyncMatchers || {};
     for (const matcherName in customAsyncMatchers) {
@@ -175,7 +175,7 @@ getJasmineRequireObj().Expectation = function(j$) {
 
   function negatedFailureMessage(result, matcherName, args, matchersUtil) {
     if (result.message) {
-      if (j$.private.isFunction(result.message)) {
+      if (private$.isFunction(result.message)) {
         return result.message();
       } else {
         return result.message;
@@ -220,7 +220,7 @@ getJasmineRequireObj().Expectation = function(j$) {
       return function(actual) {
         const matcherArgs = arguments;
 
-        return j$.private.isPending(actual).then(function(isPending) {
+        return private$.isPending(actual).then(function(isPending) {
           if (isPending) {
             return {
               pass: false,

src/core/Expector.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().Expector = function(j$) {
+getJasmineRequireObj().Expector = function(j$, private$) {
   'use strict';
 
   function Expector(options) {
@@ -7,7 +7,7 @@ getJasmineRequireObj().Expector = function(j$) {
     };
     this.actual = options.actual;
     this.addExpectationResult = options.addExpectationResult || function() {};
-    this.filters = new j$.private.ExpectationFilterChain();
+    this.filters = new private$.ExpectationFilterChain();
   }
 
   Expector.prototype.instantiateMatcher = function(
@@ -41,7 +41,7 @@ getJasmineRequireObj().Expector = function(j$) {
           this.matchersUtil,
           args
         );
-      } else if (j$.private.isFunction(result.message)) {
+      } else if (private$.isFunction(result.message)) {
         return result.message();
       } else {
         return result.message;

src/core/GlobalErrors.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().GlobalErrors = function(j$) {
+getJasmineRequireObj().GlobalErrors = function(j$, private$) {
   'use strict';
 
   class GlobalErrors {
@@ -26,7 +26,7 @@ getJasmineRequireObj().GlobalErrors = function(j$) {
       if (
         global.process &&
         global.process.listeners &&
-        j$.private.isFunction(global.process.on)
+        private$.isFunction(global.process.on)
       ) {
         this.#adapter = new NodeAdapter(global, dispatch);
       } else {
@@ -183,7 +183,7 @@ getJasmineRequireObj().GlobalErrors = function(j$) {
       const jasmineMessage = 'Unhandled promise rejection: ' + event.reason;
       let reason;
 
-      if (j$.private.isError(event.reason)) {
+      if (private$.isError(event.reason)) {
         reason = event.reason;
         reason.jasmineMessage = jasmineMessage;
       } else {
@@ -262,7 +262,7 @@ getJasmineRequireObj().GlobalErrors = function(j$) {
         jasmineMessagePrefix = 'Uncaught exception';
       }
 
-      if (j$.private.isError(error)) {
+      if (private$.isError(error)) {
         error.jasmineMessage = jasmineMessagePrefix + ': ' + error;
         return error;
       } else {

src/core/JsApiReporter.js

@@ -1,131 +0,0 @@
-getJasmineRequireObj().JsApiReporter = function(j$) {
-  'use strict';
-
-  /**
-   * @name jsApiReporter
-   * @classdesc {@link Reporter} added by default in `boot.js` to record results for retrieval in javascript code. An instance is made available as `jsApiReporter` on the global object.
-   * @class
-   * @hideconstructor
-   */
-  function JsApiReporter(options) {
-    const timer = options.timer || new j$.Timer();
-    let status = 'loaded';
-
-    this.started = false;
-    this.finished = false;
-    this.runDetails = {};
-
-    this.jasmineStarted = function() {
-      this.started = true;
-      status = 'started';
-      timer.start();
-    };
-
-    let executionTime;
-
-    this.jasmineDone = function(runDetails) {
-      this.finished = true;
-      this.runDetails = runDetails;
-      executionTime = timer.elapsed();
-      status = 'done';
-    };
-
-    /**
-     * Get the current status for the Jasmine environment.
-     * @name jsApiReporter#status
-     * @since 2.0.0
-     * @function
-     * @return {String} - One of `loaded`, `started`, or `done`
-     */
-    this.status = function() {
-      return status;
-    };
-
-    const suites = [],
-      suites_hash = {};
-
-    this.suiteStarted = function(result) {
-      suites_hash[result.id] = result;
-    };
-
-    this.suiteDone = function(result) {
-      storeSuite(result);
-    };
-
-    /**
-     * Get the results for a set of suites.
-     *
-     * Retrievable in slices for easier serialization.
-     * @name jsApiReporter#suiteResults
-     * @since 2.1.0
-     * @function
-     * @param {Number} index - The position in the suites list to start from.
-     * @param {Number} length - Maximum number of suite results to return.
-     * @return {SuiteResult[]}
-     */
-    this.suiteResults = function(index, length) {
-      return suites.slice(index, index + length);
-    };
-
-    function storeSuite(result) {
-      suites.push(result);
-      suites_hash[result.id] = result;
-    }
-
-    /**
-     * Get all of the suites in a single object, with their `id` as the key.
-     * @name jsApiReporter#suites
-     * @since 2.0.0
-     * @function
-     * @return {Object} - Map of suite id to {@link SuiteResult}
-     */
-    this.suites = function() {
-      return suites_hash;
-    };
-
-    const specs = [];
-
-    this.specDone = function(result) {
-      specs.push(result);
-    };
-
-    /**
-     * Get the results for a set of specs.
-     *
-     * Retrievable in slices for easier serialization.
-     * @name jsApiReporter#specResults
-     * @since 2.0.0
-     * @function
-     * @param {Number} index - The position in the specs list to start from.
-     * @param {Number} length - Maximum number of specs results to return.
-     * @return {SpecDoneEvent[]}
-     */
-    this.specResults = function(index, length) {
-      return specs.slice(index, index + length);
-    };
-
-    /**
-     * Get all spec results.
-     * @name jsApiReporter#specs
-     * @since 2.0.0
-     * @function
-     * @return {SpecDoneEvent[]}
-     */
-    this.specs = function() {
-      return specs;
-    };
-
-    /**
-     * Get the number of milliseconds it took for the full Jasmine suite to run.
-     * @name jsApiReporter#executionTime
-     * @since 2.0.0
-     * @function
-     * @return {Number}
-     */
-    this.executionTime = function() {
-      return executionTime;
-    };
-  }
-
-  return JsApiReporter;
-};

src/core/MockDate.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().MockDate = function(j$) {
+getJasmineRequireObj().MockDate = function(j$, private$) {
   'use strict';
 
   function MockDate(global) {

src/core/NeverSkipPolicy.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().NeverSkipPolicy = function(j$) {
+getJasmineRequireObj().NeverSkipPolicy = function(j$, private$) {
   'use strict';
 
   function NeverSkipPolicy(queueableFns) {}

src/core/ParallelReportDispatcher.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().ParallelReportDispatcher = function(j$) {
+getJasmineRequireObj().ParallelReportDispatcher = function(j$, private$) {
   'use strict';
 
   /**
@@ -15,43 +15,43 @@ getJasmineRequireObj().ParallelReportDispatcher = function(j$) {
    * Jasmine specs run in. Doing so will break Jasmine's error handling.
    * @param onError {function} Function called when an unhandled exception, unhandled promise rejection, or explicit reporter failure occurs
    */
-  function ParallelReportDispatcher(onError, deps = {}) {
-    const ReportDispatcher =
-      deps.ReportDispatcher || j$.private.ReportDispatcher;
-    const QueueRunner = deps.QueueRunner || j$.private.QueueRunner;
-    const globalErrors = deps.globalErrors || new j$.private.GlobalErrors();
-    const dispatcher = new ReportDispatcher(
-      j$.private.reporterEvents,
-      function(queueRunnerOptions) {
-        queueRunnerOptions = {
-          ...queueRunnerOptions,
-          globalErrors,
-          timeout: { setTimeout, clearTimeout },
-          fail: function(error) {
-            // A callback-style async reporter called either done.fail()
-            // or done(anError).
-            if (!error) {
-              error = new Error('A reporter called done.fail()');
+  class ParallelReportDispatcher {
+    constructor(onError, deps = {}) {
+      const ReportDispatcher =
+        deps.ReportDispatcher || private$.ReportDispatcher;
+      const QueueRunner = deps.QueueRunner || private$.QueueRunner;
+      const globalErrors = deps.globalErrors || new private$.GlobalErrors();
+      const dispatcher = new ReportDispatcher(
+        private$.reporterEvents,
+        function(queueRunnerOptions) {
+          queueRunnerOptions = {
+            ...queueRunnerOptions,
+            globalErrors,
+            timeout: { setTimeout, clearTimeout },
+            fail: function(error) {
+              // A callback-style async reporter called either done.fail()
+              // or done(anError).
+              if (!error) {
+                error = new Error('A reporter called done.fail()');
+              }
+
+              onError(error);
+            },
+            onException: function(error) {
+              // A reporter method threw an exception or returned a rejected
+              // promise, or there was an unhandled exception or unhandled promise
+              // rejection while an asynchronous reporter method was running.
+              onError(error);
             }
+          };
+          new QueueRunner(queueRunnerOptions).execute();
+        },
+        function(error) {
+          // A reporter called done() more than once.
+          onError(error);
+        }
+      );
 
-            onError(error);
-          },
-          onException: function(error) {
-            // A reporter method threw an exception or returned a rejected
-            // promise, or there was an unhandled exception or unhandled promise
-            // rejection while an asynchronous reporter method was running.
-            onError(error);
-          }
-        };
-        new QueueRunner(queueRunnerOptions).execute();
-      },
-      function(error) {
-        // A reporter called done() more than once.
-        onError(error);
-      }
-    );
-
-    const self = {
       /**
        * Adds a reporter to the list of reporters that events will be dispatched to.
        * @function
@@ -59,13 +59,13 @@ getJasmineRequireObj().ParallelReportDispatcher = function(j$) {
        * @param {Reporter} reporterToAdd The reporter to be added.
        * @see custom_reporter
        */
-      addReporter: dispatcher.addReporter.bind(dispatcher),
+      this.addReporter = dispatcher.addReporter.bind(dispatcher);
       /**
        * Clears all registered reporters.
        * @function
        * @name ParallelReportDispatcher#clearReporters
        */
-      clearReporters: dispatcher.clearReporters.bind(dispatcher),
+      this.clearReporters = dispatcher.clearReporters.bind(dispatcher);
       /**
        * Installs a global error handler. After this method is called, any
        * unhandled exceptions or unhandled promise rejections will be passed to
@@ -73,24 +73,25 @@ getJasmineRequireObj().ParallelReportDispatcher = function(j$) {
        * @function
        * @name ParallelReportDispatcher#installGlobalErrors
        */
-      installGlobalErrors: globalErrors.install.bind(globalErrors),
+      this.installGlobalErrors = globalErrors.install.bind(globalErrors);
       /**
        * Uninstalls the global error handler.
        * @function
        * @name ParallelReportDispatcher#uninstallGlobalErrors
        */
-      uninstallGlobalErrors: function() {
+      this.uninstallGlobalErrors = function() {
         // late-bind uninstall because it doesn't exist until install is called
         globalErrors.uninstall(globalErrors);
+      };
+
+      for (const eventName of private$.reporterEvents) {
+        this[eventName] = dispatcher[eventName].bind(dispatcher);
       }
-    };
 
-    for (const eventName of j$.private.reporterEvents) {
-      self[eventName] = dispatcher[eventName].bind(dispatcher);
+      Object.freeze(this);
     }
-
-    return self;
   }
 
+  Object.freeze(ParallelReportDispatcher.prototype);
   return ParallelReportDispatcher;
 };

src/core/PrettyPrinter.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().makePrettyPrinter = function(j$) {
+getJasmineRequireObj().makePrettyPrinter = function(j$, private$) {
   'use strict';
 
   class SinglePrettyPrintRun {
@@ -28,7 +28,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) {
           this.emitScalar('<global>');
         } else if (value.jasmineToString) {
           this.emitScalar(value.jasmineToString(this.pp_));
-        } else if (j$.private.isString(value)) {
+        } else if (private$.isString(value)) {
           this.emitString(value);
         } else if (j$.isSpy(value)) {
           this.emitScalar('spy on ' + value.and.identity);
@@ -42,7 +42,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) {
           } else {
             this.emitScalar('Function');
           }
-        } else if (j$.private.isDomNode(value)) {
+        } else if (private$.isDomNode(value)) {
           if (value.tagName) {
             this.emitDomElement(value);
           } else {
@@ -50,16 +50,16 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) {
           }
         } else if (value instanceof Date) {
           this.emitScalar('Date(' + value + ')');
-        } else if (j$.private.isSet(value)) {
+        } else if (private$.isSet(value)) {
           this.emitSet(value);
-        } else if (j$.private.isMap(value)) {
+        } else if (private$.isMap(value)) {
           this.emitMap(value);
-        } else if (j$.private.isTypedArray(value)) {
+        } else if (private$.isTypedArray(value)) {
           this.emitTypedArray(value);
         } else if (
           value.toString &&
           typeof value === 'object' &&
-          !j$.private.isArray(value) &&
+          !Array.isArray(value) &&
           hasCustomToString(value)
         ) {
           try {
@@ -71,15 +71,12 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) {
         } else if (this.seen.includes(value)) {
           this.emitScalar(
             '<circular reference: ' +
-              (j$.private.isArray(value) ? 'Array' : 'Object') +
+              (Array.isArray(value) ? 'Array' : 'Object') +
               '>'
           );
-        } else if (
-          j$.private.isArray(value) ||
-          j$.private.isA('Object', value)
-        ) {
+        } else if (Array.isArray(value) || private$.isA('Object', value)) {
           this.seen.push(value);
-          if (j$.private.isArray(value)) {
+          if (Array.isArray(value)) {
             this.emitArray(value);
           } else {
             this.emitObject(value);
@@ -102,10 +99,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) {
     }
 
     iterateObject(obj, fn) {
-      const objKeys = j$.private.MatchersUtil.keys(
-        obj,
-        j$.private.isArray(obj)
-      );
+      const objKeys = private$.MatchersUtil.keys(obj, Array.isArray(obj));
       const length = Math.min(objKeys.length, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH);
 
       for (let i = 0; i < length; i++) {
@@ -214,7 +208,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) {
       const ctor = obj.constructor;
       const constructorName =
         typeof ctor === 'function' && obj instanceof ctor
-          ? j$.private.fnNameFor(obj.constructor)
+          ? private$.fnNameFor(obj.constructor)
           : 'null';
 
       this.append(constructorName);
@@ -244,7 +238,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) {
     }
 
     emitTypedArray(arr) {
-      const constructorName = j$.private.fnNameFor(arr.constructor);
+      const constructorName = private$.fnNameFor(arr.constructor);
       const limitedArray = Array.prototype.slice.call(
         arr,
         0,
@@ -313,7 +307,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) {
     // iframe, web worker)
     try {
       return (
-        j$.private.isFunction(value.toString) &&
+        private$.isFunction(value.toString) &&
         value.toString !== Object.prototype.toString &&
         value.toString() !== Object.prototype.toString.call(value)
       );

src/core/QueueRunner.js

@@ -1,11 +1,11 @@
-getJasmineRequireObj().QueueRunner = function(j$) {
+getJasmineRequireObj().QueueRunner = function(j$, private$) {
   'use strict';
 
   let nextid = 1;
 
   function StopExecutionError() {}
   StopExecutionError.prototype = new Error();
-  j$.private.StopExecutionError = StopExecutionError;
+  private$.StopExecutionError = StopExecutionError;
 
   function once(fn, onTwice) {
     let called = false;
@@ -51,14 +51,14 @@ getJasmineRequireObj().QueueRunner = function(j$) {
     }
 
     this.onComplete = attrs.onComplete || emptyFn;
-    this.clearStack =
-      attrs.clearStack ||
-      function(fn) {
+    this.clearStack = attrs.clearStack || {
+      clearStack(fn) {
         fn();
-      };
+      }
+    };
     this.onException = attrs.onException || emptyFn;
     this.onMultipleDone = attrs.onMultipleDone || fallbackOnMultipleDone;
-    this.userContext = attrs.userContext || new j$.private.UserContext();
+    this.userContext = attrs.userContext || new private$.UserContext();
     this.timeout = attrs.timeout || {
       setTimeout: setTimeout,
       clearTimeout: clearTimeout
@@ -69,7 +69,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
       popListener: emptyFn
     };
 
-    const SkipPolicy = attrs.SkipPolicy || j$.private.NeverSkipPolicy;
+    const SkipPolicy = attrs.SkipPolicy || private$.NeverSkipPolicy;
     this.skipPolicy_ = new SkipPolicy(this.queueableFns);
     this.errored_ = false;
 
@@ -192,7 +192,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
       if (queueableFn.fn.length === 0) {
         maybeThenable = queueableFn.fn.call(this.userContext);
 
-        if (maybeThenable && j$.private.isFunction(maybeThenable.then)) {
+        if (maybeThenable && private$.isFunction(maybeThenable.then)) {
           maybeThenable.then(
             wrapInPromiseResolutionHandler(next),
             onPromiseRejection
@@ -235,7 +235,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
       }
     }
 
-    this.clearStack(() => {
+    this.clearStack.clearStack(() => {
       this.globalErrors.popListener(this.handleFinalError);
 
       if (this.errored_) {
@@ -262,11 +262,11 @@ getJasmineRequireObj().QueueRunner = function(j$) {
   };
 
   QueueRunner.prototype.diagnoseConflictingAsync_ = function(fn, retval) {
-    if (retval && j$.private.isFunction(retval.then)) {
+    if (retval && private$.isFunction(retval.then)) {
       // Issue a warning that matches the user's code.
       // Omit the stack trace because there's almost certainly no user code
       // on the stack at this point.
-      if (j$.private.isAsyncFunction(fn)) {
+      if (private$.isAsyncFunction(fn)) {
         this.onException(
           new Error(
             'An asynchronous before/it/after ' +
@@ -290,7 +290,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
 
   function wrapInPromiseResolutionHandler(fn) {
     return function(maybeArg) {
-      if (j$.private.isError(maybeArg)) {
+      if (private$.isError(maybeArg)) {
         fn(maybeArg);
       } else {
         fn();

src/core/ReportDispatcher.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().ReportDispatcher = function(j$) {
+getJasmineRequireObj().ReportDispatcher = function(j$, private$) {
   'use strict';
 
   function ReportDispatcher(methods, runQueue, onLateError) {

src/core/RunableResources.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().RunableResources = function(j$) {
+getJasmineRequireObj().RunableResources = function(j$, private$) {
   'use strict';
 
   class RunableResources {
@@ -7,7 +7,7 @@ getJasmineRequireObj().RunableResources = function(j$) {
       this.getCurrentRunableId_ = options.getCurrentRunableId;
       this.globalErrors_ = options.globalErrors;
 
-      this.spyFactory = new j$.private.SpyFactory(
+      this.spyFactory = new private$.SpyFactory(
         () => {
           if (this.getCurrentRunableId_()) {
             return this.customSpyStrategies();
@@ -19,7 +19,7 @@ getJasmineRequireObj().RunableResources = function(j$) {
         () => this.makeMatchersUtil()
       );
 
-      this.spyRegistry = new j$.private.SpyRegistry({
+      this.spyRegistry = new private$.SpyRegistry({
         currentSpies: () => this.spies(),
         createSpy: (name, originalFn) =>
           this.spyFactory.createSpy(name, originalFn)
@@ -50,7 +50,7 @@ getJasmineRequireObj().RunableResources = function(j$) {
         ];
 
         for (const k of toClone) {
-          newRes[k] = j$.private.util.clone(parentRes[k]);
+          newRes[k] = private$.util.clone(parentRes[k]);
         }
       }
     }
@@ -128,18 +128,18 @@ getJasmineRequireObj().RunableResources = function(j$) {
     }
 
     makePrettyPrinter() {
-      return j$.private.makePrettyPrinter(this.customObjectFormatters());
+      return private$.makePrettyPrinter(this.customObjectFormatters());
     }
 
     makeMatchersUtil() {
       if (this.getCurrentRunableId_()) {
-        return new j$.private.MatchersUtil({
+        return new private$.MatchersUtil({
           customTesters: this.customEqualityTesters(),
           pp: this.makePrettyPrinter()
         });
       } else {
-        return new j$.private.MatchersUtil({
-          pp: j$.private.basicPrettyPrinter
+        return new private$.MatchersUtil({
+          pp: private$.basicPrettyPrinter
         });
       }
     }

src/core/Runner.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().Runner = function(j$) {
+getJasmineRequireObj().Runner = function(j$, private$) {
   'use strict';
 
   class Runner {
@@ -26,7 +26,7 @@ getJasmineRequireObj().Runner = function(j$) {
       this.#reportDispatcher = options.reportDispatcher;
       this.#getConfig = options.getConfig;
       this.#executedBefore = false;
-      this.#currentRunableTracker = new j$.private.CurrentRunableTracker();
+      this.#currentRunableTracker = new private$.CurrentRunableTracker();
     }
 
     currentSpec() {
@@ -66,9 +66,9 @@ getJasmineRequireObj().Runner = function(j$) {
         }
       }
 
-      const order = new j$.private.Order({
+      const order = new private$.Order({
         random: config.random,
-        seed: j$.private.isNumber(config.seed) ? config.seed + '' : config.seed
+        seed: private$.isNumber(config.seed) ? config.seed + '' : config.seed
       });
 
       const treeProcessor = new this.#TreeProcessor({
@@ -96,7 +96,8 @@ getJasmineRequireObj().Runner = function(j$) {
       /**
        * Information passed to the {@link Reporter#jasmineStarted} event.
        * @typedef JasmineStartedInfo
-       * @property {Int} totalSpecsDefined - The total number of specs defined in this suite. Note that this property is not present when Jasmine is run in parallel mode.
+       * @property {int} totalSpecsDefined - The total number of specs defined in this suite. Note that this property is not present when Jasmine is run in parallel mode.
+       * @property {int} numExcludedSpecs - The number of specs that will be excluded from execution. Note that this property is not present when Jasmine is run in parallel mode.
        * @property {Order} order - Information about the ordering (random or not) of this execution of the suite. Note that this property is not present when Jasmine is run in parallel mode.
        * @property {Boolean} parallel - Whether Jasmine is being run in parallel mode.
        * @since 2.0.0
@@ -105,12 +106,13 @@ getJasmineRequireObj().Runner = function(j$) {
         // In parallel mode, the jasmineStarted event is separately dispatched
         // by jasmine-npm. This event only reaches reporters in non-parallel.
         totalSpecsDefined,
+        numExcludedSpecs: this.#executionTree.numExcludedSpecs(),
         order: orderForReporting(order),
         parallel: false
       });
 
       this.#currentRunableTracker.pushSuite(this.#topSuite);
-      const treeRunner = new j$.private.TreeRunner({
+      const treeRunner = new private$.TreeRunner({
         executionTree: this.#executionTree,
         globalErrors: this.#globalErrors,
         runableResources: this.#runableResources,

src/core/SkipAfterBeforeAllErrorPolicy.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().SkipAfterBeforeAllErrorPolicy = function(j$) {
+getJasmineRequireObj().SkipAfterBeforeAllErrorPolicy = function(j$, private$) {
   'use strict';
 
   function SkipAfterBeforeAllErrorPolicy(queueableFns) {

src/core/Spec.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().Spec = function(j$) {
+getJasmineRequireObj().Spec = function(j$, private$) {
   'use strict';
 
   class Spec {
@@ -46,7 +46,7 @@ getJasmineRequireObj().Spec = function(j$) {
     }
 
     addExpectationResult(passed, data, isError) {
-      const expectationResult = j$.private.buildExpectationResult(data);
+      const expectationResult = private$.buildExpectationResult(data);
 
       if (passed) {
         this.#executionState.passedExpectations.push(expectationResult);
@@ -58,7 +58,7 @@ getJasmineRequireObj().Spec = function(j$) {
         }
 
         if (this.#throwOnExpectationFailure && !isError) {
-          throw new j$.private.errors.ExpectationFailed();
+          throw new private$.errors.ExpectationFailed();
         }
       }
     }
@@ -72,8 +72,11 @@ getJasmineRequireObj().Spec = function(j$) {
       // Key and value will eventually be cloned during reporting. The error
       // thrown at that point if they aren't cloneable isn't very helpful.
       // Throw a better one now.
-      j$.private.util.assertReporterCloneable(key, 'Key');
-      j$.private.util.assertReporterCloneable(value, 'Value');
+      if (!private$.isString(key)) {
+        throw new Error('Key must be a string');
+      }
+      private$.util.assertReporterCloneable(value, 'Value');
+
       this.#executionState.properties = this.#executionState.properties || {};
       this.#executionState.properties[key] = value;
     }
@@ -153,17 +156,16 @@ getJasmineRequireObj().Spec = function(j$) {
        * @property {String} description - The description passed to the {@link it} that created this spec.
        * @property {String} fullName - The full description including all ancestors of this spec.
        * @property {String|null} parentSuiteId - The ID of the suite containing this spec, or null if this spec is not in a describe().
-       * @property {String} filename - Deprecated. The name of the file the spec was defined in.
+       * @property {String} filename - The name of the file the spec was defined in.
        * Note: The value may be incorrect if zone.js is installed or
        * `it`/`fit`/`xit` have been replaced with versions that don't maintain the
-       *  same call stack height as the originals. This property may be removed in
-       *  a future version unless there is enough user interest in keeping it.
-       *  See {@link https://github.com/jasmine/jasmine/issues/2065}.
+       *  same call stack height as the originals. You can fix that by setting
+       *  {@link Configuration#extraItStackFrames}.
        * @property {ExpectationResult[]} failedExpectations - The list of expectations that failed during execution of this spec.
        * @property {ExpectationResult[]} passedExpectations - The list of expectations that passed during execution of this spec.
        * @property {ExpectationResult[]} deprecationWarnings - The list of deprecation warnings that occurred during execution this spec.
        * @property {String} pendingReason - If the spec is {@link pending}, this will be the reason.
-       * @property {String} status - Once the spec has completed, this string represents the pass/fail status of this spec.
+       * @property {String} status - The result of this spec. May be 'passed', 'failed', 'pending', or 'excluded'.
        * @property {number} duration - The time in ms used by the spec execution, including any before/afterEach.
        * @property {Object} properties - User-supplied properties, if any, that were set using {@link Env#setSpecProperty}
        * @property {DebugLogEntry[]|null} debugLogs - Messages, if any, that were logged using {@link jasmine.debugLog} during a failing spec.
@@ -206,7 +208,7 @@ getJasmineRequireObj().Spec = function(j$) {
         return;
       }
 
-      if (e instanceof j$.private.errors.ExpectationFailed) {
+      if (e instanceof private$.errors.ExpectationFailed) {
         return;
       }
 
@@ -273,7 +275,7 @@ getJasmineRequireObj().Spec = function(j$) {
         deprecation = { message: deprecation };
       }
       this.#executionState.deprecationWarnings.push(
-        j$.private.buildExpectationResult(deprecation)
+        private$.buildExpectationResult(deprecation)
       );
     }
 
@@ -340,7 +342,20 @@ getJasmineRequireObj().Spec = function(j$) {
            * @returns {Array.<string>}
            * @since 5.7.0
            */
-          getPath: this.getPath.bind(this)
+          getPath: this.getPath.bind(this),
+
+          /**
+           * The name of the file the spec was defined in.
+           * Note: The value may be incorrect if zone.js is installed or
+           * `it`/`fit`/`xit` have been replaced with versions that don't maintain the
+           * same call stack height as the originals. You can fix that by setting
+           * {@link Configuration#extraItStackFrames}.
+           * @name Spec#filename
+           * @readonly
+           * @type {string}
+           * @since 5.13.0
+           */
+          filename: this.filename
         };
       }
 

src/core/Spy.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().Spy = function(j$) {
+getJasmineRequireObj().Spy = function(j$, private$) {
   'use strict';
 
   const nextOrder = (function() {
@@ -55,7 +55,7 @@ getJasmineRequireObj().Spy = function(j$) {
         },
         matchersUtil
       ),
-      callTracker = new j$.private.CallTracker();
+      callTracker = new private$.CallTracker();
 
     function makeFunc(length, fn) {
       switch (length) {
@@ -147,9 +147,9 @@ getJasmineRequireObj().Spy = function(j$) {
   }
 
   function SpyStrategyDispatcher(strategyArgs, matchersUtil) {
-    const baseStrategy = new j$.private.SpyStrategy(strategyArgs);
+    const baseStrategy = new private$.SpyStrategy(strategyArgs);
     const argsStrategies = new StrategyDict(function() {
-      return new j$.private.SpyStrategy(strategyArgs);
+      return new private$.SpyStrategy(strategyArgs);
     }, matchersUtil);
 
     this.and = baseStrategy;

src/core/SpyFactory.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().SpyFactory = function(j$) {
+getJasmineRequireObj().SpyFactory = function(j$, private$) {
   'use strict';
 
   function SpyFactory(
@@ -7,12 +7,12 @@ getJasmineRequireObj().SpyFactory = function(j$) {
     getMatchersUtil
   ) {
     this.createSpy = function(name, originalFn) {
-      if (j$.private.isFunction(name) && originalFn === undefined) {
+      if (private$.isFunction(name) && originalFn === undefined) {
         originalFn = name;
         name = originalFn.name;
       }
 
-      return j$.private.Spy(name, getMatchersUtil(), {
+      return private$.Spy(name, getMatchersUtil(), {
         originalFn,
         customStrategies: getCustomStrategies(),
         defaultStrategyFn: getDefaultStrategyFn()
@@ -21,7 +21,7 @@ getJasmineRequireObj().SpyFactory = function(j$) {
 
     this.createSpyObj = function(baseName, methodNames, propertyNames) {
       const baseNameIsCollection =
-        j$.private.isObject(baseName) || j$.private.isArray(baseName);
+        private$.isObject(baseName) || Array.isArray(baseName);
 
       if (baseNameIsCollection) {
         propertyNames = methodNames;
@@ -67,11 +67,11 @@ getJasmineRequireObj().SpyFactory = function(j$) {
 
   function normalizeKeyValues(object) {
     const result = [];
-    if (j$.private.isArray(object)) {
+    if (Array.isArray(object)) {
       for (let i = 0; i < object.length; i++) {
         result.push([object[i]]);
       }
-    } else if (j$.private.isObject(object)) {
+    } else if (private$.isObject(object)) {
       for (const key in object) {
         if (object.hasOwnProperty(key)) {
           result.push([key, object[key]]);

src/core/SpyRegistry.js

@@ -1,11 +1,11 @@
-getJasmineRequireObj().SpyRegistry = function(j$) {
+getJasmineRequireObj().SpyRegistry = function(j$, private$) {
   'use strict';
 
-  const spyOnMsg = j$.private.formatErrorMsg(
+  const spyOnMsg = private$.formatErrorMsg(
     '<spyOn>',
     'spyOn(<object>, <methodName>)'
   );
-  const spyOnPropertyMsg = j$.private.formatErrorMsg(
+  const spyOnPropertyMsg = private$.formatErrorMsg(
     '<spyOnProperty>',
     'spyOnProperty(<object>, <propName>, [accessType])'
   );
@@ -47,7 +47,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) {
       // restored.
       if (
         obj[methodName] &&
-        obj[methodName][j$.private.Clock.IsMockClockTimingFn]
+        obj[methodName][private$.Clock.IsMockClockTimingFn]
       ) {
         throw new Error("Mock clock timing functions can't be spied on");
       }
@@ -102,7 +102,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) {
       // localStorage in Firefox and later Safari versions, have no-op setters.
       if (obj[methodName] !== spiedMethod) {
         throw new Error(
-          j$.private.formatErrorMsg('<spyOn>')(
+          private$.formatErrorMsg('<spyOn>')(
             `Can't spy on ${methodName} because assigning to it had no effect`
           )
         );
@@ -130,10 +130,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) {
         throw new Error(getErrorMsg('No property name supplied'));
       }
 
-      const descriptor = j$.private.util.getPropertyDescriptor(
-        obj,
-        propertyName
-      );
+      const descriptor = private$.util.getPropertyDescriptor(obj, propertyName);
 
       if (!descriptor) {
         throw new Error(getErrorMsg(propertyName + ' property does not exist'));
@@ -168,7 +165,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) {
         }
       }
 
-      const originalDescriptor = j$.private.util.clone(descriptor);
+      const originalDescriptor = private$.util.clone(descriptor);
       const spy = createSpy(propertyName, descriptor[accessType]);
       let restoreStrategy;
 

src/core/SpyStrategy.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().SpyStrategy = function(j$) {
+getJasmineRequireObj().SpyStrategy = function(j$, private$) {
   'use strict';
 
   /**
@@ -21,7 +21,7 @@ getJasmineRequireObj().SpyStrategy = function(j$) {
 
     const cs = options.customStrategies || {};
     for (const k in cs) {
-      if (j$.private.util.has(cs, k) && !this[k]) {
+      if (private$.util.has(cs, k) && !this[k]) {
         this[k] = createCustomPlan(cs[k]);
       }
     }
@@ -59,7 +59,7 @@ getJasmineRequireObj().SpyStrategy = function(j$) {
     return function() {
       const plan = factory.apply(null, arguments);
 
-      if (!j$.private.isFunction(plan)) {
+      if (!private$.isFunction(plan)) {
         throw new Error('Spy strategy must return a function');
       }
 
@@ -131,7 +131,7 @@ getJasmineRequireObj().SpyStrategy = function(j$) {
    * @param {Error|Object|String} something Thing to throw
    */
   SpyStrategy.prototype.throwError = function(something) {
-    const error = j$.private.isString(something)
+    const error = private$.isString(something)
       ? new Error(something)
       : something;
     this.plan = function() {
@@ -150,9 +150,9 @@ getJasmineRequireObj().SpyStrategy = function(j$) {
   SpyStrategy.prototype.callFake = function(fn) {
     if (
       !(
-        j$.private.isFunction(fn) ||
-        j$.private.isAsyncFunction(fn) ||
-        j$.private.isGeneratorFunction(fn)
+        private$.isFunction(fn) ||
+        private$.isAsyncFunction(fn) ||
+        private$.isGeneratorFunction(fn)
       )
     ) {
       throw new Error(

src/core/StackClearer.js

@@ -1,20 +1,48 @@
-getJasmineRequireObj().clearStack = function(j$) {
+getJasmineRequireObj().StackClearer = function(j$, private$) {
   'use strict';
 
   const maxInlineCallCount = 10;
+  // 25ms gives a good balance of speed and UI responsiveness when running
+  // jasmine-core's own tests in Safari 18. The exact value isn't critical.
+  const safariYieldIntervalMs = 25;
 
   function browserQueueMicrotaskImpl(global) {
     const unclampedSetTimeout = getUnclampedSetTimeout(global);
     const { queueMicrotask } = global;
-    let currentCallCount = 0;
-    return function clearStack(fn) {
-      currentCallCount++;
+    let yieldStrategy = 'count';
+    let currentCallCount = 0; // for count strategy
+    let nextSetTimeoutTime; // for time strategy
 
-      if (currentCallCount < maxInlineCallCount) {
-        queueMicrotask(fn);
-      } else {
-        currentCallCount = 0;
-        unclampedSetTimeout(fn);
+    return {
+      clearStack(fn) {
+        currentCallCount++;
+        let shouldSetTimeout;
+
+        if (yieldStrategy === 'time') {
+          const now = new Date().getTime();
+          shouldSetTimeout = now >= nextSetTimeoutTime;
+          if (shouldSetTimeout) {
+            nextSetTimeoutTime = now + safariYieldIntervalMs;
+          }
+        } else {
+          shouldSetTimeout = currentCallCount >= maxInlineCallCount;
+          if (shouldSetTimeout) {
+            currentCallCount = 0;
+          }
+        }
+
+        if (shouldSetTimeout) {
+          unclampedSetTimeout(fn);
+        } else {
+          queueMicrotask(fn);
+        }
+      },
+      setSafariYieldStrategy(strategy) {
+        yieldStrategy = strategy;
+
+        if (yieldStrategy === 'time') {
+          nextSetTimeoutTime = new Date().getTime() + safariYieldIntervalMs;
+        }
       }
     };
   }
@@ -22,8 +50,11 @@ getJasmineRequireObj().clearStack = function(j$) {
   function nodeQueueMicrotaskImpl(global) {
     const { queueMicrotask } = global;
 
-    return function(fn) {
-      queueMicrotask(fn);
+    return {
+      clearStack(fn) {
+        queueMicrotask(fn);
+      },
+      setSafariYieldStrategy() {}
     };
   }
 
@@ -32,15 +63,19 @@ getJasmineRequireObj().clearStack = function(j$) {
     const postMessage = getPostMessage(global);
 
     let currentCallCount = 0;
-    return function clearStack(fn) {
-      currentCallCount++;
 
-      if (currentCallCount < maxInlineCallCount) {
-        postMessage(fn);
-      } else {
-        currentCallCount = 0;
-        setTimeout(fn);
-      }
+    return {
+      clearStack(fn) {
+        currentCallCount++;
+
+        if (currentCallCount < maxInlineCallCount) {
+          postMessage(fn);
+        } else {
+          currentCallCount = 0;
+          setTimeout(fn);
+        }
+      },
+      setSafariYieldStrategy() {}
     };
   }
 
@@ -88,7 +123,7 @@ getJasmineRequireObj().clearStack = function(j$) {
     };
   }
 
-  function getClearStack(global) {
+  function getStackClearer(global) {
     const NODE_JS =
       global.process &&
       global.process.versions &&
@@ -106,12 +141,10 @@ getJasmineRequireObj().clearStack = function(j$) {
       // Unlike browsers, Node doesn't require us to do a periodic setTimeout
       // so we avoid the overhead.
       return nodeQueueMicrotaskImpl(global);
-    } else if (SAFARI_OR_WIN_WEBKIT || !global.MessageChannel /* tests */) {
+    } else if (SAFARI_OR_WIN_WEBKIT) {
       // queueMicrotask is dramatically faster than MessageChannel in Safari
       // and other WebKit-based browsers, such as the one distributed by Playwright
       // to test Safari-like behavior on Windows.
-      // Some of our own integration tests provide a mock queueMicrotask in all
-      // environments because it's simpler to mock than MessageChannel.
       return browserQueueMicrotaskImpl(global);
     } else {
       // MessageChannel is faster than queueMicrotask in supported browsers
@@ -120,5 +153,5 @@ getJasmineRequireObj().clearStack = function(j$) {
     }
   }
 
-  return getClearStack;
+  return getStackClearer;
 };

src/core/StackTrace.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().StackTrace = function(j$) {
+getJasmineRequireObj().StackTrace = function(j$, private$) {
   'use strict';
 
   function StackTrace(error) {

src/core/Suite.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().Suite = function(j$) {
+getJasmineRequireObj().Suite = function(j$, private$) {
   'use strict';
 
   class Suite {
@@ -37,8 +37,11 @@ getJasmineRequireObj().Suite = function(j$) {
       // Key and value will eventually be cloned during reporting. The error
       // thrown at that point if they aren't cloneable isn't very helpful.
       // Throw a better one now.
-      j$.private.util.assertReporterCloneable(key, 'Key');
-      j$.private.util.assertReporterCloneable(value, 'Value');
+      if (!private$.isString(key)) {
+        throw new Error('Key must be a string');
+      }
+      private$.util.assertReporterCloneable(value, 'Value');
+
       this.#result.properties = this.#result.properties || {};
       this.#result.properties[key] = value;
     }
@@ -146,12 +149,11 @@ getJasmineRequireObj().Suite = function(j$) {
        * @property {String} description - The description text passed to the {@link describe} that made this suite.
        * @property {String} fullName - The full description including all ancestors of this suite.
        * @property {String|null} parentSuiteId - The ID of the suite containing this suite, or null if this is not in another describe().
-       * @property {String} filename - Deprecated. The name of the file the suite was defined in.
+       * @property {String} filename - The name of the file the suite was defined in.
        * Note: The value may be incorrect if zone.js is installed or
        * `describe`/`fdescribe`/`xdescribe` have been replaced with versions that
-       * don't maintain the same call stack height as the originals. This property
-       * may be removed in a future version unless there is enough user interest
-       * in keeping it. See {@link https://github.com/jasmine/jasmine/issues/2065}.
+       * don't maintain the same call stack height as the originals. You can fix
+       * that by setting {@link Configuration#extraDescribeStackFrames}.
        * @property {ExpectationResult[]} failedExpectations - The list of expectations that failed in an {@link afterAll} for this suite.
        * @property {ExpectationResult[]} deprecationWarnings - The list of deprecation warnings that occurred on this suite.
        * @property {String} status - Once the suite has completed, this string represents the pass/fail status of this suite.
@@ -215,18 +217,18 @@ getJasmineRequireObj().Suite = function(j$) {
       if (!this.sharedContext) {
         this.sharedContext = this.parentSuite
           ? this.parentSuite.clonedSharedUserContext()
-          : new j$.private.UserContext();
+          : new private$.UserContext();
       }
 
       return this.sharedContext;
     }
 
     clonedSharedUserContext() {
-      return j$.private.UserContext.fromExisting(this.sharedUserContext());
+      return private$.UserContext.fromExisting(this.sharedUserContext());
     }
 
     handleException() {
-      if (arguments[0] instanceof j$.private.errors.ExpectationFailed) {
+      if (arguments[0] instanceof private$.errors.ExpectationFailed) {
         return;
       }
 
@@ -235,7 +237,7 @@ getJasmineRequireObj().Suite = function(j$) {
         passed: false,
         error: arguments[0]
       };
-      const failedExpectation = j$.private.buildExpectationResult(data);
+      const failedExpectation = private$.buildExpectationResult(data);
 
       if (!this.parentSuite) {
         failedExpectation.globalErrorType = 'afterAll';
@@ -277,7 +279,7 @@ getJasmineRequireObj().Suite = function(j$) {
         return;
       }
 
-      const expectationResult = j$.private.buildExpectationResult(data);
+      const expectationResult = private$.buildExpectationResult(data);
 
       if (this.reportedDone) {
         this.onLateError(expectationResult);
@@ -286,7 +288,7 @@ getJasmineRequireObj().Suite = function(j$) {
       }
 
       if (this.#throwOnExpectationFailure) {
-        throw new j$.private.errors.ExpectationFailed();
+        throw new private$.errors.ExpectationFailed();
       }
     }
 
@@ -295,7 +297,7 @@ getJasmineRequireObj().Suite = function(j$) {
         deprecation = { message: deprecation };
       }
       this.#result.deprecationWarnings.push(
-        j$.private.buildExpectationResult(deprecation)
+        private$.buildExpectationResult(deprecation)
       );
     }
 
@@ -359,6 +361,19 @@ getJasmineRequireObj().Suite = function(j$) {
        * @since 2.0.0
        */
       this.description = suite.description;
+
+      /**
+       * The name of the file the suite was defined in.
+       * Note: The value may be incorrect if zone.js is installed or
+       * `describe`/`fdescribe`/`xdescribe` have been replaced with versions
+       * that don't maintain the same call stack height as the originals. You
+       * can fix that by setting {@link Configuration#extraItStackFrames}.
+       * @name Suite#filename
+       * @readonly
+       * @type {string}
+       * @since 5.13.0
+       */
+      this.filename = suite.filename;
     }
 
     /**

src/core/SuiteBuilder.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().SuiteBuilder = function(j$) {
+getJasmineRequireObj().SuiteBuilder = function(j$, private$) {
   'use strict';
 
   class SuiteBuilder {
@@ -94,7 +94,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
       ensureIsFunctionOrAsync(fn, 'fit');
 
       if (timeout) {
-        j$.private.util.validateTimeout(timeout);
+        private$.util.validateTimeout(timeout);
       }
       const spec = this.specFactory_(description, fn, timeout, filename);
       this.currentDeclarationSuite_.addChild(spec);
@@ -107,7 +107,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
       ensureIsFunctionOrAsync(beforeEachFunction, 'beforeEach');
 
       if (timeout) {
-        j$.private.util.validateTimeout(timeout);
+        private$.util.validateTimeout(timeout);
       }
 
       this.currentDeclarationSuite_.beforeEach({
@@ -120,7 +120,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
       ensureIsFunctionOrAsync(beforeAllFunction, 'beforeAll');
 
       if (timeout) {
-        j$.private.util.validateTimeout(timeout);
+        private$.util.validateTimeout(timeout);
       }
 
       this.currentDeclarationSuite_.beforeAll({
@@ -133,7 +133,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
       ensureIsFunctionOrAsync(afterEachFunction, 'afterEach');
 
       if (timeout) {
-        j$.private.util.validateTimeout(timeout);
+        private$.util.validateTimeout(timeout);
       }
 
       afterEachFunction.isCleanup = true;
@@ -147,7 +147,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
       ensureIsFunctionOrAsync(afterAllFunction, 'afterAll');
 
       if (timeout) {
-        j$.private.util.validateTimeout(timeout);
+        private$.util.validateTimeout(timeout);
       }
 
       this.currentDeclarationSuite_.afterAll({
@@ -158,7 +158,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
 
     it_(description, fn, timeout, filename) {
       if (timeout) {
-        j$.private.util.validateTimeout(timeout);
+        private$.util.validateTimeout(timeout);
       }
 
       this.checkDuplicate_(description, 'spec');
@@ -197,7 +197,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
       const parentSuite = this.currentDeclarationSuite_;
       const reportedParentSuiteId =
         parentSuite === this.topSuite ? null : parentSuite.id;
-      return new j$.private.Suite({
+      return new private$.Suite({
         id: 'suite' + this.nextSuiteId_++,
         description,
         filename,
@@ -239,7 +239,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
       const config = this.env_.configuration();
       const suite = this.currentDeclarationSuite_;
       const parentSuiteId = suite === this.topSuite ? null : suite.id;
-      const spec = new j$.private.Spec({
+      const spec = new private$.Spec({
         id: 'spec' + this.nextSpecId_++,
         filename,
         parentSuiteId,
@@ -302,21 +302,21 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
   }
 
   function ensureIsFunction(fn, caller) {
-    if (!j$.private.isFunction(fn)) {
+    if (!private$.isFunction(fn)) {
       throw new Error(
         caller +
           ' expects a function argument; received ' +
-          j$.private.getType(fn)
+          private$.getType(fn)
       );
     }
   }
 
   function ensureIsFunctionOrAsync(fn, caller) {
-    if (!j$.private.isFunction(fn) && !j$.private.isAsyncFunction(fn)) {
+    if (!private$.isFunction(fn) && !private$.isAsyncFunction(fn)) {
       throw new Error(
         caller +
           ' expects a function argument; received ' +
-          j$.private.getType(fn)
+          private$.getType(fn)
       );
     }
   }

src/core/Timer.js

@@ -39,7 +39,11 @@ getJasmineRequireObj().Timer = function() {
     this.elapsed = function() {
       return now() - startTime;
     };
+
+    Object.freeze(this);
   }
 
+  Object.freeze(Timer);
+  Object.freeze(Timer.prototype);
   return Timer;
 };