codeceptjs 3.7.6-beta.4 → 4.0.0-beta.10.esm-aria

package/lib/listener/helpers.js

@@ -1,14 +1,13 @@
-const path = require('path')
-const event = require('../event')
-const container = require('../container')
-const recorder = require('../recorder')
-const store = require('../store')
-const { error } = require('../output')
+import path from 'path'
+import event from '../event.js'
+import recorder from '../recorder.js'
+import store from '../store.js'
+import output from '../output.js'
 /**
  * Enable Helpers to listen to test events
  */
-module.exports = function () {
-  const helpers = container.helpers()
+export default function () {
+  const helpers = global.container.helpers()
 
   const runHelpersHook = (hook, param) => {
     if (store.dryRun) return
@@ -39,30 +38,30 @@ module.exports = function () {
 
   event.dispatcher.on(event.test.started, test => {
     runHelpersHook('_test', test)
-    recorder.catch(e => error(e))
+    recorder.catch(e => output.error(e))
   })
 
   event.dispatcher.on(event.test.before, test => {
     // schedule config to revert changes
     runAsyncHelpersHook('_before', test, true)
-    recorder.catchWithoutStop(e => error(e))
+    recorder.catchWithoutStop(e => output.error(e))
   })
 
   event.dispatcher.on(event.test.passed, test => {
     runAsyncHelpersHook('_passed', test, true)
     // should not fail test execution, so errors should be caught
-    recorder.catchWithoutStop(e => error(e))
+    recorder.catchWithoutStop(e => output.error(e))
   })
 
   event.dispatcher.on(event.test.failed, test => {
     runAsyncHelpersHook('_failed', test, true)
     // should not fail test execution, so errors should be caught
-    recorder.catchWithoutStop(e => error(e))
+    recorder.catchWithoutStop(e => output.error(e))
   })
 
   event.dispatcher.on(event.test.after, () => {
     runAsyncHelpersHook('_after', {}, true)
-    recorder.catchWithoutStop(e => error(e))
+    recorder.catchWithoutStop(e => output.error(e))
   })
 
   event.dispatcher.on(event.step.before, step => {
@@ -74,6 +73,32 @@ module.exports = function () {
   })
 
   event.dispatcher.on(event.all.result, () => {
-    runAsyncHelpersHook('_finishTest', {}, true)
+    // Skip _finishTest for all helpers if any browser helper restarts to avoid double cleanup
+    const hasBrowserRestart = Object.values(helpers).some(helper => 
+      (helper.config && (helper.config.restart === 'browser' || helper.config.restart === 'context' || helper.config.restart === true)) || 
+      (helper.options && (helper.options.restart === 'browser' || helper.options.restart === 'context' || helper.options.restart === true))
+    )
+
+    Object.keys(helpers).forEach(key => {
+      const helper = helpers[key]
+      if (helper._finishTest && !hasBrowserRestart) {
+        recorder.add(`hook ${key}._finishTest()`, () => helper._finishTest(), true, false)
+      }
+    })
+  })
+
+  event.dispatcher.on(event.all.after, () => {
+    // Skip _cleanup for all helpers if any browser helper restarts to avoid double cleanup
+    const hasBrowserRestart = Object.values(helpers).some(helper => 
+      (helper.config && (helper.config.restart === 'browser' || helper.config.restart === 'context' || helper.config.restart === true)) || 
+      (helper.options && (helper.options.restart === 'browser' || helper.options.restart === 'context' || helper.options.restart === true))
+    )
+
+    Object.keys(helpers).forEach(key => {
+      const helper = helpers[key]
+      if (helper._cleanup && !hasBrowserRestart) {
+        recorder.add(`hook ${key}._cleanup()`, () => helper._cleanup(), true, false)
+      }
+    })
   })
 }

package/lib/listener/mocha.js

@@ -1,11 +1,10 @@
-const event = require('../event')
-const container = require('../container')
+import event from '../event.js'
 
-module.exports = function () {
+export default function () {
   let mocha
 
   event.dispatcher.on(event.all.before, () => {
-    mocha = container.mocha()
+    mocha = global.container.mocha()
   })
 
   event.dispatcher.on(event.test.passed, test => {

package/lib/listener/result.js

@@ -1,12 +1,11 @@
-const event = require('../event')
-const container = require('../container')
+import event from '../event.js'
 
-module.exports = function () {
+export default function () {
   event.dispatcher.on(event.hook.failed, err => {
-    container.result().addStats({ failedHooks: 1 })
+    global.container.result().addStats({ failedHooks: 1 })
   })
 
   event.dispatcher.on(event.test.before, test => {
-    container.result().addTest(test)
+    global.container.result().addTest(test)
   })
 }

package/lib/listener/retryEnhancer.js

@@ -1,11 +1,11 @@
-const event = require('../event')
-const { enhanceMochaTest } = require('../mocha/test')
+import event from '../event.js'
+import { enhanceMochaTest } from '../mocha/test.js'
 
 /**
  * Enhance retried tests by copying CodeceptJS-specific properties from the original test
  * This fixes the issue where Mocha's shallow clone during retries loses CodeceptJS properties
  */
-module.exports = function () {
+export default function () {
   event.dispatcher.on(event.test.before, test => {
     // Check if this test is a retry (has a reference to the original test)
     const originalTest = test.retriedTest && test.retriedTest()

package/lib/listener/steps.js

@@ -1,9 +1,10 @@
-const debug = require('debug')('codeceptjs:steps')
-const event = require('../event')
-const store = require('../store')
-const output = require('../output')
-const { BeforeHook, AfterHook, BeforeSuiteHook, AfterSuiteHook } = require('../mocha/hooks')
-const recorder = require('../recorder')
+import debugModule from 'debug'
+const debug = debugModule('codeceptjs:steps')
+import event from '../event.js'
+import store from '../store.js'
+import output from '../output.js'
+import { BeforeHook, AfterHook, BeforeSuiteHook, AfterSuiteHook } from '../mocha/hooks.js'
+import recorder from '../recorder.js'
 
 let currentTest
 let currentHook
@@ -14,7 +15,7 @@ const EXCLUDED_SESSIONS = ['tryTo', 'hopeThat']
 /**
  * Register steps inside tests
  */
-module.exports = function () {
+export default function () {
   event.dispatcher.on(event.test.before, test => {
     test.startedAt = +new Date()
   })

package/lib/listener/store.js

@@ -1,7 +1,7 @@
-const event = require('../event')
-const store = require('../store')
+import event from '../event.js'
+import store from '../store.js'
 
-module.exports = function () {
+export default function () {
   event.dispatcher.on(event.suite.before, suite => {
     store.currentSuite = suite
   })