Converted ReportDispatcher to promises

lib/jasmine-core/jasmine.js

@@ -1843,12 +1843,12 @@ getJasmineRequireObj().Env = function(j$) {
     function specStarted(spec, suite, next) {
       runner.currentSpec = spec;
       runableResources.initForRunable(spec.id, suite.id);
-      reporter.specStarted(spec.result, next);
+      reporter.specStarted(spec.result).then(next);
     }
 
     function reportSpecDone(spec, result, next) {
       spec.reportedDone = true;
-      reporter.specDone(result, next);
+      reporter.specDone(result).then(next);
     }
 
     this.it = function(description, fn, timeout) {
@@ -7700,7 +7700,7 @@ getJasmineRequireObj().ReportDispatcher = function(j$) {
     for (const method of dispatchedMethods) {
       this[method] = (function(m) {
         return function() {
-          dispatch(m, arguments);
+          return dispatch(m, arguments);
         };
       })(method);
     }
@@ -7726,16 +7726,15 @@ getJasmineRequireObj().ReportDispatcher = function(j$) {
       if (reporters.length === 0 && fallbackReporter !== null) {
         reporters.push(fallbackReporter);
       }
-      const onComplete = args[args.length - 1];
-      args = Array.from(args).splice(0, args.length - 1);
       const fns = [];
       for (const reporter of reporters) {
         addFn(fns, reporter, method, args);
       }
 
+      return new Promise(function(resolve) {
         queueRunnerFactory({
           queueableFns: fns,
-        onComplete: onComplete,
+          onComplete: resolve,
           isReporter: true,
           onMultipleDone: function() {
             onLateError(
@@ -7746,6 +7745,7 @@ getJasmineRequireObj().ReportDispatcher = function(j$) {
             );
           }
         });
+      });
     }
 
     function addFn(fns, reporter, method, args) {
@@ -8400,7 +8400,6 @@ getJasmineRequireObj().Runner = function(j$) {
       this.executedBefore_ = true;
 
       this.hasFailures = false;
-      const totalSpecsDefined = this.totalSpecsDefined_();
       const focusedRunables = this.focusedRunables_();
       const config = this.getConfig_();
 
@@ -8439,7 +8438,7 @@ getJasmineRequireObj().Runner = function(j$) {
         nodeStart: (suite, next) => {
           this.currentlyExecutingSuites_.push(suite);
           this.runableResources_.initForRunable(suite.id, suite.parentSuite.id);
-          this.reporter_.suiteStarted(suite.result, next);
+          this.reporter_.suiteStarted(suite.result).then(next);
           suite.startTimer();
         },
         nodeComplete: (suite, result, next) => {
@@ -8477,26 +8476,24 @@ getJasmineRequireObj().Runner = function(j$) {
         );
       }
 
+      return this.execute2_(runablesToRun, order, processor);
+    }
+
+    async execute2_(runablesToRun, order, processor) {
+      const totalSpecsDefined = this.totalSpecsDefined_();
+
       this.runableResources_.initForRunable(this.topSuite_.id);
       const jasmineTimer = new j$.Timer();
       jasmineTimer.start();
 
-      return new Promise(resolve => {
+      await this.reporter_.jasmineStarted({
-        /**
-         * Information passed to the {@link Reporter#jasmineStarted} event.
-         * @typedef JasmineStartedInfo
-         * @property {Int} totalSpecsDefined - The total number of specs defined in this suite.
-         * @property {Order} order - Information about the ordering (random or not) of this execution of the suite.
-         * @since 2.0.0
-         */
-        this.reporter_.jasmineStarted(
-          {
         totalSpecsDefined,
         order: order
-          },
+      });
-          () => {
+
       this.currentlyExecutingSuites_.push(this.topSuite_);
 
+      return new Promise(resolve => {
         processor.execute(() => {
           (async () => {
             if (this.topSuite_.hadBeforeAllFailure) {
@@ -8512,7 +8509,7 @@ getJasmineRequireObj().Runner = function(j$) {
               this.topSuite_.result.failedExpectations.length > 0
             ) {
               overallStatus = 'failed';
-                } else if (focusedRunables.length > 0) {
+            } else if (this.focusedRunables_().length > 0) {
               overallStatus = 'incomplete';
               incompleteReason = 'fit() or fdescribe() was found';
             } else if (totalSpecsDefined === 0) {
@@ -8542,41 +8539,32 @@ getJasmineRequireObj().Runner = function(j$) {
               deprecationWarnings: this.topSuite_.result.deprecationWarnings
             };
             this.topSuite_.reportedDone = true;
-                this.reporter_.jasmineDone(jasmineDoneInfo, function() {
+            await this.reporter_.jasmineDone(jasmineDoneInfo);
             resolve(jasmineDoneInfo);
-                });
           })();
         });
-          }
-        );
       });
     }
 
     reportSuiteDone_(suite, result, next) {
       suite.reportedDone = true;
-      this.reporter_.suiteDone(result, next);
+      this.reporter_.suiteDone(result).then(next);
     }
 
     async reportChildrenOfBeforeAllFailure_(suite) {
       for (const child of suite.children) {
         if (child instanceof j$.Suite) {
-          await new Promise(resolve => {
+          await this.reporter_.suiteStarted(child.result);
-            this.reporter_.suiteStarted(child.result, resolve);
-          });
           await this.reportChildrenOfBeforeAllFailure_(child);
 
           // Marking the suite passed is consistent with how suites that
           // contain failed specs but no suite-level failures are reported.
           child.result.status = 'passed';
 
-          await new Promise(resolve => {
+          await this.reporter_.suiteDone(child.result);
-            this.reporter_.suiteDone(child.result, resolve);
-          });
         } else {
           /* a spec */
-          await new Promise(resolve => {
+          await this.reporter_.specStarted(child.result);
-            this.reporter_.specStarted(child.result, resolve);
-          });
 
           child.addExpectationResult(
             false,

spec/core/ReportDispatcherSpec.js

@@ -18,13 +18,12 @@ describe('ReportDispatcher', function() {
         queueRunnerFactory
       ),
       reporter = jasmine.createSpyObj('reporter', ['foo', 'bar']),
-      anotherReporter = jasmine.createSpyObj('reporter', ['foo', 'bar']),
+      anotherReporter = jasmine.createSpyObj('reporter', ['foo', 'bar']);
-      completeCallback = jasmine.createSpy('complete');
 
     dispatcher.addReporter(reporter);
     dispatcher.addReporter(anotherReporter);
 
-    dispatcher.foo(123, 456, completeCallback);
+    dispatcher.foo(123, 456);
 
     expect(queueRunnerFactory).toHaveBeenCalledWith(
       jasmine.objectContaining({
@@ -47,7 +46,7 @@ describe('ReportDispatcher', function() {
 
     queueRunnerFactory.calls.reset();
 
-    dispatcher.bar('a', 'b', completeCallback);
+    dispatcher.bar('a', 'b');
 
     expect(queueRunnerFactory).toHaveBeenCalledWith(
       jasmine.objectContaining({
@@ -91,11 +90,10 @@ describe('ReportDispatcher', function() {
         ['foo', 'bar'],
         queueRunnerFactory
       ),
-      reporter = jasmine.createSpyObj('reporter', ['foo', 'bar']),
+      reporter = jasmine.createSpyObj('reporter', ['foo', 'bar']);
-      completeCallback = jasmine.createSpy('complete');
 
     dispatcher.provideFallbackReporter(reporter);
-    dispatcher.foo(123, 456, completeCallback);
+    dispatcher.foo(123, 456);
 
     expect(queueRunnerFactory).toHaveBeenCalledWith(
       jasmine.objectContaining({
@@ -116,12 +114,11 @@ describe('ReportDispatcher', function() {
         queueRunnerFactory
       ),
       reporter = jasmine.createSpyObj('reporter', ['foo', 'bar']),
-      fallbackReporter = jasmine.createSpyObj('otherReporter', ['foo', 'bar']),
+      fallbackReporter = jasmine.createSpyObj('otherReporter', ['foo', 'bar']);
-      completeCallback = jasmine.createSpy('complete');
 
     dispatcher.provideFallbackReporter(fallbackReporter);
     dispatcher.addReporter(reporter);
-    dispatcher.foo(123, 456, completeCallback);
+    dispatcher.foo(123, 456);
 
     expect(queueRunnerFactory).toHaveBeenCalledWith(
       jasmine.objectContaining({
@@ -143,11 +140,10 @@ describe('ReportDispatcher', function() {
         queueRunnerFactory
       ),
       reporter1 = jasmine.createSpyObj('reporter1', ['foo', 'bar']),
-      reporter2 = jasmine.createSpyObj('reporter2', ['foo', 'bar']),
+      reporter2 = jasmine.createSpyObj('reporter2', ['foo', 'bar']);
-      completeCallback = jasmine.createSpy('complete');
 
     dispatcher.addReporter(reporter1);
-    dispatcher.foo(123, completeCallback);
+    dispatcher.foo(123);
     expect(queueRunnerFactory).toHaveBeenCalledWith(
       jasmine.objectContaining({
         queueableFns: [{ fn: jasmine.any(Function) }],
@@ -161,7 +157,7 @@ describe('ReportDispatcher', function() {
 
     dispatcher.clearReporters();
     dispatcher.addReporter(reporter2);
-    dispatcher.bar(456, completeCallback);
+    dispatcher.bar(456);
 
     expect(queueRunnerFactory).toHaveBeenCalledWith(
       jasmine.objectContaining({

src/core/Env.js

@@ -701,12 +701,12 @@ getJasmineRequireObj().Env = function(j$) {
     function specStarted(spec, suite, next) {
       runner.currentSpec = spec;
       runableResources.initForRunable(spec.id, suite.id);
-      reporter.specStarted(spec.result, next);
+      reporter.specStarted(spec.result).then(next);
     }
 
     function reportSpecDone(spec, result, next) {
       spec.reportedDone = true;
-      reporter.specDone(result, next);
+      reporter.specDone(result).then(next);
     }
 
     this.it = function(description, fn, timeout) {

src/core/ReportDispatcher.js

@@ -5,7 +5,7 @@ getJasmineRequireObj().ReportDispatcher = function(j$) {
     for (const method of dispatchedMethods) {
       this[method] = (function(m) {
         return function() {
-          dispatch(m, arguments);
+          return dispatch(m, arguments);
         };
       })(method);
     }
@@ -31,16 +31,15 @@ getJasmineRequireObj().ReportDispatcher = function(j$) {
       if (reporters.length === 0 && fallbackReporter !== null) {
         reporters.push(fallbackReporter);
       }
-      const onComplete = args[args.length - 1];
-      args = Array.from(args).splice(0, args.length - 1);
       const fns = [];
       for (const reporter of reporters) {
         addFn(fns, reporter, method, args);
       }
 
+      return new Promise(function(resolve) {
         queueRunnerFactory({
           queueableFns: fns,
-        onComplete: onComplete,
+          onComplete: resolve,
           isReporter: true,
           onMultipleDone: function() {
             onLateError(
@@ -51,6 +50,7 @@ getJasmineRequireObj().ReportDispatcher = function(j$) {
             );
           }
         });
+      });
     }
 
     function addFn(fns, reporter, method, args) {

src/core/Runner.js

@@ -37,7 +37,6 @@ getJasmineRequireObj().Runner = function(j$) {
       this.executedBefore_ = true;
 
       this.hasFailures = false;
-      const totalSpecsDefined = this.totalSpecsDefined_();
       const focusedRunables = this.focusedRunables_();
       const config = this.getConfig_();
 
@@ -76,7 +75,7 @@ getJasmineRequireObj().Runner = function(j$) {
         nodeStart: (suite, next) => {
           this.currentlyExecutingSuites_.push(suite);
           this.runableResources_.initForRunable(suite.id, suite.parentSuite.id);
-          this.reporter_.suiteStarted(suite.result, next);
+          this.reporter_.suiteStarted(suite.result).then(next);
           suite.startTimer();
         },
         nodeComplete: (suite, result, next) => {
@@ -114,26 +113,24 @@ getJasmineRequireObj().Runner = function(j$) {
         );
       }
 
+      return this.execute2_(runablesToRun, order, processor);
+    }
+
+    async execute2_(runablesToRun, order, processor) {
+      const totalSpecsDefined = this.totalSpecsDefined_();
+
       this.runableResources_.initForRunable(this.topSuite_.id);
       const jasmineTimer = new j$.Timer();
       jasmineTimer.start();
 
-      return new Promise(resolve => {
+      await this.reporter_.jasmineStarted({
-        /**
-         * Information passed to the {@link Reporter#jasmineStarted} event.
-         * @typedef JasmineStartedInfo
-         * @property {Int} totalSpecsDefined - The total number of specs defined in this suite.
-         * @property {Order} order - Information about the ordering (random or not) of this execution of the suite.
-         * @since 2.0.0
-         */
-        this.reporter_.jasmineStarted(
-          {
         totalSpecsDefined,
         order: order
-          },
+      });
-          () => {
+
       this.currentlyExecutingSuites_.push(this.topSuite_);
 
+      return new Promise(resolve => {
         processor.execute(() => {
           (async () => {
             if (this.topSuite_.hadBeforeAllFailure) {
@@ -149,7 +146,7 @@ getJasmineRequireObj().Runner = function(j$) {
               this.topSuite_.result.failedExpectations.length > 0
             ) {
               overallStatus = 'failed';
-                } else if (focusedRunables.length > 0) {
+            } else if (this.focusedRunables_().length > 0) {
               overallStatus = 'incomplete';
               incompleteReason = 'fit() or fdescribe() was found';
             } else if (totalSpecsDefined === 0) {
@@ -179,41 +176,32 @@ getJasmineRequireObj().Runner = function(j$) {
               deprecationWarnings: this.topSuite_.result.deprecationWarnings
             };
             this.topSuite_.reportedDone = true;
-                this.reporter_.jasmineDone(jasmineDoneInfo, function() {
+            await this.reporter_.jasmineDone(jasmineDoneInfo);
             resolve(jasmineDoneInfo);
-                });
           })();
         });
-          }
-        );
       });
     }
 
     reportSuiteDone_(suite, result, next) {
       suite.reportedDone = true;
-      this.reporter_.suiteDone(result, next);
+      this.reporter_.suiteDone(result).then(next);
     }
 
     async reportChildrenOfBeforeAllFailure_(suite) {
       for (const child of suite.children) {
         if (child instanceof j$.Suite) {
-          await new Promise(resolve => {
+          await this.reporter_.suiteStarted(child.result);
-            this.reporter_.suiteStarted(child.result, resolve);
-          });
           await this.reportChildrenOfBeforeAllFailure_(child);
 
           // Marking the suite passed is consistent with how suites that
           // contain failed specs but no suite-level failures are reported.
           child.result.status = 'passed';
 
-          await new Promise(resolve => {
+          await this.reporter_.suiteDone(child.result);
-            this.reporter_.suiteDone(child.result, resolve);
-          });
         } else {
           /* a spec */
-          await new Promise(resolve => {
+          await this.reporter_.specStarted(child.result);
-            this.reporter_.specStarted(child.result, resolve);
-          });
 
           child.addExpectationResult(
             false,