Revert 00ca06b; see #3414

Updates events test to match correct event order
mochajs · Feb 4, 2019 · 596e591 · 596e591
1 parent e01a54e
commit 596e591
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -857,15 +857,10 @@ Runner.prototype.run = function(fn) {
       filterOnly(rootSuite);
     }
     self.started = true;
-    Runner.immediately(function() {
-      self.emit('start');
-    });
-
+    self.emit('start');
     self.runSuite(rootSuite, function() {
       debug('finished running');
-      Runner.immediately(function() {
-        self.emit('end');
-      });
+      self.emit('end');
     });
   }
 

diff --git a/test/integration/fixtures/runner/events-bail.fixture.js b/test/integration/fixtures/runner/events-bail.fixture.js
@@ -3,14 +3,14 @@ var Runner = require('../../../../lib/runner.js');
 var assert = require('assert');
 
 var emitOrder = [
-  'suite'/* incorrect order*/, 'start', 'suite',
+  'start', 'suite', 'suite',
   '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}`);  
+  // console.log(`emit: ${event}`);
   assert.strictEqual(event, emitOrder.shift());
   return realEmit.call(this, event, ...args);
 };

diff --git a/test/integration/fixtures/runner/events-basic.fixture.js b/test/integration/fixtures/runner/events-basic.fixture.js
@@ -3,15 +3,14 @@ var Runner = require('../../../../lib/runner.js');
 var assert = require('assert');
 
 var emitOrder = [
-  'suite'/* incorrect order*/, 'start', 'suite',
+  'start', 'suite', 'suite',
   'hook', 'hook end', 'test', 'hook', 'hook end', 'pass', 'test end', 'hook', 'hook end',
   'suite', 'test', 'hook', 'hook end', 'pass', 'test end', 'hook', 'hook end',
   'suite 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);
 };

diff --git a/test/integration/fixtures/runner/events-retries.fixture.js b/test/integration/fixtures/runner/events-retries.fixture.js
@@ -3,15 +3,15 @@ var Runner = require('../../../../lib/runner.js');
 var assert = require('assert');
 
 var emitOrder = [
-  'suite'/* incorrect order*/, 'start', 'suite',
+  '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}`);  
+  // console.log(`emit: ${event}`);
   assert.strictEqual(event, emitOrder.shift());
   return realEmit.call(this, event, ...args);
 };