From 596e591e412d91a7aae217ca45343bc3be016767 Mon Sep 17 00:00:00 2001
From: Christopher Hiller <boneskull@boneskull.com>
Date: Mon, 4 Feb 2019 11:51:58 -0800
Subject: [PATCH] Revert 00ca06b0e957ec4f067268c98053782ac5dcb69f; see #3414

Updates events test to match correct event order
---
 lib/runner.js                                            | 9 ++-------
 test/integration/fixtures/runner/events-bail.fixture.js  | 4 ++--
 test/integration/fixtures/runner/events-basic.fixture.js | 3 +--
 .../fixtures/runner/events-retries.fixture.js            | 4 ++--
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/lib/runner.js b/lib/runner.js
index 7c4435219e..ddf3a30eb1 100644
--- 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
index 3a345f8169..fd7e2c58c7 100644
--- 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
index 81c55a8bb4..4360fa7b69 100644
--- a/test/integration/fixtures/runner/events-basic.fixture.js
+++ b/test/integration/fixtures/runner/events-basic.fixture.js
@@ -3,7 +3,7 @@ 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'
@@ -11,7 +11,6 @@ var emitOrder = [
 
 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
index a4547c8fa8..62c5f58bde 100644
--- a/test/integration/fixtures/runner/events-retries.fixture.js
+++ b/test/integration/fixtures/runner/events-retries.fixture.js
@@ -3,7 +3,7 @@ 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'
@@ -11,7 +11,7 @@ var emitOrder = [
 
 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);
 };