fix UTs

Author: kobenguyent

lib/mocha/asyncWrapper.js

@@ -60,7 +60,8 @@ function test(test) {
     let testPassed = false
     // Ensure recorder is running so any steps added inside test function are executed
     recorder.startUnlessRunning()
-    // Fire started event immediately so listeners are notified prior to queued steps
+    // Fire before event first, then started event so listeners are notified prior to queued steps
+    event.emit(event.test.before, test)
     event.emit(event.test.started, test)
     recorder.errHandler(err => {
       recorder.session.start('teardown')
@@ -74,6 +75,12 @@ function test(test) {
             event.emit(event.test.passed, test)
           }
           event.emit(event.test.finished, test)
+          // Add test.after emission after event listeners have added their operations
+          process.nextTick(() => {
+            recorder.add('fire test.after', () => {
+              event.emit(event.test.after, test)
+            })
+          })
           recorder.add(doneFn)
           return
         } catch (newErr) {
@@ -83,6 +90,12 @@ function test(test) {
       test.err = err
       event.emit(event.test.failed, test, err)
       event.emit(event.test.finished, test)
+      // Add test.after emission after event listeners have added their operations
+      setImmediate(() => {
+        recorder.add('fire test.after for failed test', () => {
+          event.emit(event.test.after, test)
+        })
+      })
       recorder.add(() => doneFn(err))
     })
 
@@ -100,9 +113,12 @@ function test(test) {
         event.emit(event.test.passed, test)
       }
       event.emit(event.test.finished, test)
-    })
-    recorder.add('fire test.after', () => {
-      event.emit(event.test.after, test)
+      // Add test.after to the queue after event listeners have added their operations
+      process.nextTick(() => {
+        recorder.add('fire test.after', () => {
+          event.emit(event.test.after, test)
+        })
+      })
     })
     recorder.add('finish test', doneFn)
     recorder.catch()
@@ -121,7 +137,10 @@ function injected(fn, suite, hookName) {
       recorder.cleanAsyncErr()
       if (hookName == 'before' || hookName == 'beforeSuite') suiteTestFailedHookError(suite, err, hookName)
       if (hookName === 'after') suite.eachTest(test => event.emit(event.test.after, test))
-      if (hookName === 'afterSuite') event.emit(event.suite.after, suite)
+      if (hookName === 'afterSuite' && !suite._suiteAfterEventEmitted) {
+        suite._suiteAfterEventEmitted = true
+        event.emit(event.suite.after, suite)
+      }
       recorder.add(() => doneFn(err))
     }
 
@@ -168,6 +187,10 @@ function injected(fn, suite, hookName) {
       .then(() => {
         recorder.add('fire hook.passed', () => fireHook(event.hook.passed, suite))
         recorder.add('fire hook.finished', () => fireHook(event.hook.finished, suite))
+        if (hookName === 'afterSuite' && !suite._suiteAfterEventEmitted) {
+          suite._suiteAfterEventEmitted = true
+          recorder.add('fire suite.after', () => event.emit(event.suite.after, suite))
+        }
         recorder.add(`finish ${hookName} hook`, doneFn)
         recorder.catch()
       })