Bump version to 4.6.1

Removed unnecessary throw when building stack trace
Since 4.0, all supported JS runtimes populate the stack property of Error objects when the Error is instantiated, not when it's thrown.
2024-05-25 10:16:04 -07:00 · 2024-05-25 10:00:26 -07:00 · 2024-05-25 10:00:26 -07:00 · 2024-05-24 17:19:18 -07:00 · 2024-05-24 17:18:35 -07:00 · 2024-05-24 17:15:34 -07:00
30 changed files with 772 additions and 234 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,7 +80,7 @@ jobs:
            # cleanly if we kill it from a different step than it started in.

            export PATH=$PATH:$HOME/workspace/bin
-            export SAUCE_TUNNEL_IDENTIFIER=$CIRCLE_BUILD_NUM
+            export SAUCE_TUNNEL_IDENTIFIER=$CIRCLE_WORKFLOW_JOB_ID
            scripts/start-sauce-connect sauce-pidfile
            set +o errexit
            scripts/run-all-browsers
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,47 +0,0 @@
-## Are you creating an issue in the correct repository?
-
- When in doubt, create an issue here.
- If you have an issue with the Jasmine docs, file an issue in the docs repo
-  here: https://github.com/jasmine/jasmine.github.io
- If you have an issue with TypeScript typings, start a discussion at
-  [DefinitelyTpyed](https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/new?category=issues-with-a-types-package)
- This repository is for the core Jasmine framework
- If you are using a test runner that wraps Jasmine, consider filing an issue with that library if appropriate:
-  - [Jasmine npm](https://github.com/jasmine/jasmine-npm/issues)
-  - [Jasmine browser runner](https://github.com/jasmine/jasmine-browser/issues)
-  - [Jasmine gem](https://github.com/jasmine/jasmine-gem/issues)
-  - [Jasmine py](https://github.com/jasmine/jasmine-py/issues)
-  - [Gulp Jasmine Browser](https://github.com/jasmine/gulp-jasmine-browser/issues)
-  - [Karma](https://github.com/karma-runner/karma/issues)
-  - [Grunt Contrib Jasmine](https://github.com/gruntjs/grunt-contrib-jasmine/issues)
-
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
-
-## Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Suite that reproduces the behavior (for bugs)
-<!--- Provide a sample suite that reproduces the bug. -->
-```javascript
-describe("sample", function() {
-});
-```
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Version used:
-* Environment name and version (e.g. Chrome 39, node.js 5.4):
-* Operating System and version (desktop or mobile):
-* Link to your project:
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,98 @@
+name: Bug Report
+description: I think I've found a bug in Jasmine
+labels: ["unconfirmed bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a bug. Please follow these steps first.
+
+        ## Troubleshooting
+        Please take the time to rule out issues with your code or third party libraries before filing a bug report. If you are reporting an error, try to determine whether the error is coming from Jasmine, another library, or your own code.
+
+        Check the [FAQ](https://jasmine.github.io/pages/faq.html) and any other relevant [documentation](https://jasmine.github.io/pages/docs_home.html) to see if your issue has already been addressed.
+
+        ## Special troubleshooting steps for asynchronous scenarios
+        If the issue has to do with testing asynchronous code, please read the [async tutorial](https://jasmine.github.io/tutorials/async) and the async section of the FAQ. In particular, check for the following common errors:
+
+        * Are you trying to write a synchronous test for asynchronous code?
+        * Does the test signal completion before the code under test finishes?
+        * Do expectations run before the code that they're trying to verify?
+
+        ## Try the latest version of Jasmine
+        If at all possible, upgrade to the latest versions of `jasmine-core` and any other relevant packages (e.g. `jasmine`, `jasmine-browser-runner`). If you can't do that, please check the [release notes](https://github.com/jasmine/jasmine/tree/main/release_notes) for all newer versions to make sure that the bug hasn't already been fixed.
+
+        ## Put together a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example)
+        Please help us help you by creating a minimal but complete setup that demonstrates the problem. Remove any code and libraries that aren't absolutely necessary, but make sure it doesn't depend on any code you haven't included. In many cases a simple code snippet is enough. In cases involving external libraries, *especially* Karma or Angular, we're likely to need a runable Git repository or jsbin/stackblitz/etc.
+
+        **If we can't reproduce it, we can't fix it. Bug reports without a minimal, reproducible example are very likely to be closed.**
+
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to Reproduce
+      placeholder: |
+        Example steps:
+        1. Paste the example code below into `mySpec.js`.
+        2. Run `npx jasmine@<some version> mySpec.js`
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: What do you think should have happened?
+    validations:
+      required: true
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual Behavior
+      description: What happened instead?
+    validations:
+      required: true
+  - type: textarea
+    id: code-sample
+    attributes:
+      label: Example code that reproduces the problem
+      description: Please include either a code snippet that reproduces the problem or a link to a repository or jsbin/stackblitz/etc containing a minimal, reproducible example as described above.
+      render: JavaScript
+    validations:
+      required: true
+  - type: textarea
+    id: possible-solution
+    attributes:
+      label: Possible Solution
+      description: This is optional, but if you have an idea for how to fix the bug we'd like to hear it.
+  - type: textarea
+    id: context
+    attributes:
+      label: Context
+      description: How has this issue affected you? What are you trying to accomplish? By providing context, you can help us come up with a solution that is most useful in the real world.
+  - type: input
+    id: jasmine-core-version
+    attributes:
+      label: jasmine-core version
+    validations:
+      required: true
+  - type: textarea
+    id: other-versions
+    attributes:
+      label: Versions of other relevant packages
+      placeholder: |
+        jasmine-browser-runner 1.2.0
+        fancy-reporter 132.4.8
+  - type: input
+    id: browser-or-node-version
+    attributes:
+      label: Node.js or browser version
+      placeholder: E.g. "node 16.2.0" or "Safari 15"
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating System
+      placeholder: E.g. "Windows 10", "MacOS 12.5", "MCC Interim Linux 0.99.p8"
+    validations:
+      required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Issues with the `jasmine` CLI
+    url: https://github.com/jasmine/jasmine-npm/issues
+    about: Please create issues related to the `jasmine` package in its repository.
+  - name: Issues with jasmine-browser-runner
+    url: https://github.com/jasmine/jasmine-browser-runner/issues
+    about: Please create issues related to the `jasmine-browser-runner` package in its repository.
+  - name: Documentation issues
+    url: https://github.com/jasmine/jasmine.github.io/issues
+    about: Please create documentation issues in the docs repository.
+  - name: TypeScript issues
+    url: https://github.com/DefinitelyTyped/DefinitelyTyped/discussions
+    about: Please create issues related to TypeScript compilation errors or other problems with type definitions at DefinitelyTyped.
--- a/.github/ISSUE_TEMPLATE/feature_proposal.yml
+++ b/.github/ISSUE_TEMPLATE/feature_proposal.yml
@@ -0,0 +1,31 @@
+name: Feature Proposal
+description: I'd like to propose a new feature
+labels: ["feature request"]
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to propose a new feature. Although Jasmine is mostly feature complete, we're always open to hearing new ideas.
+  - type: textarea
+    id: description
+    attributes:
+      label: Feature Proposal
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Context
+      description: How would this feature be useful to you? What are you trying to accomplish? By providing context, you can help us come up with a solution that is most useful in the real world.
+    validations:
+      required: true
+  - type: textarea
+    id: example
+    attributes:
+      label: Example
+      description: If you're proposing a new API or something similar, please show an example of how it would be used.
+      render: JavaScript
+  - type: textarea
+    id: other-info
+    attributes:
+      label: Other Information
+      description: Anything else that you think would be helpful.
--- a/.github/ISSUE_TEMPLATE/support_request.yml
+++ b/.github/ISSUE_TEMPLATE/support_request.yml
@@ -0,0 +1,73 @@
+name: Question or Support Request
+description: I need help using Jasmine
+labels: ["question"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Jasmine is supported by volunteers working in their free time. Although we're generally willing to help, we're going to ask you to put in some effort first to help us help you.
+
+        ## Troubleshooting
+        Please take the time to rule out problems with your code or third party libraries before opening an issue. If you're running into an error, try to determine whether the error is coming from Jasmine, another library, or your own code.
+
+        Check the [FAQ](https://jasmine.github.io/pages/faq.html) and any other relevant [documentation](https://jasmine.github.io/pages/docs_home.html) to see if your question has already been answered. Consider searching [Stack Overflow](https://stackoverflow.com/questions/tagged/jasmine) and past issues in this repository for related questions as well.
+
+        ## Special troubleshooting steps for asynchronous scenarios
+        If the issue has to do with testing asynchronous code, please read the [async tutorial](https://jasmine.github.io/tutorials/async) and the async section of the FAQ. In particular, check for the following common errors:
+
+        * Are you trying to write a synchronous test for asynchronous code?
+        * Does the test signal completion before the code under test finishes?
+        * Do expectations run before the code that they're trying to verify?
+
+        ## Consider asking Angular questions in an Angular forum
+
+        Questions like "how do I test this Angular service" are mostly about Angular, not Jasmine. You'll likely get better responses in an Angular forum. Here's a rule of thumb: If you can't demonstrate the problem without Angular, you probably have an Angular question.
+
+        ## Try the latest version of Jasmine
+        If at all possible, upgrade to the latest versions of `jasmine-core` and any other relevant packages (e.g. `jasmine`, `jasmine-browser-runner`).
+
+        ## Put together a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example)
+        Please help us help you by creating a minimal but complete setup that demonstrates the problem. Remove any code and libraries that aren't absolutely necessary, but make sure it doesn't depend on any code you haven't included. In many cases a simple code snippet is enough. In cases involving external libraries, *especially* Karma or Angular, we're likely to need a runable Git repository or jsbin/stackblitz/etc.
+
+  - type: textarea
+    id: question
+    attributes:
+      label: Your question
+      description: Clearly describe what you'd like help with.
+    validations:
+      required: true
+  - type: textarea
+    id: code-sample
+    attributes:
+      label: Example code that demonstrates the problem
+      description: Please include either a code snippet that demonstrates the problem or a link to a repository or jsbin/stackblitz/etc containing a minimal, reproducible example as described above.
+      render: JavaScript
+    validations:
+      required: true
+  - type: input
+    id: jasmine-core-version
+    attributes:
+      label: jasmine-core version
+    validations:
+      required: true
+  - type: textarea
+    id: other-versions
+    attributes:
+      label: Versions of other relevant packages
+      placeholder: |
+        jasmine-browser-runner 1.2.0
+        fancy-reporter 132.4.8
+  - type: input
+    id: browser-or-node-version
+    attributes:
+      label: Node.js or browser version
+      placeholder: E.g. "node 16.2.0" or "Safari 15"
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating System
+      placeholder: E.g. "Windows 10", "MacOS 12.5", "MCC Interim Linux 0.99.p8"
+    validations:
+      required: true
--- a/MIT.LICENSE
+++ b/MIT.LICENSE
@@ -1,4 +1,5 @@
 Copyright (c) 2008-2019 Pivotal Labs
+Copyright (c) 2008-2023 The Jasmine developers

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Microsoft Edge) as well as Node.
 | Node              | 12.17+, 14, 16, 18 |
 | Safari            | 14-16              |
 | Chrome            | Evergreen          |
-| Firefox           | Evergreen, 91      |
+| Firefox           | Evergreen, 91, 102 |
 | Edge              | Evergreen          |

 For evergreen browsers, each version of Jasmine is tested against the version of the browser that is available to us
@@ -58,4 +58,6 @@ To find out what environments work with a particular Jasmine release, see the [r
 * [Christian Williams](mailto:antixian666@gmail.com)
 * Sheel Choksi

-Copyright (c) 2008-2022 Jasmine Maintainers. This software is licensed under the [MIT License](https://github.com/jasmine/jasmine/blob/main/MIT.LICENSE).
+Copyright (c) 2008-2019 Pivotal Labs<br>
+Copyright (c) 2008-2024 The Jasmine developers<br>
+This software is licensed under the [MIT License](https://github.com/jasmine/jasmine/blob/main/LICENSE).
--- a/grunt/templates/licenseBanner.js.jst
+++ b/grunt/templates/licenseBanner.js.jst
@@ -1,5 +1,6 @@
 /*
-Copyright (c) 2008-<%= currentYear %> Pivotal Labs
+Copyright (c) 2008-2019 Pivotal Labs
+Copyright (c) 2008-<%= currentYear %> The Jasmine developers

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/lib/jasmine-core/boot0.js
+++ b/lib/jasmine-core/boot0.js
@@ -1,5 +1,6 @@
 /*
-Copyright (c) 2008-2022 Pivotal Labs
+Copyright (c) 2008-2019 Pivotal Labs
+Copyright (c) 2008-2024 The Jasmine developers

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/lib/jasmine-core/boot1.js
+++ b/lib/jasmine-core/boot1.js
@@ -1,5 +1,6 @@
 /*
-Copyright (c) 2008-2022 Pivotal Labs
+Copyright (c) 2008-2019 Pivotal Labs
+Copyright (c) 2008-2024 The Jasmine developers

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/lib/jasmine-core/jasmine-html.js
+++ b/lib/jasmine-core/jasmine-html.js
@@ -1,5 +1,6 @@
 /*
-Copyright (c) 2008-2022 Pivotal Labs
+Copyright (c) 2008-2019 Pivotal Labs
+Copyright (c) 2008-2024 The Jasmine developers

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -530,14 +531,13 @@ jasmineRequire.HtmlReporter = function(j$) {
          if (noExpectations(resultNode.result)) {
            specDescription = 'SPEC HAS NO EXPECTATIONS ' + specDescription;
          }
-          if (
-            resultNode.result.status === 'pending' &&
-            resultNode.result.pendingReason !== ''
-          ) {
-            specDescription =
-              specDescription +
-              ' PENDING WITH MESSAGE: ' +
-              resultNode.result.pendingReason;
+          if (resultNode.result.status === 'pending') {
+            if (resultNode.result.pendingReason !== '') {
+              specDescription +=
+                ' PENDING WITH MESSAGE: ' + resultNode.result.pendingReason;
+            } else {
+              specDescription += ' PENDING';
+            }
          }
          specListNode.appendChild(
            createDom(
--- a/lib/jasmine-core/jasmine.css
+++ b/lib/jasmine-core/jasmine.css
@@ -55,9 +55,6 @@ body {
  position: fixed;
  right: 100%;
 }
-.jasmine_html-reporter .jasmine-version {
-  color: #aaa;
-}
 .jasmine_html-reporter .jasmine-banner {
  margin-top: 14px;
 }
@@ -169,10 +166,11 @@ body {
 }
 .jasmine_html-reporter .jasmine-bar.jasmine-menu {
  background-color: #fff;
-  color: #aaa;
+  color: #000;
 }
 .jasmine_html-reporter .jasmine-bar.jasmine-menu a {
-  color: #333;
+  color: blue;
+  text-decoration: underline;
 }
 .jasmine_html-reporter .jasmine-bar a {
  color: white;
--- a/lib/jasmine-core/jasmine.js
+++ b/lib/jasmine-core/jasmine.js
@@ -1,5 +1,6 @@
 /*
-Copyright (c) 2008-2022 Pivotal Labs
+Copyright (c) 2008-2019 Pivotal Labs
+Copyright (c) 2008-2024 The Jasmine developers

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -741,6 +742,8 @@ getJasmineRequireObj().Spec = function(j$) {
    this.asyncExpectationFactory = attrs.asyncExpectationFactory;
    this.resultCallback = attrs.resultCallback || function() {};
    this.id = attrs.id;
+    this.filename = attrs.filename;
+    this.parentSuiteId = attrs.parentSuiteId;
    this.description = attrs.description || '';
    this.queueableFn = attrs.queueableFn;
    this.beforeAndAfterFns =
@@ -774,35 +777,7 @@ getJasmineRequireObj().Spec = function(j$) {
      this.exclude();
    }

-    /**
-     * @typedef SpecResult
-     * @property {String} id - The unique id of this spec.
-     * @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 {Expectation[]} failedExpectations - The list of expectations that failed during execution of this spec.
-     * @property {Expectation[]} passedExpectations - The list of expectations that passed during execution of this spec.
-     * @property {Expectation[]} 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 {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.
-     * @since 2.0.0
-     */
-    this.result = {
-      id: this.id,
-      description: this.description,
-      fullName: this.getFullName(),
-      failedExpectations: [],
-      passedExpectations: [],
-      deprecationWarnings: [],
-      pendingReason: '',
-      duration: null,
-      properties: null,
-      debugLogs: null
-    };
-
-    this.reportedDone = false;
+    this.reset();
  }

  Spec.prototype.addExpectationResult = function(passed, data, isError) {
@@ -912,14 +887,33 @@ getJasmineRequireObj().Spec = function(j$) {
  };

  Spec.prototype.reset = function() {
+    /**
+     * @typedef SpecResult
+     * @property {String} id - The unique id of this spec.
+     * @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 - The name of the file the spec was defined in.
+     * @property {Expectation[]} failedExpectations - The list of expectations that failed during execution of this spec.
+     * @property {Expectation[]} passedExpectations - The list of expectations that passed during execution of this spec.
+     * @property {Expectation[]} 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 {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.
+     * @since 2.0.0
+     */
    this.result = {
      id: this.id,
      description: this.description,
      fullName: this.getFullName(),
+      parentSuiteId: this.parentSuiteId,
+      filename: this.filename,
      failedExpectations: [],
      passedExpectations: [],
      deprecationWarnings: [],
-      pendingReason: this.excludeMessage,
+      pendingReason: this.excludeMessage || '',
      duration: null,
      properties: null,
      debugLogs: null
@@ -1816,17 +1810,23 @@ getJasmineRequireObj().Env = function(j$) {

    this.describe = function(description, definitionFn) {
      ensureIsNotNested('describe');
-      return suiteBuilder.describe(description, definitionFn).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.describe(description, definitionFn, filename)
+        .metadata;
    };

    this.xdescribe = function(description, definitionFn) {
      ensureIsNotNested('xdescribe');
-      return suiteBuilder.xdescribe(description, definitionFn).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.xdescribe(description, definitionFn, filename)
+        .metadata;
    };

    this.fdescribe = function(description, definitionFn) {
      ensureIsNotNested('fdescribe');
-      return suiteBuilder.fdescribe(description, definitionFn).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.fdescribe(description, definitionFn, filename)
+        .metadata;
    };

    function specResultCallback(spec, result, next) {
@@ -1853,17 +1853,20 @@ getJasmineRequireObj().Env = function(j$) {

    this.it = function(description, fn, timeout) {
      ensureIsNotNested('it');
-      return suiteBuilder.it(description, fn, timeout).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.it(description, fn, timeout, filename).metadata;
    };

    this.xit = function(description, fn, timeout) {
      ensureIsNotNested('xit');
-      return suiteBuilder.xit(description, fn, timeout).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.xit(description, fn, timeout, filename).metadata;
    };

    this.fit = function(description, fn, timeout) {
      ensureIsNotNested('fit');
-      return suiteBuilder.fit(description, fn, timeout).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.fit(description, fn, timeout, filename).metadata;
    };

    /**
@@ -2003,6 +2006,10 @@ getJasmineRequireObj().Env = function(j$) {
    };
  }

+  function callerCallerFilename() {
+    return new j$.StackTrace(new Error()).frames[3].file;
+  }
+
  return Env;
 };

@@ -2638,11 +2645,7 @@ getJasmineRequireObj().buildExpectationResult = function(j$) {
        } else if (options.stack) {
          error = options;
        } else {
-          try {
-            throw new Error(message());
-          } catch (e) {
-            error = e;
-          }
+          error = new Error(message());
        }
      }
      // Omit the message from the stack trace because it will be
@@ -3518,7 +3521,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
        lines.unshift(stackTrace.message);
      }

-      if (error.cause) {
+      if (error.cause && error.cause instanceof Error) {
        const substack = this.stack_(error.cause, {
          messageHandling: 'require'
        });
@@ -9530,6 +9533,8 @@ getJasmineRequireObj().Suite = function(j$) {
    this.id = attrs.id;
    this.parentSuite = attrs.parentSuite;
    this.description = attrs.description;
+    this.reportedParentSuiteId = attrs.reportedParentSuiteId;
+    this.filename = attrs.filename;
    this.expectationFactory = attrs.expectationFactory;
    this.asyncExpectationFactory = attrs.asyncExpectationFactory;
    this.throwOnExpectationFailure = !!attrs.throwOnExpectationFailure;
@@ -9635,6 +9640,8 @@ getJasmineRequireObj().Suite = function(j$) {
     * @property {String} id - The unique id of this suite.
     * @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 - The name of the file the suite was defined in.
     * @property {Expectation[]} failedExpectations - The list of expectations that failed in an {@link afterAll} for this suite.
     * @property {Expectation[]} 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.
@@ -9646,6 +9653,8 @@ getJasmineRequireObj().Suite = function(j$) {
      id: this.id,
      description: this.description,
      fullName: this.getFullName(),
+      parentSuiteId: this.reportedParentSuiteId,
+      filename: this.filename,
      failedExpectations: [],
      deprecationWarnings: [],
      duration: null,
@@ -9873,9 +9882,9 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      this.focusedRunables = [];
    }

-    describe(description, definitionFn) {
+    describe(description, definitionFn, filename) {
      ensureIsFunction(definitionFn, 'describe');
-      const suite = this.suiteFactory_(description);
+      const suite = this.suiteFactory_(description, filename);
      if (definitionFn.length > 0) {
        throw new Error('describe does not expect any arguments');
      }
@@ -9886,9 +9895,9 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      return suite;
    }

-    fdescribe(description, definitionFn) {
+    fdescribe(description, definitionFn, filename) {
      ensureIsFunction(definitionFn, 'fdescribe');
-      const suite = this.suiteFactory_(description);
+      const suite = this.suiteFactory_(description, filename);
      suite.isFocused = true;

      this.focusedRunables.push(suite.id);
@@ -9898,37 +9907,37 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      return suite;
    }

-    xdescribe(description, definitionFn) {
+    xdescribe(description, definitionFn, filename) {
      ensureIsFunction(definitionFn, 'xdescribe');
-      const suite = this.suiteFactory_(description);
+      const suite = this.suiteFactory_(description, filename);
      suite.exclude();
      this.addSpecsToSuite_(suite, definitionFn);

      return suite;
    }

-    it(description, fn, timeout) {
+    it(description, fn, timeout, filename) {
      // it() sometimes doesn't have a fn argument, so only check the type if
      // it's given.
      if (arguments.length > 1 && typeof fn !== 'undefined') {
        ensureIsFunctionOrAsync(fn, 'it');
      }

-      return this.it_(description, fn, timeout);
+      return this.it_(description, fn, timeout, filename);
    }

-    xit(description, fn, timeout) {
+    xit(description, fn, timeout, filename) {
      // xit(), like it(), doesn't always have a fn argument, so only check the
      // type when needed.
      if (arguments.length > 1 && typeof fn !== 'undefined') {
        ensureIsFunctionOrAsync(fn, 'xit');
      }
-      const spec = this.it_(description, fn, timeout);
+      const spec = this.it_(description, fn, timeout, filename);
      spec.exclude('Temporarily disabled with xit');
      return spec;
    }

-    fit(description, fn, timeout) {
+    fit(description, fn, timeout, filename) {
      // Unlike it and xit, the function is required because it doesn't make
      // sense to focus on nothing.
      ensureIsFunctionOrAsync(fn, 'fit');
@@ -9936,7 +9945,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      if (timeout) {
        j$.util.validateTimeout(timeout);
      }
-      const spec = this.specFactory_(description, fn, timeout);
+      const spec = this.specFactory_(description, fn, timeout, filename);
      this.currentDeclarationSuite_.addChild(spec);
      this.focusedRunables.push(spec.id);
      this.unfocusAncestor_();
@@ -9996,12 +10005,12 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      });
    }

-    it_(description, fn, timeout) {
+    it_(description, fn, timeout, filename) {
      if (timeout) {
        j$.util.validateTimeout(timeout);
      }

-      const spec = this.specFactory_(description, fn, timeout);
+      const spec = this.specFactory_(description, fn, timeout, filename);
      if (this.currentDeclarationSuite_.markedExcluding) {
        spec.exclude();
      }
@@ -10010,12 +10019,17 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      return spec;
    }

-    suiteFactory_(description) {
+    suiteFactory_(description, filename) {
      const config = this.env_.configuration();
+      const parentSuite = this.currentDeclarationSuite_;
+      const reportedParentSuiteId =
+        parentSuite === this.topSuite ? null : parentSuite.id;
      return new j$.Suite({
        id: 'suite' + this.nextSuiteId_++,
        description,
-        parentSuite: this.currentDeclarationSuite_,
+        filename,
+        parentSuite,
+        reportedParentSuiteId,
        timer: new j$.Timer(),
        expectationFactory: this.expectationFactory_,
        asyncExpectationFactory: this.suiteAsyncExpectationFactory_,
@@ -10047,12 +10061,15 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      this.currentDeclarationSuite_ = parentSuite;
    }

-    specFactory_(description, fn, timeout) {
+    specFactory_(description, fn, timeout, filename) {
      this.totalSpecsDefined++;
      const config = this.env_.configuration();
      const suite = this.currentDeclarationSuite_;
+      const parentSuiteId = suite === this.topSuite ? null : suite.id;
      const spec = new j$.Spec({
        id: 'spec' + this.nextSpecId_++,
+        filename,
+        parentSuiteId,
        beforeAndAfterFns: beforeAndAfterFns(suite),
        expectationFactory: this.expectationFactory_,
        asyncExpectationFactory: this.specAsyncExpectationFactory_,
@@ -10464,5 +10481,5 @@ getJasmineRequireObj().UserContext = function(j$) {
 };

 getJasmineRequireObj().version = function() {
-  return '4.4.0';
+  return '4.6.1';
 };
--- a/lib/jasmine-core/node_boot.js
+++ b/lib/jasmine-core/node_boot.js
@@ -1,5 +1,6 @@
 /*
-Copyright (c) 2008-2022 Pivotal Labs
+Copyright (c) 2008-2019 Pivotal Labs
+Copyright (c) 2008-2024 The Jasmine developers

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "jasmine-core",
  "license": "MIT",
-  "version": "4.5.0",
+  "version": "4.6.1",
  "repository": {
    "type": "git",
    "url": "https://github.com/jasmine/jasmine.git"
@@ -35,9 +35,9 @@
  ],
  "devDependencies": {
    "eslint": "^7.32.0",
-    "eslint-plugin-compat": "^4.0.0",
+    "eslint-plugin-compat": ">=4.0.0 <4.1.0",
    "glob": "^7.2.0",
-    "grunt": "^1.0.4",
+    "grunt": ">=1.0.4 <1.6.0",
    "grunt-cli": "^1.3.2",
    "grunt-contrib-compress": "^2.0.0",
    "grunt-contrib-concat": "^2.0.0",
@@ -48,7 +48,7 @@
    "jsdom": "^19.0.0",
    "load-grunt-tasks": "^5.1.0",
    "prettier": "1.17.1",
-    "sass": "^1.45.1",
+    "sass": "1.58.3",
    "shelljs": "^0.8.3",
    "temp": "^0.9.0"
  },
--- a/release_notes/4.6.0.md
+++ b/release_notes/4.6.0.md
@@ -0,0 +1,19 @@
+# Jasmine Core 4.6.0 Release Notes
+
+## New Features
+
+* Report the ID of each suite/spec's parent
+* Report the path/url of the file that the spec/suite was defined in
+  * Fixes [#1884](https://github.com/jasmine/jasmine/issues/1884)
+* Added Firefox 102 (current ESR) to supported browsers
+
+
+## Internal improvements
+
+* Pinned sass to 1.58.3 for compatibility with Node 12
+* Pinned eslint-plugin-compat to <4.1.0 for compatibility with Node 12
+* Pinned Grunt to <1.6.0 for compatibility with Node 12
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_
--- a/scripts/run-all-browsers
+++ b/scripts/run-all-browsers
@@ -3,6 +3,7 @@
 run_browser() {
 	browser=$1
 	version=$2
+	os="$3"
 	description="$browser $version"
 	if [ $version = "latest" ]; then
 		version=""
@@ -12,7 +13,7 @@ run_browser() {
 	echo
 	echo "Running $description"
 	echo
-	USE_SAUCE=true JASMINE_BROWSER=$browser SAUCE_BROWSER_VERSION=$version npm run ci
+	USE_SAUCE=true JASMINE_BROWSER=$browser SAUCE_BROWSER_VERSION=$version SAUCE_OS="$os" npm run ci

 	if [ $? -eq 0 ]; then
 		echo "PASS: $description" >> "$passfile"
@@ -23,7 +24,17 @@ run_browser() {

 passfile=`mktemp -t jasmine-results.XXXXXX` || exit 1
 failfile=`mktemp -t jasmine-results.XXXXXX` || exit 1
-run_browser chrome latest
+
+# As of 2023-09-30, Sauce Connect doesn't work with the latest Chrome version
+# on the default Linux. Run on Mac OS instead. The OS specification may need to
+# be updated or removed when new Chrome versions stop being available on Mac OS
+# 12, although historically this has taken several major OS versions.
+# See <https://saucelabs.com/products/supported-browsers-devices>.
+# On Saucelabs, the test suite frequently runs ~30s slower on Mac OS than it
+# does on Linux, so it's probably worth removing the OS specification once Sauce
+# Connect works with Chrome latest on Linux again.
+run_browser chrome latest "macOS 12"
+
 run_browser firefox latest
 run_browser firefox 102
 run_browser firefox 91
--- a/spec/core/ExceptionFormatterSpec.js
+++ b/spec/core/ExceptionFormatterSpec.js
@@ -301,6 +301,26 @@ describe('ExceptionFormatter', function() {
          .withContext('first root cause stack frame')
          .toContain('ExceptionFormatterSpec.js');
      });
+
+      it('does not throw if cause is a non Error', function() {
+        const formatter = new jasmineUnderTest.ExceptionFormatter();
+
+        expect(function() {
+          formatter.stack(
+            new Error('error', {
+              cause: function() {}
+            })
+          );
+        }).not.toThrowError();
+
+        expect(function() {
+          formatter.stack(
+            new Error('error', {
+              cause: 'another error'
+            })
+          );
+        }).not.toThrowError();
+      });
    });
  });
 });
--- a/spec/core/SpecSpec.js
+++ b/spec/core/SpecSpec.js
@@ -195,6 +195,8 @@ describe('Spec', function() {
        onStart: startCallback,
        resultCallback: resultCallback,
        description: 'with a spec',
+        parentSuiteId: 'suite1',
+        filename: 'someSpecFile.js',
        getSpecName: function() {
          return 'a suite with a spec';
        },
@@ -219,6 +221,8 @@ describe('Spec', function() {
        status: 'pending',
        description: 'with a spec',
        fullName: 'a suite with a spec',
+        parentSuiteId: 'suite1',
+        filename: 'someSpecFile.js',
        failedExpectations: [],
        passedExpectations: [],
        deprecationWarnings: [],
--- a/spec/core/integration/EnvSpec.js
+++ b/spec/core/integration/EnvSpec.js
@@ -1933,11 +1933,17 @@ describe('Env integration', function() {
      'specStarted',
      'specDone'
    ]);
+    const suiteFullNameToId = {};
+    reporter.suiteStarted.and.callFake(function(e) {
+      suiteFullNameToId[e.fullName] = e.id;
+    });

    env.addReporter(reporter);

+    env.it('a top level spec', function() {});
+
    env.describe('A Suite', function() {
-      env.it('with a top level spec', function() {
+      env.it('with a spec', function() {
        env.expect(true).toBe(true);
      });
      env.describe('with a nested suite', function() {
@@ -1960,37 +1966,109 @@ describe('Env integration', function() {
    await env.execute();

    expect(reporter.jasmineStarted).toHaveBeenCalledWith({
-      totalSpecsDefined: 5,
+      totalSpecsDefined: 6,
      order: jasmine.any(jasmineUnderTest.Order)
    });

-    expect(reporter.specDone.calls.count()).toBe(5);
+    expect(reporter.specStarted.calls.count()).toBe(6);
+    expect(reporter.specDone.calls.count()).toBe(6);

-    expect(reporter.specDone).toHaveBeenCalledWith(
+    expect(reporter.specStarted).toHaveBeenCalledWith(
      jasmine.objectContaining({
-        description: 'with a top level spec',
-        status: 'passed'
+        description: 'a top level spec',
+        parentSuiteId: null
      })
    );
-
    expect(reporter.specDone).toHaveBeenCalledWith(
      jasmine.objectContaining({
-        description: "with an x'ed spec",
-        status: 'pending'
+        description: 'a top level spec',
+        status: 'passed',
+        parentSuiteId: null
+      })
+    );
+    expect(reporter.specStarted).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'with a spec',
+        parentSuiteId: suiteFullNameToId['A Suite']
      })
    );
-
    expect(reporter.specDone).toHaveBeenCalledWith(
      jasmine.objectContaining({
        description: 'with a spec',
-        status: 'failed'
+        status: 'passed',
+        parentSuiteId: suiteFullNameToId['A Suite']
      })
    );

+    expect(reporter.specStarted).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: "with an x'ed spec",
+        parentSuiteId: suiteFullNameToId['A Suite with a nested suite']
+      })
+    );
+    expect(reporter.specDone).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: "with an x'ed spec",
+        status: 'pending',
+        parentSuiteId: suiteFullNameToId['A Suite with a nested suite']
+      })
+    );
+
+    expect(reporter.specStarted).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'with a spec',
+        parentSuiteId: suiteFullNameToId['A Suite with a nested suite']
+      })
+    );
+    expect(reporter.specDone).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'with a spec',
+        status: 'failed',
+        parentSuiteId: suiteFullNameToId['A Suite with a nested suite']
+      })
+    );
+
+    expect(reporter.specStarted).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'is pending',
+        parentSuiteId:
+          suiteFullNameToId['A Suite with only non-executable specs']
+      })
+    );
    expect(reporter.specDone).toHaveBeenCalledWith(
      jasmine.objectContaining({
        description: 'is pending',
-        status: 'pending'
+        status: 'pending',
+        parentSuiteId:
+          suiteFullNameToId['A Suite with only non-executable specs']
+      })
+    );
+
+    expect(reporter.suiteStarted).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'A Suite',
+        parentSuiteId: null
+      })
+    );
+    expect(reporter.suiteDone).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'A Suite',
+        status: 'passed',
+        parentSuiteId: null
+      })
+    );
+
+    expect(reporter.suiteStarted).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'with a nested suite',
+        parentSuiteId: suiteFullNameToId['A Suite']
+      })
+    );
+    expect(reporter.suiteDone).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'with a nested suite',
+        status: 'passed',
+        parentSuiteId: suiteFullNameToId['A Suite']
      })
    );

@@ -2001,6 +2079,89 @@ describe('Env integration', function() {
    expect(suiteResult.description).toEqual('A Suite');
  });

+  it('reports focused specs and suites as expected', async function() {
+    const reporter = jasmine.createSpyObj('fakeReporter', [
+      'suiteStarted',
+      'suiteDone',
+      'specStarted',
+      'specDone'
+    ]);
+    const suiteFullNameToId = {};
+    reporter.suiteStarted.and.callFake(function(e) {
+      suiteFullNameToId[e.fullName] = e.id;
+    });
+
+    env.fit('a focused top level spec', function() {});
+
+    env.describe('a suite', function() {
+      env.fdescribe('a focused suite', function() {
+        env.fit('a focused spec', function() {});
+      });
+    });
+
+    env.addReporter(reporter);
+    await env.execute();
+
+    expect(reporter.specStarted).toHaveBeenCalledTimes(2);
+    expect(reporter.specDone).toHaveBeenCalledTimes(2);
+
+    expect(reporter.specStarted).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'a focused top level spec',
+        parentSuiteId: null
+      })
+    );
+    expect(reporter.specDone).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'a focused top level spec',
+        status: 'passed',
+        parentSuiteId: null
+      })
+    );
+
+    expect(reporter.specStarted).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'a focused spec',
+        parentSuiteId: suiteFullNameToId['a suite a focused suite']
+      })
+    );
+    expect(reporter.specDone).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'a focused spec',
+        status: 'passed',
+        parentSuiteId: suiteFullNameToId['a suite a focused suite']
+      })
+    );
+
+    expect(reporter.suiteStarted).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'a suite',
+        parentSuiteId: null
+      })
+    );
+    expect(reporter.suiteDone).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'a suite',
+        status: 'passed',
+        parentSuiteId: null
+      })
+    );
+
+    expect(reporter.suiteStarted).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'a focused suite',
+        parentSuiteId: suiteFullNameToId['a suite']
+      })
+    );
+    expect(reporter.suiteDone).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        description: 'a focused suite',
+        status: 'passed',
+        parentSuiteId: suiteFullNameToId['a suite']
+      })
+    );
+  });
+
  it('should report the random seed at the beginning and end of execution', async function() {
    const reporter = jasmine.createSpyObj('fakeReporter', [
      'jasmineStarted',
@@ -4004,6 +4165,99 @@ describe('Env integration', function() {
    );
  });

+  it('reports suite and spec filenames', async function() {
+    const methods = ['suiteStarted', 'suiteDone', 'specStarted', 'specDone'];
+    const reporter = jasmine.createSpyObj('reporter', methods);
+    env.addReporter(reporter);
+
+    // Simulate calling through global it and describe,
+    // which add another stack frame vs calling env methods directly
+    function describeShim(name, fn) {
+      env.describe(name, fn);
+    }
+    function itShim(name, fn) {
+      env.it(name, fn);
+    }
+
+    describeShim('a suite', function() {
+      itShim('a spec', function() {});
+    });
+
+    await env.execute();
+
+    for (const method of methods) {
+      expect(reporter[method])
+        .withContext(method)
+        .toHaveBeenCalledWith(
+          jasmine.objectContaining({
+            filename: jasmine.stringMatching(/EnvSpec\.js$/)
+          })
+        );
+    }
+  });
+
+  it('reports skipped suite and spec filenames', async function() {
+    const methods = ['suiteStarted', 'suiteDone', 'specStarted', 'specDone'];
+    const reporter = jasmine.createSpyObj('reporter', methods);
+    env.addReporter(reporter);
+
+    // Simulate calling through global it and describe,
+    // which add another stack frame vs calling env methods directly
+    function xdescribeShim(name, fn) {
+      env.xdescribe(name, fn);
+    }
+    function xitShim(name, fn) {
+      env.xit(name, fn);
+    }
+
+    xdescribeShim('a suite', function() {
+      xitShim('a spec', function() {});
+    });
+
+    await env.execute();
+
+    for (const method of methods) {
+      expect(reporter[method])
+        .withContext(method)
+        .toHaveBeenCalledWith(
+          jasmine.objectContaining({
+            filename: jasmine.stringMatching(/EnvSpec\.js$/)
+          })
+        );
+    }
+  });
+
+  it('reports focused suite and spec filenames', async function() {
+    const methods = ['suiteStarted', 'suiteDone', 'specStarted', 'specDone'];
+    const reporter = jasmine.createSpyObj('reporter', methods);
+    env.addReporter(reporter);
+
+    // Simulate calling through global it and describe,
+    // which add another stack frame vs calling env methods directly
+    function fdescribeShim(name, fn) {
+      env.fdescribe(name, fn);
+    }
+    function fitShim(name, fn) {
+      env.fit(name, fn);
+    }
+
+    fdescribeShim('a suite', function() {
+      fitShim('a spec', function() {});
+    });
+
+    await env.execute();
+
+    for (const method of methods) {
+      expect(reporter[method])
+        .withContext(method)
+        .toHaveBeenCalledWith(
+          jasmine.objectContaining({
+            filename: jasmine.stringMatching(/EnvSpec\.js$/)
+          })
+        );
+    }
+  });
+
  function browserEventMethods() {
    return {
      addEventListener() {},
--- a/spec/html/HtmlReporterSpec.js
+++ b/spec/html/HtmlReporterSpec.js
@@ -1411,6 +1411,23 @@ describe('HtmlReporter', function() {
    describe('and there are pending specs', function() {
      let container, reporter;

+      function pendingSpecStatus() {
+        return {
+          id: 123,
+          description: 'with a spec',
+          fullName: 'A Suite with a spec',
+          status: 'pending',
+          passedExpectations: [],
+          failedExpectations: []
+        };
+      }
+
+      function reportWithSpecStatus(specStatus) {
+        reporter.specStarted(specStatus);
+        reporter.specDone(specStatus);
+        reporter.jasmineDone({});
+      }
+
      beforeEach(function() {
        container = document.createElement('div');
        const getContainer = function() {
@@ -1429,21 +1446,10 @@ describe('HtmlReporter', function() {
        reporter.initialize();

        reporter.jasmineStarted({ totalSpecsDefined: 1 });
-        const specStatus = {
-          id: 123,
-          description: 'with a spec',
-          fullName: 'A Suite with a spec',
-          status: 'pending',
-          passedExpectations: [],
-          failedExpectations: [],
-          pendingReason: 'my custom pending reason'
-        };
-        reporter.specStarted(specStatus);
-        reporter.specDone(specStatus);
-        reporter.jasmineDone({});
      });

      it('reports the pending specs count', function() {
+        reportWithSpecStatus(pendingSpecStatus());
        const alertBar = container.querySelector('.jasmine-alert .jasmine-bar');

        expect(alertBar.innerHTML).toMatch(
@@ -1452,17 +1458,36 @@ describe('HtmlReporter', function() {
      });

      it('reports no failure details', function() {
+        reportWithSpecStatus(pendingSpecStatus());
        const specFailure = container.querySelector('.jasmine-failures');

        expect(specFailure.childNodes.length).toEqual(0);
      });

      it('displays the custom pending reason', function() {
+        reportWithSpecStatus({
+          ...pendingSpecStatus(),
+          pendingReason: 'my custom pending reason'
+        });
        const pendingDetails = container.querySelector(
          '.jasmine-summary .jasmine-pending'
        );

-        expect(pendingDetails.innerHTML).toContain('my custom pending reason');
+        expect(pendingDetails.innerHTML).toContain(
+          'PENDING WITH MESSAGE: my custom pending reason'
+        );
+      });
+
+      it('indicates that the spec is pending even if there is no reason', function() {
+        reportWithSpecStatus({
+          ...pendingSpecStatus(),
+          pendingReason: ''
+        });
+        const pendingDetails = container.querySelector(
+          '.jasmine-summary .jasmine-pending'
+        );
+
+        expect(pendingDetails.innerHTML).toContain('PENDING');
      });
    });

--- a/src/core/Env.js
+++ b/src/core/Env.js
@@ -674,17 +674,23 @@ getJasmineRequireObj().Env = function(j$) {

    this.describe = function(description, definitionFn) {
      ensureIsNotNested('describe');
-      return suiteBuilder.describe(description, definitionFn).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.describe(description, definitionFn, filename)
+        .metadata;
    };

    this.xdescribe = function(description, definitionFn) {
      ensureIsNotNested('xdescribe');
-      return suiteBuilder.xdescribe(description, definitionFn).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.xdescribe(description, definitionFn, filename)
+        .metadata;
    };

    this.fdescribe = function(description, definitionFn) {
      ensureIsNotNested('fdescribe');
-      return suiteBuilder.fdescribe(description, definitionFn).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.fdescribe(description, definitionFn, filename)
+        .metadata;
    };

    function specResultCallback(spec, result, next) {
@@ -711,17 +717,20 @@ getJasmineRequireObj().Env = function(j$) {

    this.it = function(description, fn, timeout) {
      ensureIsNotNested('it');
-      return suiteBuilder.it(description, fn, timeout).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.it(description, fn, timeout, filename).metadata;
    };

    this.xit = function(description, fn, timeout) {
      ensureIsNotNested('xit');
-      return suiteBuilder.xit(description, fn, timeout).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.xit(description, fn, timeout, filename).metadata;
    };

    this.fit = function(description, fn, timeout) {
      ensureIsNotNested('fit');
-      return suiteBuilder.fit(description, fn, timeout).metadata;
+      const filename = callerCallerFilename();
+      return suiteBuilder.fit(description, fn, timeout, filename).metadata;
    };

    /**
@@ -861,5 +870,9 @@ getJasmineRequireObj().Env = function(j$) {
    };
  }

+  function callerCallerFilename() {
+    return new j$.StackTrace(new Error()).frames[3].file;
+  }
+
  return Env;
 };
--- a/src/core/ExceptionFormatter.js
+++ b/src/core/ExceptionFormatter.js
@@ -67,7 +67,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
        lines.unshift(stackTrace.message);
      }

-      if (error.cause) {
+      if (error.cause && error.cause instanceof Error) {
        const substack = this.stack_(error.cause, {
          messageHandling: 'require'
        });
--- a/src/core/Spec.js
+++ b/src/core/Spec.js
@@ -4,6 +4,8 @@ getJasmineRequireObj().Spec = function(j$) {
    this.asyncExpectationFactory = attrs.asyncExpectationFactory;
    this.resultCallback = attrs.resultCallback || function() {};
    this.id = attrs.id;
+    this.filename = attrs.filename;
+    this.parentSuiteId = attrs.parentSuiteId;
    this.description = attrs.description || '';
    this.queueableFn = attrs.queueableFn;
    this.beforeAndAfterFns =
@@ -37,35 +39,7 @@ getJasmineRequireObj().Spec = function(j$) {
      this.exclude();
    }

-    /**
-     * @typedef SpecResult
-     * @property {String} id - The unique id of this spec.
-     * @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 {Expectation[]} failedExpectations - The list of expectations that failed during execution of this spec.
-     * @property {Expectation[]} passedExpectations - The list of expectations that passed during execution of this spec.
-     * @property {Expectation[]} 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 {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.
-     * @since 2.0.0
-     */
-    this.result = {
-      id: this.id,
-      description: this.description,
-      fullName: this.getFullName(),
-      failedExpectations: [],
-      passedExpectations: [],
-      deprecationWarnings: [],
-      pendingReason: '',
-      duration: null,
-      properties: null,
-      debugLogs: null
-    };
-
-    this.reportedDone = false;
+    this.reset();
  }

  Spec.prototype.addExpectationResult = function(passed, data, isError) {
@@ -175,14 +149,33 @@ getJasmineRequireObj().Spec = function(j$) {
  };

  Spec.prototype.reset = function() {
+    /**
+     * @typedef SpecResult
+     * @property {String} id - The unique id of this spec.
+     * @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 - The name of the file the spec was defined in.
+     * @property {Expectation[]} failedExpectations - The list of expectations that failed during execution of this spec.
+     * @property {Expectation[]} passedExpectations - The list of expectations that passed during execution of this spec.
+     * @property {Expectation[]} 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 {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.
+     * @since 2.0.0
+     */
    this.result = {
      id: this.id,
      description: this.description,
      fullName: this.getFullName(),
+      parentSuiteId: this.parentSuiteId,
+      filename: this.filename,
      failedExpectations: [],
      passedExpectations: [],
      deprecationWarnings: [],
-      pendingReason: this.excludeMessage,
+      pendingReason: this.excludeMessage || '',
      duration: null,
      properties: null,
      debugLogs: null
--- a/src/core/Suite.js
+++ b/src/core/Suite.js
@@ -4,6 +4,8 @@ getJasmineRequireObj().Suite = function(j$) {
    this.id = attrs.id;
    this.parentSuite = attrs.parentSuite;
    this.description = attrs.description;
+    this.reportedParentSuiteId = attrs.reportedParentSuiteId;
+    this.filename = attrs.filename;
    this.expectationFactory = attrs.expectationFactory;
    this.asyncExpectationFactory = attrs.asyncExpectationFactory;
    this.throwOnExpectationFailure = !!attrs.throwOnExpectationFailure;
@@ -109,6 +111,8 @@ getJasmineRequireObj().Suite = function(j$) {
     * @property {String} id - The unique id of this suite.
     * @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 - The name of the file the suite was defined in.
     * @property {Expectation[]} failedExpectations - The list of expectations that failed in an {@link afterAll} for this suite.
     * @property {Expectation[]} 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.
@@ -120,6 +124,8 @@ getJasmineRequireObj().Suite = function(j$) {
      id: this.id,
      description: this.description,
      fullName: this.getFullName(),
+      parentSuiteId: this.reportedParentSuiteId,
+      filename: this.filename,
      failedExpectations: [],
      deprecationWarnings: [],
      duration: null,
--- a/src/core/SuiteBuilder.js
+++ b/src/core/SuiteBuilder.js
@@ -22,9 +22,9 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      this.focusedRunables = [];
    }

-    describe(description, definitionFn) {
+    describe(description, definitionFn, filename) {
      ensureIsFunction(definitionFn, 'describe');
-      const suite = this.suiteFactory_(description);
+      const suite = this.suiteFactory_(description, filename);
      if (definitionFn.length > 0) {
        throw new Error('describe does not expect any arguments');
      }
@@ -35,9 +35,9 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      return suite;
    }

-    fdescribe(description, definitionFn) {
+    fdescribe(description, definitionFn, filename) {
      ensureIsFunction(definitionFn, 'fdescribe');
-      const suite = this.suiteFactory_(description);
+      const suite = this.suiteFactory_(description, filename);
      suite.isFocused = true;

      this.focusedRunables.push(suite.id);
@@ -47,37 +47,37 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      return suite;
    }

-    xdescribe(description, definitionFn) {
+    xdescribe(description, definitionFn, filename) {
      ensureIsFunction(definitionFn, 'xdescribe');
-      const suite = this.suiteFactory_(description);
+      const suite = this.suiteFactory_(description, filename);
      suite.exclude();
      this.addSpecsToSuite_(suite, definitionFn);

      return suite;
    }

-    it(description, fn, timeout) {
+    it(description, fn, timeout, filename) {
      // it() sometimes doesn't have a fn argument, so only check the type if
      // it's given.
      if (arguments.length > 1 && typeof fn !== 'undefined') {
        ensureIsFunctionOrAsync(fn, 'it');
      }

-      return this.it_(description, fn, timeout);
+      return this.it_(description, fn, timeout, filename);
    }

-    xit(description, fn, timeout) {
+    xit(description, fn, timeout, filename) {
      // xit(), like it(), doesn't always have a fn argument, so only check the
      // type when needed.
      if (arguments.length > 1 && typeof fn !== 'undefined') {
        ensureIsFunctionOrAsync(fn, 'xit');
      }
-      const spec = this.it_(description, fn, timeout);
+      const spec = this.it_(description, fn, timeout, filename);
      spec.exclude('Temporarily disabled with xit');
      return spec;
    }

-    fit(description, fn, timeout) {
+    fit(description, fn, timeout, filename) {
      // Unlike it and xit, the function is required because it doesn't make
      // sense to focus on nothing.
      ensureIsFunctionOrAsync(fn, 'fit');
@@ -85,7 +85,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      if (timeout) {
        j$.util.validateTimeout(timeout);
      }
-      const spec = this.specFactory_(description, fn, timeout);
+      const spec = this.specFactory_(description, fn, timeout, filename);
      this.currentDeclarationSuite_.addChild(spec);
      this.focusedRunables.push(spec.id);
      this.unfocusAncestor_();
@@ -145,12 +145,12 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      });
    }

-    it_(description, fn, timeout) {
+    it_(description, fn, timeout, filename) {
      if (timeout) {
        j$.util.validateTimeout(timeout);
      }

-      const spec = this.specFactory_(description, fn, timeout);
+      const spec = this.specFactory_(description, fn, timeout, filename);
      if (this.currentDeclarationSuite_.markedExcluding) {
        spec.exclude();
      }
@@ -159,12 +159,17 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      return spec;
    }

-    suiteFactory_(description) {
+    suiteFactory_(description, filename) {
      const config = this.env_.configuration();
+      const parentSuite = this.currentDeclarationSuite_;
+      const reportedParentSuiteId =
+        parentSuite === this.topSuite ? null : parentSuite.id;
      return new j$.Suite({
        id: 'suite' + this.nextSuiteId_++,
        description,
-        parentSuite: this.currentDeclarationSuite_,
+        filename,
+        parentSuite,
+        reportedParentSuiteId,
        timer: new j$.Timer(),
        expectationFactory: this.expectationFactory_,
        asyncExpectationFactory: this.suiteAsyncExpectationFactory_,
@@ -196,12 +201,15 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
      this.currentDeclarationSuite_ = parentSuite;
    }

-    specFactory_(description, fn, timeout) {
+    specFactory_(description, fn, timeout, filename) {
      this.totalSpecsDefined++;
      const config = this.env_.configuration();
      const suite = this.currentDeclarationSuite_;
+      const parentSuiteId = suite === this.topSuite ? null : suite.id;
      const spec = new j$.Spec({
        id: 'spec' + this.nextSpecId_++,
+        filename,
+        parentSuiteId,
        beforeAndAfterFns: beforeAndAfterFns(suite),
        expectationFactory: this.expectationFactory_,
        asyncExpectationFactory: this.specAsyncExpectationFactory_,
--- a/src/core/buildExpectationResult.js
+++ b/src/core/buildExpectationResult.js
@@ -69,11 +69,7 @@ getJasmineRequireObj().buildExpectationResult = function(j$) {
        } else if (options.stack) {
          error = options;
        } else {
-          try {
-            throw new Error(message());
-          } catch (e) {
-            error = e;
-          }
+          error = new Error(message());
        }
      }
      // Omit the message from the stack trace because it will be
--- a/src/html/HtmlReporter.js
+++ b/src/html/HtmlReporter.js
@@ -498,14 +498,13 @@ jasmineRequire.HtmlReporter = function(j$) {
          if (noExpectations(resultNode.result)) {
            specDescription = 'SPEC HAS NO EXPECTATIONS ' + specDescription;
          }
-          if (
-            resultNode.result.status === 'pending' &&
-            resultNode.result.pendingReason !== ''
-          ) {
-            specDescription =
-              specDescription +
-              ' PENDING WITH MESSAGE: ' +
-              resultNode.result.pendingReason;
+          if (resultNode.result.status === 'pending') {
+            if (resultNode.result.pendingReason !== '') {
+              specDescription +=
+                ' PENDING WITH MESSAGE: ' + resultNode.result.pendingReason;
+            } else {
+              specDescription += ' PENDING';
+            }
          }
          specListNode.appendChild(
            createDom(
--- a/src/html/_HTMLReporter.scss
+++ b/src/html/_HTMLReporter.scss
@@ -3,11 +3,13 @@
 $line-height: 14px;
 $margin-unit: 14px;

-$faint-text-color: #aaa;
 $light-text-color: #666;
 $text-color: #333;
+$inactive-tab-text-color: blue;
+$active-tab-text-color: #000;

 $page-background-color: #eee;
+$menu-background-color: #aaa;

 $passing-color: #007069;
 $failing-color: #ca3a11;
@@ -91,10 +93,6 @@ body {
    right: 100%;
  }

-  .jasmine-version {
-    color: $faint-text-color;
-  }
-
  //--- Banner ---//

  .jasmine-banner {
@@ -238,10 +236,11 @@ body {

    &.jasmine-menu {
      background-color: #fff;
-      color: $faint-text-color;
+      color: $active-tab-text-color;

      a {
-        color: $text-color;
+        color: $inactive-tab-text-color;
+        text-decoration: underline;
      }
    }
Author	SHA1	Message	Date
Steve Gravrock	e4f8669835	Bump version to 4.6.1	2024-05-25 10:16:04 -07:00
Steve Gravrock	26be252e70	Removed unnecessary throw when building stack trace Since 4.0, all supported JS runtimes populate the stack property of Error objects when the Error is instantiated, not when it's thrown.	2024-05-25 10:00:26 -07:00
Steve Gravrock	2a1b7a04f7	Fix Chrome on CI	2024-05-25 10:00:26 -07:00
Steve Gravrock	4c8a4f2b00	Built distribution	2024-05-24 17:19:18 -07:00
angrycat9000	8bc95ae2e3	Skip parsing cause if it is not an Error object * Merges #2013 from @angrycat9000 * Fixes #2011	2024-05-24 17:18:35 -07:00
Steve Gravrock	80b9d6c2e0	CI: Use a globally-unique Sauce tunnel ID CIRCLE_BUILD_NUM is only unique per-repo, and we have multiple repos that can concurrently run Sauce builds.	2024-05-24 17:15:34 -07:00
Steve Gravrock	66ffb5f7a3	Accessibility: Always provide a non-color indication that a spec is pending	2024-05-24 17:15:26 -07:00
Steve Gravrock	225194c343	Accessibility: Improved contrast of version number and inactive tab links	2024-05-24 17:15:19 -07:00
Steve Gravrock	7a75cc7643	Updated copyright date	2024-05-24 17:15:06 -07:00
Steve Gravrock	ec7a9e2416	Fixed formatting of copyright notice in README	2024-05-24 17:14:48 -07:00
Steve Gravrock	7896ae84e6	Updated copyright notices The Pivotal copyright notice needs to be retained. That's the right thing to do and the MIT license requires it. However, using it by itself becomes more obviously incorrect with each passing year since Pivotal ceased to exist. Moreover, Pivotal hasn't actually been the sole copyright owner since the first external contribution was merged. Contributors were not asked to sign a copyright assignment, so they retain copyright to their contributions. "Copyright (c) 2008-2019 Pivotal Labs" complies with the terms of the license and acknowledges Pivotal's outsized role in developing Jasmine. "Copyright (c) 2008-$YEAR The Jasmine developers" acknowledges all authors and will remain correct in the future.	2024-05-24 17:14:32 -07:00
Steve Gravrock	f509078020	Bump version to 4.6.0	2023-03-15 17:21:56 -07:00
Steve Gravrock	ff237f4b66	Fixed sass version pinning	2023-03-11 14:26:22 -08:00
Steve Gravrock	e42e3d9e00	Pin sass to the last version that works on Node 12	2023-03-11 14:19:16 -08:00
Steve Gravrock	166e5f4d6c	Report the ID of each suite/spec's parent This is intended to support parallel execution, which is planned for a future release of Jasmine. Because the execution of unrelated suites will interleave when run in parallel, reporters will not be able to assume that the most recent `suiteStarted` event identifies the parent of the current suite/spec. By adding this feature now, we allow reporters to support both parallel execution and at least some 4.x versions without having to implement two different ways of finding the parent suite.	2023-02-25 10:24:14 -08:00
Steve Gravrock	6ad8d20694	Report the path/url of the file that the spec/suite was defined in Fixes #1884	2023-02-15 21:39:21 -08:00
Steve Gravrock	bc3a495160	Pin eslint-plugin-compat to <4.1.0 to fix import error on CI See <https://github.com/amilajack/eslint-plugin-compat/issues/528>.	2023-02-07 18:46:17 -08:00
Steve Gravrock	b323631611	Pin Grunt to <1.6.0 for compatiblity with Node 12	2023-01-30 17:57:47 -08:00
Steve Gravrock	e8767ba660	Removed "Does the problem occur with the latest version of jasmine-core" from issue templates	2023-01-25 20:50:51 -08:00
Steve Gravrock	169a2a8ad2	Upgraded to new issue templates	2022-11-20 14:01:43 -08:00
Steve Gravrock	b267029301	Revert "Upgraded to new issue templates" This reverts commit `cf574634b8`.	2022-11-20 13:58:20 -08:00
Steve Gravrock	cf574634b8	Upgraded to new issue templates	2022-11-20 13:56:47 -08:00
Steve Gravrock	f8c01574e6	Added Firefox 102 (current ESR) to browser list in README	2022-10-29 15:26:30 -07:00