improved migration

Author: DavertMik

eslint.config.mjs

@@ -22,7 +22,7 @@ export default [
         ...globals.node,
       },
 
-      ecmaVersion: 2020,
+      ecmaVersion: 2022,
       sourceType: 'module',
     },
 

lib/actor.js

@@ -4,9 +4,9 @@ import retryStep from './step/retry.js'
 import { methodsOfObject } from './utils.js'
 import { TIMEOUT_ORDER } from './timeout.js'
 import event from './event.js'
-import storeModule from './store.js'
-const store = storeModule.default || storeModule
+import store from './store.js'
 import output from './output.js'
+import Container from './container.js'
 
 /**
  * @interface
@@ -71,6 +71,11 @@ class Actor {
  * @ignore
  */
 export default function (obj = {}, container) {
+  // Use global container if none provided
+  if (!container) {
+    container = Container
+  }
+  
   const actor = container.actor() || new Actor()
 
   // load all helpers once container initialized

lib/ai.js

@@ -1,9 +1,7 @@
 import debugModule from 'debug'
 const debug = debugModule('codeceptjs:ai')
-import outputModule from './output.js'
-const output = outputModule.default || outputModule
-import eventModule from './event.js'
-const event = eventModule.default || eventModule
+import output from './output.js'
+import event from './event.js'
 import { removeNonInteractiveElements, minifyHtml, splitByChunks } from './html.js'
 
 const defaultHtmlConfig = {

lib/codecept.js

@@ -11,17 +11,14 @@ const __dirname = dirname(__filename)
 const require = createRequire(import.meta.url)
 
 import Helper from '@codeceptjs/helper';
-import containerModule from './container.js'
-const container = containerModule.default || containerModule
-import ConfigModule from './config.js'
-const Config = ConfigModule.default || ConfigModule
-import eventModule from './event.js'
-const event = eventModule.default || eventModule
+import container from './container.js'
+import Config from './config.js'
+import event from './event.js'
 import runHook from './hooks.js'
 import ActorFactory from './actor.js'
-import outputModule from './output.js'
-const output = outputModule.default || outputModule
+import output from './output.js'
 import { emptyFolder } from './utils.js'
+import { initCodeceptGlobals } from './globals.js'
 
 import storeListener from './listener/store.js'
 import stepsListener from './listener/steps.js'
@@ -89,75 +86,23 @@ class Codecept {
    * @param {string} dir
    */
   async initGlobals(dir) {
-    global.codecept_dir = dir
-    global.output_dir = fsPath.resolve(dir, this.config.output)
-
-    if (this.config.emptyOutputFolder) emptyFolder(global.output_dir)
-
-    if (!this.config.noGlobals) {
-      // Set up actor global - will use container when available
-      global.actor = global.codecept_actor = (obj) => {
-        return ActorFactory(obj, global.container || container)
-      }
-      global.Actor = global.actor
-      // Use dynamic imports for modules to avoid circular dependencies
-      global.pause = async (...args) => {
-        const pauseModule = await import('./pause.js')
-        return (pauseModule.default || pauseModule)(...args)
-      }
-      global.within = async (...args) => {
-        const effectsModule = await import('./effects.js')
-        return effectsModule.within(...args)
-      }
-      global.session = async (...args) => {
-        const sessionModule = await import('./session.js')
-        return (sessionModule.default || sessionModule)(...args)
-      }
-      const dataTableModule = await import('./data/table.js')
-      global.DataTable = dataTableModule.default || dataTableModule
-      global.locate = locator => {
-        return import('./locator.js').then(locatorModule => 
-          (locatorModule.default || locatorModule).build(locator)
-        )
-      }
-      global.inject = container.support
-      global.share = container.share
-      const secretModule = await import('./secret.js')
-      global.secret = secretModule.secret || (secretModule.default && secretModule.default.secret)
-      global.codecept_debug = output.debug
-      const codeceptjsModule = await import('./index.js') // load all objects
-      global.codeceptjs = codeceptjsModule.default || codeceptjsModule
-
-      // BDD
-      const stepDefinitionsModule = await import('./mocha/bdd.js')
-      const stepDefinitions = stepDefinitionsModule.default || stepDefinitionsModule
-      global.Given = stepDefinitions.Given
-      global.When = stepDefinitions.When
-      global.Then = stepDefinitions.Then
-      global.DefineParameterType = stepDefinitions.defineParameterType
-
-      // debug mode
-      global.debugMode = false
-
-      // mask sensitive data
-      global.maskSensitiveData = this.config.maskSensitiveData || false
-    }
+    await initCodeceptGlobals(dir, this.config, container)
   }
 
   /**
    * Executes hooks.
    */
    async runHooks() {
      // default hooks
-     runHook(storeListener.default || storeListener)
-     runHook(stepsListener.default || stepsListener)
-     runHook(configListener.default || configListener)
-     runHook(resultListener.default || resultListener)
-     runHook(helpersListener.default || helpersListener)
-     runHook(globalTimeoutListener.default || globalTimeoutListener)
-     runHook(globalRetryListener.default || globalRetryListener)
-     runHook(exitListener.default || exitListener)
-     runHook(emptyRunListener.default || emptyRunListener)
+     runHook(storeListener)
+     runHook(stepsListener)
+     runHook(configListener)
+     runHook(resultListener)
+     runHook(helpersListener)
+     runHook(globalTimeoutListener)
+     runHook(globalRetryListener)
+     runHook(exitListener)
+     runHook(emptyRunListener)
 
      // custom hooks (previous iteration of plugins)
      this.config.hooks.forEach(hook => runHook(hook))
@@ -202,7 +147,7 @@ class Codecept {
         }
       }
 
-      if (this.config.gherkin.features && !this.opts.tests) {
+      if (this.config.gherkin && this.config.gherkin.features && !this.opts.tests) {
         if (Array.isArray(this.config.gherkin.features)) {
           this.config.gherkin.features.forEach(feature => {
             patterns.push(feature)
@@ -236,6 +181,14 @@ class Codecept {
    */
   async run(test) {
     await container.started()
+    
+    // Ensure translations are loaded for Gherkin features
+    try {
+      const { loadTranslations } = await import('./mocha/gherkin.js')
+      await loadTranslations()
+    } catch (e) {
+      // Ignore if gherkin module not available
+    }
 
     return new Promise((resolve, reject) => {
       const mocha = container.mocha()

lib/command/generate.js

@@ -46,7 +46,7 @@ export async function test(genPath) {
         },
       },
     ])
-    .then(result => {
+    .then(async result => {
       const testFilePath = path.dirname(path.join(testsPath, config.tests)).replace(/\*\*$/, '')
       let testFile = path.join(testFilePath, result.filename)
       const ext = path.extname(testFile)

lib/command/info.js

@@ -2,8 +2,7 @@ import envinfo from 'envinfo'
 
 import { getConfig, getTestRoot } from './utils.js'
 import Codecept from '../codecept.js'
-import outputModule from '../output.js'
-const output = outputModule.default || outputModule
+import output from '../output.js'
 import { execSync } from 'child_process'
 
 async function getPlaywrightBrowsers() {

lib/command/init.js

@@ -151,7 +151,7 @@ export default async function (initPath) {
         choices: translations,
       },
     ])
-    .then(result => {
+    .then(async result => {
       if (result.typescript === true) {
         isTypeScript = true
         extension = isTypeScript === true ? 'ts' : 'js'

lib/command/utils.js

@@ -3,8 +3,7 @@ import path from 'path'
 import util from 'util'
 import { mkdirp } from 'mkdirp'
 
-import outputModule from '../output.js'
-const output = outputModule.default || outputModule
+import output from '../output.js'
 import { fileExists, beautify, deepMerge } from '../utils.js'
 
 // alias to deep merge