Merge branch 'main' into 3.99

Author: sgravrock

lib/jasmine.js

@@ -583,7 +583,11 @@ Jasmine.prototype.execute = async function(files, filterString) {
 
   await this.loadSpecs();
 
-  this.addReporter(this.completionReporter);
+  if (!this.completionReporterInstalled_) {
+    this.addReporter(this.completionReporter);
+    this.completionReporterInstalled_ = true;
+  }
+  
   let overallResult;
   this.addReporter({
     jasmineDone: r => overallResult = r

lib/reporters/console_reporter.js

@@ -93,7 +93,7 @@ function ConsoleReporter() {
     }
 
     if (result && result.failedExpectations && result.failedExpectations.length > 0) {
-      suiteFailureDetails(result);
+      suiteFailureDetails({ fullName: 'top suite', ...result });
     }
 
     if (pendingSpecs.length > 0) {

release_notes/3.10.0.md

@@ -0,0 +1,52 @@
+# Jasmine NPM 3.10 Release Notes
+
+This release updates the jasmine-core dependency to 3.10.0. See the
+[jasmine-core release notes](https://github.com/pivotal/jasmine/blob/main/release_notes/3.10.0.md)
+for more information.
+
+## New features and bugfixes
+
+* Support for executing the suite multiple times
+  * See the jasmine-core release notes for details
+
+* Display the top suite name as "top suite", not "undefined" when reporting 
+  suite-level failures
+
+* Fixed reporting of load-time errors from modules imported by specs
+
+* Made the promise returned from `Jasmine#execute` usable
+  * Added an exitOnCompletion property to directly control whether Jasmine
+    should make the Node process exit. Previously this could only be done by
+    calling `Jasmine#onComplete`.
+  * The promise returned from `Jasmine#execute` is resolved to the overall
+    status.
+
+* Improved interface for programmatically adding files
+  * Added Jasmine#addHelperFile
+  * Added more clearly named synonyms for Jasmine#addSpecFiles and
+    Jasmine#addHelperFiles, and marked the old ones deprecated
+
+
+## Documentation improvements
+
+* Added jsdoc for `Jasmine#env`
+
+
+## Internal updates
+
+* Pass stopOnSpecFailure and stopSpecOnExpectationFailure options to core, 
+  not the deprecated failFast and oneFailurePerSpec options
+
+* Replaced var with const and let
+
+* Test suite improvements
+
+## Supported environments
+
+The jasmine NPM package has been tested on Node 12, 14, and 16. See the
+[jasmine-core release notes](https://github.com/jasmine/jasmine/blob/main/release_notes/3.10.0.md)
+for supported browsers.
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

spec/jasmine_spec.js

@@ -570,7 +570,7 @@ describe('Jasmine', function() {
       expect(this.testJasmine.env.configure).toHaveBeenCalledWith({specFilter: jasmine.any(Function)});
     });
 
-    it('adds an exit code reporter', async function() {
+    it('adds an exit code reporter the first time execute is called', async function() {
       const completionReporterSpy = jasmine.createSpyObj('reporter', ['onComplete']);
       this.testJasmine.completionReporter = completionReporterSpy;
       spyOn(this.testJasmine, 'addReporter');
@@ -579,6 +579,12 @@ describe('Jasmine', function() {
 
       expect(this.testJasmine.addReporter).toHaveBeenCalledWith(completionReporterSpy);
       expect(this.testJasmine.completionReporter.exitHandler).toBe(this.testJasmine.checkExit);
+      this.testJasmine.addReporter.calls.reset();
+
+      await this.testJasmine.execute();
+      expect(this.testJasmine.addReporter).not.toHaveBeenCalledWith(
+        completionReporterSpy
+      );
     });
 
     describe('when exit is called prematurely', function() {

spec/reporters/console_reporter_spec.js

@@ -551,16 +551,22 @@ describe("ConsoleReporter", function() {
     const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
-      showColors: true
+      showColors: false
     });
 
-    reporter.suiteDone({ failedExpectations: [{ message: 'After All Exception' }] });
-    reporter.suiteDone({ failedExpectations: [{ message: 'Some Other Exception' }] });
+    reporter.suiteDone({
+      fullName: 'suite 1',
+      failedExpectations: [{ message: 'After All Exception' }]
+    });
+    reporter.suiteDone({
+      fullName: 'suite 2',
+      failedExpectations: [{ message: 'Some Other Exception' }]
+    });
     reporter.jasmineDone({ failedExpectations: [{ message: 'Global Exception' }] });
 
-    expect(this.out.getOutput()).toMatch(/After All Exception/);
-    expect(this.out.getOutput()).toMatch(/Some Other Exception/);
-    expect(this.out.getOutput()).toMatch(/Global Exception/);
+    expect(this.out.getOutput()).toMatch(/Suite error: suite 1\s+Message:\s+After All Exception/);
+    expect(this.out.getOutput()).toMatch(/Suite error: suite 2\s+Message:\s+Some Other Exception/);
+    expect(this.out.getOutput()).toMatch(/Suite error: top suite\s+Message:\s+Global Exception/);
   });
 
   describe("with color", function() {