fixed event suites (#4852)

Co-authored-by: DavertMik <[email protected]>

Author: DavertMik

lib/mocha/asyncWrapper.js

@@ -187,30 +187,34 @@ module.exports.injected = function (fn, suite, hookName) {
  * Starts promise chain, so helpers could enqueue their hooks
  */
 module.exports.setup = function (suite) {
+  const { enhanceMochaTest } = require('./test')
   return injectHook(() => {
     recorder.startUnlessRunning()
-    event.emit(event.test.before, suite && suite.ctx && suite.ctx.currentTest)
+    event.emit(event.test.before, enhanceMochaTest(suite?.ctx?.currentTest))
   }, suite)
 }
 
 module.exports.teardown = function (suite) {
+  const { enhanceMochaTest } = require('./test')
   return injectHook(() => {
     recorder.startUnlessRunning()
-    event.emit(event.test.after, suite && suite.ctx && suite.ctx.currentTest)
+    event.emit(event.test.after, enhanceMochaTest(suite?.ctx?.currentTest))
   }, suite)
 }
 
 module.exports.suiteSetup = function (suite) {
+  const { enhanceMochaSuite } = require('./suite')
   return injectHook(() => {
     recorder.startUnlessRunning()
-    event.emit(event.suite.before, suite)
+    event.emit(event.suite.before, enhanceMochaSuite(suite))
   }, suite)
 }
 
 module.exports.suiteTeardown = function (suite) {
+  const { enhanceMochaSuite } = require('./suite')
   return injectHook(() => {
     recorder.startUnlessRunning()
-    event.emit(event.suite.after, suite)
+    event.emit(event.suite.after, enhanceMochaSuite(suite))
   }, suite)
 }
 

lib/mocha/suite.js

@@ -7,6 +7,7 @@ const MochaSuite = require('mocha/lib/suite')
  * Enhances MochaSuite with CodeceptJS specific functionality using composition
  */
 function enhanceMochaSuite(suite) {
+  if (!suite) suite = new MochaSuite('Suite', null, false)
   // already enhanced
   if (suite.codeceptjs) return suite
 

lib/mocha/test.js

@@ -21,6 +21,8 @@ function createTest(title, fn) {
  * @returns {CodeceptJS.Test & Mocha.Test} Enhanced test instance
  */
 function enhanceMochaTest(test) {
+  // if no test, create a dummy one
+  if (!test) test = createTest('...', () => {})
   // already enhanced
   if (test.codeceptjs) return test