fix more tests

Author: kobenguyent

lib/helper/Mochawesome.js

@@ -2,6 +2,7 @@ let currentTest
 let currentSuite
 
 import Helper from '@codeceptjs/helper'
+import { createRequire } from 'module'
 import { clearString } from '../utils.js'
 import { testToFileName } from '../mocha/test.js'
 
@@ -15,6 +16,8 @@ class Mochawesome extends Helper {
       disableScreenshots: false,
     }
 
+    // ESM-compatible require for CommonJS module
+    const require = createRequire(import.meta.url)
     this._addContext = require('mochawesome/addContext')
 
     this._createConfig(config)

lib/mocha/asyncWrapper.js

@@ -7,11 +7,14 @@ import { getInjectedArguments } from './inject.js'
 import { fireHook } from './hooks.js'
 
 const injectHook = function (inject, suite) {
-  try {
-    inject()
-  } catch (err) {
-    recorder.throw(err)
-  }
+  // Run the hook body inside recorder queue to ensure async parts complete before returning
+  recorder.add('run hook', async () => {
+    try {
+      await inject()
+    } catch (err) {
+      throw err
+    }
+  })
   recorder.catch(err => {
     suiteTestFailedHookError(suite, err)
     throw err
@@ -56,6 +59,8 @@ function test(test) {
     const doneFn = makeDoneCallableOnce(done)
     // Ensure recorder is running so any steps added inside test function are executed
     recorder.startUnlessRunning()
+    // Fire started event immediately so listeners are notified regardless of recorder queue
+    event.emit(event.test.started, test)
     recorder.errHandler(err => {
       recorder.session.start('teardown')
       recorder.cleanAsyncErr()
@@ -76,30 +81,21 @@ function test(test) {
       event.emit(event.test.finished, test)
       recorder.add(() => doneFn(err))
     })
-    // Schedule the test execution inside recorder to ensure any external recorder.add
-    // calls happen after this and steps added within testFn are executed before finishing
-    recorder.add('execute test function', async () => {
-      try {
-        const args = await getInjectedArguments(testFn, test)
-        event.emit(event.test.started, test)
-        if (isAsyncFunction(testFn)) {
-          await testFn.call(test, args)
-        } else {
-          testFn.call(test, args)
-        }
-        // After testFn schedules its own steps, enqueue passed/finished
-        recorder.add('fire test.passed', () => {
-          event.emit(event.test.passed, test)
-          event.emit(event.test.finished, test)
-        })
-      } catch (err) {
-        recorder.throw(err)
-      } finally {
-        // Finish test after queued tasks
-        recorder.add('finish test', doneFn)
-        recorder.catch()
-      }
+
+    // Wrap test execution in a session so any recorder.add calls inside the test are executed before finishing
+    recorder.add('start test session', () => recorder.session.start('test'))
+    recorder.add('execute test', async () => {
+      const args = await getInjectedArguments(testFn, test)
+      const res = testFn.call(test, args)
+      if (isAsyncFunction(testFn)) await res
+    })
+    recorder.add('restore test session', () => recorder.session.restore('test'))
+    recorder.add('fire test.passed', () => {
+      event.emit(event.test.passed, test)
+      event.emit(event.test.finished, test)
     })
+    recorder.add('finish test', doneFn)
+    recorder.catch()
   }
   return test
 }

test/unit/worker_test.js

@@ -62,7 +62,7 @@ describe('Workers', function () {
         helpers: {
           FileSystem: {},
           Workers: {
-            require: './custom_worker_helper',
+            require: './custom_worker_helper.js',
           },
         },
       })
@@ -134,7 +134,7 @@ describe('Workers', function () {
         helpers: {
           FileSystem: {},
           Workers: {
-            require: './custom_worker_helper',
+            require: './custom_worker_helper.js',
           },
         },
       })
@@ -169,7 +169,7 @@ describe('Workers', function () {
         helpers: {
           FileSystem: {},
           Workers: {
-            require: './custom_worker_helper',
+            require: './custom_worker_helper.js',
           },
         },
       })
@@ -197,7 +197,7 @@ describe('Workers', function () {
         helpers: {
           FileSystem: {},
           Workers: {
-            require: './custom_worker_helper',
+            require: './custom_worker_helper.js',
           },
         },
       })