Revert 00ca06b; closes #3414

- Updates events test to match correct event order - Add test for retries-and-bail case
mochajs · Feb 7, 2019 · aa33f40 · aa33f40
1 parent 52b9a5f
commit aa33f40
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 18 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -876,15 +876,11 @@ Runner.prototype.run = function(fn) {
     if (self._delay) {
       self.emit(constants.EVENT_DELAY_END);
     }
-    Runner.immediately(function() {
-      self.emit(constants.EVENT_RUN_BEGIN);
-    });
+    self.emit(constants.EVENT_RUN_BEGIN);
 
     self.runSuite(rootSuite, function() {
       debug('finished running');
-      Runner.immediately(function() {
-        self.emit(constants.EVENT_RUN_END);
-      });
+      self.emit(constants.EVENT_RUN_END);
     });
   }
 

diff --git a/test/integration/events.spec.js b/test/integration/events.spec.js
@@ -75,4 +75,23 @@ describe('event order', function() {
       });
     });
   });
+
+  describe('--retries and --bail test case', function() {
+    it('should assert --retries event order', function(done) {
+      runMochaJSON(
+        'runner/events-bail-retries.fixture.js',
+        ['--retries', '1', '--bail'],
+        function(err, res) {
+          if (err) {
+            done(err);
+            return;
+          }
+          expect(res, 'to have failed with error', 'error test A')
+            .and('to have failed test count', 1)
+            .and('to have passed test count', 0);
+          done();
+        }
+      );
+    });
+  });
 });
diff --git a/test/integration/fixtures/runner/events-bail-retries.fixture.js b/test/integration/fixtures/runner/events-bail-retries.fixture.js
@@ -0,0 +1,27 @@
+'use strict';
+var Runner = require('../../../../lib/runner.js');
+var assert = require('assert');
+
+var emitOrder = [
+  'start', 'suite', 'suite',
+  'hook', 'hook end', 'test', 'hook', 'hook end', 'retry', 'hook', 'hook end',
+  'test', 'hook', 'hook end', 'fail', 'test end', 'hook', 'hook end', 'hook', 'hook end',
+  'suite end', 'suite end', 'end'
+];
+
+var realEmit = Runner.prototype.emit;
+Runner.prototype.emit = function(event, ...args) {
+  // console.log(`emit: ${event}`);
+  assert.strictEqual(event, emitOrder.shift());
+  return realEmit.call(this, event, ...args);
+};
+
+describe('suite A', function() {
+  before('before', function() {});
+  beforeEach('beforeEach', function() {});
+  it('test A', function() {
+    throw new Error('error test A');
+  });
+  afterEach('afterEach', function() {});
+  after('after', function() {});
+});
diff --git a/test/integration/fixtures/runner/events-bail.fixture.js b/test/integration/fixtures/runner/events-bail.fixture.js
@@ -13,9 +13,9 @@ var EVENT_TEST_END = constants.EVENT_TEST_END;
 var EVENT_TEST_FAIL = constants.EVENT_TEST_FAIL;
 
 var emitOrder = [
-  EVENT_SUITE_BEGIN, // incorrect order
   EVENT_RUN_BEGIN,
   EVENT_SUITE_BEGIN,
+  EVENT_SUITE_BEGIN,
   EVENT_HOOK_BEGIN,
   EVENT_HOOK_END,
   EVENT_TEST_BEGIN,

diff --git a/test/integration/fixtures/runner/events-basic.fixture.js b/test/integration/fixtures/runner/events-basic.fixture.js
@@ -18,9 +18,9 @@ var EVENT_TEST_PENDING = constants.EVENT_TEST_PENDING;
 var EVENT_TEST_RETRY = constants.EVENT_TEST_RETRY;
 
 var emitOrder = [
-  EVENT_SUITE_BEGIN, // incorrect order
   EVENT_RUN_BEGIN,
   EVENT_SUITE_BEGIN,
+  EVENT_SUITE_BEGIN,
   EVENT_HOOK_BEGIN,
   EVENT_HOOK_END,
   EVENT_TEST_BEGIN,

diff --git a/test/integration/fixtures/runner/events-delay.fixture.js b/test/integration/fixtures/runner/events-delay.fixture.js
@@ -20,9 +20,9 @@ var EVENT_TEST_RETRY = constants.EVENT_TEST_RETRY;
 var emitOrder = [
   EVENT_DELAY_BEGIN,
   EVENT_DELAY_END,
-  EVENT_SUITE_BEGIN, // incorrect order
   EVENT_RUN_BEGIN,
   EVENT_SUITE_BEGIN,
+  EVENT_SUITE_BEGIN,
   EVENT_HOOK_BEGIN,
   EVENT_HOOK_END,
   EVENT_TEST_BEGIN,

diff --git a/test/integration/fixtures/runner/events-retries.fixture.js b/test/integration/fixtures/runner/events-retries.fixture.js
@@ -14,9 +14,9 @@ var EVENT_TEST_FAIL = constants.EVENT_TEST_FAIL;
 var EVENT_TEST_RETRY = constants.EVENT_TEST_RETRY;
 
 var emitOrder = [
-  EVENT_SUITE_BEGIN, // incorrect order
   EVENT_RUN_BEGIN,
   EVENT_SUITE_BEGIN,
+  EVENT_SUITE_BEGIN,
   EVENT_HOOK_BEGIN,
   EVENT_HOOK_END,
   EVENT_TEST_BEGIN,

diff --git a/test/integration/helpers.js b/test/integration/helpers.js
@@ -81,27 +81,30 @@ module.exports = {
     var path;
 
     path = resolveFixturePath(fixturePath);
-    args = args || [];
+    args = (args || []).concat(['--reporter', 'json', path]);
 
     return invokeMocha(
-      args.concat(['--reporter', 'json', path]),
+      args,
       function(err, res) {
-        if (err) return fn(err);
+        if (err) {
+          return fn(err);
+        }
 
+        var result;
         try {
-          var result = toJSONRunResult(res);
-          fn(null, result);
+          result = toJSONRunResult(res);
         } catch (err) {
-          fn(
+          return fn(
             new Error(
               format(
-                'Failed to parse JSON reporter output.\nArgs: %O\nResult:\n\n%O',
-                args,
+                'Failed to parse JSON reporter output: %s\n\nResult:%O',
+                err,
                 res
               )
             )
           );
         }
+        fn(null, result);
       },
       opts
     );