codeceptjs 4.0.1-beta.9 → 4.0.2-beta.2

package/bin/codecept.js

@@ -174,7 +174,7 @@ program
   .option('-R, --reporter <name>', 'specify the reporter to use')
   .option('-S, --sort', 'sort test files')
   .option('-b, --bail', 'bail after first test failure')
-  .option('-d, --debug', "enable node's debugger, synonym for node --debug")
+  .option('--inspec', "enable node's debugger, synonym for node --debug")
   .option('-g, --grep <pattern>', 'only run tests matching <pattern>')
   .option('-f, --fgrep <string>', 'only run tests containing <string>')
   .option('-i, --invert', 'inverts --grep and --fgrep matches')
@@ -276,7 +276,7 @@ program
   .option('-R, --reporter <name>', 'specify the reporter to use')
   .option('-S, --sort', 'sort test files')
   .option('-b, --bail', 'bail after first test failure')
-  .option('-d, --debug', "enable node's debugger, synonym for node --debug")
+  .option('--inspect', "enable node's debugger, synonym for node --debug")
   .option('-g, --grep <pattern>', 'only run tests matching <pattern>')
   .option('-f, --fgrep <string>', 'only run tests containing <string>')
   .option('-i, --invert', 'inverts --grep and --fgrep matches')

package/lib/command/definitions.js

@@ -41,7 +41,7 @@ const getDefinitionsFileContent = ({ hasCustomHelper, hasCustomStepsFile, helper
 
   const importPathsFragment = importPaths.join('\n')
   const supportObjectsTypeFragment = convertMapToType(supportObject)
-  const methodsTypeFragment = helperNames.length > 0 ? `interface Methods extends ${helperNames.join(', ')} {}` : ''
+  const methodsTypeFragment = helperNames.length > 0 ? `interface Methods extends ${helperNames.join(', ')} {}` : 'interface Methods {}'
   const translatedActionsFragment = JSON.stringify(translations.vocabulary.actions, null, 2)
 
   return generateDefinitionsContent({
@@ -239,8 +239,13 @@ function getImportString(testsPath, targetFolderPath, pathsToType, pathsToValue)
   }
 
   for (const name in pathsToValue) {
-    const relativePath = getPath(pathsToValue[name], targetFolderPath, testsPath)
-    importStrings.push(`type ${name} = import('${relativePath}');`)
+    const originalPath = pathsToValue[name]
+    const relativePath = getPath(originalPath, targetFolderPath, testsPath)
+    if (originalPath.endsWith('.js') || originalPath.endsWith('.ts')) {
+      importStrings.push(`type ${name} = InstanceType<typeof import('${relativePath}').default>;`)
+    } else {
+      importStrings.push(`type ${name} = import('${relativePath}');`)
+    }
   }
 
   return importStrings

package/lib/command/workers/runTests.js

@@ -104,7 +104,9 @@ initPromise = (async function () {
     // important deep merge so dynamic things e.g. functions on config are not overridden
     config = deepMerge(baseConfig, overrideConfigs)
     
-    codecept = new Codecept(config, options)
+    // Pass workerIndex as child option for output.process() to display worker prefix
+    const optsWithChild = { ...options, child: workerIndex }
+    codecept = new Codecept(config, optsWithChild)
     await codecept.init(testRoot)
     codecept.loadTests()
     mocha = container.mocha()
@@ -334,8 +336,43 @@ function filterTests() {
   mocha.files = files
   mocha.loadFiles()
 
-  for (const suite of mocha.suite.suites) {
+  // Debug logging to help diagnose test filtering issues
+  if (options.debug || options.verbose) {
+    const allLoadedTests = [];
+    mocha.suite.eachTest(test => {
+      if (test) {
+        allLoadedTests.push({ uid: test.uid, title: test.fullTitle() });
+      }
+    });
+    
+    console.log(`[Worker ${workerIndex}] Loaded ${allLoadedTests.length} tests, expecting ${tests.length} tests`);
+    
+    const loadedUids = new Set(allLoadedTests.map(t => t.uid));
+    const missingTests = tests.filter(uid => !loadedUids.has(uid));
+    
+    if (missingTests.length > 0) {
+      console.log(`[Worker ${workerIndex}] WARNING: ${missingTests.length} assigned tests not found in loaded files`);
+      console.log(`[Worker ${workerIndex}] Missing UIDs:`, missingTests);
+    }
+  }
+
+  // Recursively filter tests in all suites (including nested ones)
+  const filterSuiteTests = (suite) => {
     suite.tests = suite.tests.filter(test => tests.indexOf(test.uid) >= 0)
+    for (const childSuite of suite.suites) {
+      filterSuiteTests(childSuite)
+    }
+  }
+
+  for (const suite of mocha.suite.suites) {
+    filterSuiteTests(suite)
+  }
+  
+  // Verify final test count
+  if (options.debug || options.verbose) {
+    let finalCount = 0;
+    mocha.suite.eachTest(() => finalCount++);
+    console.log(`[Worker ${workerIndex}] After filtering: ${finalCount} tests will run`);
   }
 }
 

package/lib/config.js

@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import { createRequire } from 'module'
 import { fileExists, isFile, deepMerge, deepClone } from './utils.js'
-import { transpileTypeScript, cleanupTempFiles } from './utils/typescript.js'
+import { transpileTypeScript, cleanupTempFiles, fixErrorStack } from './utils/typescript.js'
 
 const defaultConfig = {
   output: './_output',
@@ -159,12 +159,13 @@ async function loadConfigFile(configFile) {
         try {
           // Use the TypeScript transpilation utility
           const typescript = require('typescript')
-          const { tempFile, allTempFiles } = await transpileTypeScript(configFile, typescript)
+          const { tempFile, allTempFiles, fileMapping } = await transpileTypeScript(configFile, typescript)
 
           try {
             configModule = await import(tempFile)
             cleanupTempFiles(allTempFiles)
           } catch (err) {
+            fixErrorStack(err, fileMapping)
             cleanupTempFiles(allTempFiles)
             throw err
           }

package/lib/container.js

@@ -5,7 +5,7 @@ import debugModule from 'debug'
 const debug = debugModule('codeceptjs:container')
 import { MetaStep } from './step.js'
 import { methodsOfObject, fileExists, isFunction, isAsyncFunction, installedLocally, deepMerge } from './utils.js'
-import { transpileTypeScript, cleanupTempFiles } from './utils/typescript.js'
+import { transpileTypeScript, cleanupTempFiles, fixErrorStack } from './utils/typescript.js'
 import Translation from './translation.js'
 import MochaFactory from './mocha/factory.js'
 import recorder from './recorder.js'
@@ -34,6 +34,7 @@ let container = {
   /** @type {Result | null} */
   result: null,
   sharedKeys: new Set(), // Track keys shared via share() function
+  tsFileMapping: null, // TypeScript file mapping for error stack fixing
 }
 
 /**
@@ -88,7 +89,7 @@ class Container {
           container.support.I = mod
         }
       } catch (e) {
-        throw new Error(`Could not include object I: ${e.message}`)
+        throw e
       }
     } else {
       // Create default actor - this sets up the callback in asyncHelperPromise
@@ -176,6 +177,15 @@ class Container {
     return container.translation
   }
 
+  /**
+   * Get TypeScript file mapping for error stack fixing
+   *
+   * @api
+   */
+  static tsFileMapping() {
+    return container.tsFileMapping
+  }
+
   /**
    * Get Mocha instance
    *
@@ -398,20 +408,66 @@ async function requireHelperFromModule(helperName, config, HelperClass) {
       throw err
     }
   } else {
+    // Handle TypeScript files
+    let importPath = moduleName
+    let tempJsFile = null
+    let fileMapping = null
+    const ext = path.extname(moduleName)
+
+    if (ext === '.ts') {
+      try {
+        // Use the TypeScript transpilation utility
+        const typescript = await import('typescript')
+        const { tempFile, allTempFiles, fileMapping: mapping } = await transpileTypeScript(importPath, typescript)
+
+        debug(`Transpiled TypeScript helper: ${importPath} -> ${tempFile}`)
+
+        importPath = tempFile
+        tempJsFile = allTempFiles
+        fileMapping = mapping
+        // Store file mapping in container for runtime error fixing (merge with existing)
+        if (!container.tsFileMapping) {
+          container.tsFileMapping = new Map()
+        }
+        for (const [key, value] of mapping.entries()) {
+          container.tsFileMapping.set(key, value)
+        }
+      } catch (tsError) {
+        throw new Error(`Failed to load TypeScript helper ${importPath}: ${tsError.message}. Make sure 'typescript' package is installed.`)
+      }
+    }
+
     // check if the new syntax export default HelperName is used and loads the Helper, otherwise loads the module that used old syntax export = HelperName.
     try {
       // Try dynamic import for both CommonJS and ESM modules
-      const mod = await import(moduleName)
+      const mod = await import(importPath)
       if (!mod && !mod.default) {
         throw new Error(`Helper module '${moduleName}' was not found. Make sure you have installed the package correctly.`)
       }
       HelperClass = mod.default || mod
+
+      // Clean up temp files if created
+      if (tempJsFile) {
+        const filesToClean = Array.isArray(tempJsFile) ? tempJsFile : [tempJsFile]
+        cleanupTempFiles(filesToClean)
+      }
     } catch (err) {
+      // Fix error stack to point to original .ts files
+      if (fileMapping) {
+        fixErrorStack(err, fileMapping)
+      }
+      
+      // Clean up temp files before rethrowing
+      if (tempJsFile) {
+        const filesToClean = Array.isArray(tempJsFile) ? tempJsFile : [tempJsFile]
+        cleanupTempFiles(filesToClean)
+      }
+
       if (err.code === 'ERR_REQUIRE_ESM' || (err.message && err.message.includes('ES module'))) {
         // This is an ESM module, use dynamic import
         try {
           const pathModule = await import('path')
-          const absolutePath = pathModule.default.resolve(moduleName)
+          const absolutePath = pathModule.default.resolve(importPath)
           const mod = await import(absolutePath)
           HelperClass = mod.default || mod
           debug(`helper ${helperName} loaded via ESM import`)
@@ -699,6 +755,7 @@ async function loadSupportObject(modulePath, supportObjectName) {
     // Use dynamic import for both ESM and CJS modules
     let importPath = modulePath
     let tempJsFile = null
+    let fileMapping = null
 
     if (typeof importPath === 'string') {
       const ext = path.extname(importPath)
@@ -708,7 +765,7 @@ async function loadSupportObject(modulePath, supportObjectName) {
         try {
           // Use the TypeScript transpilation utility
           const typescript = await import('typescript')
-          const { tempFile, allTempFiles } = await transpileTypeScript(importPath, typescript)
+          const { tempFile, allTempFiles, fileMapping: mapping } = await transpileTypeScript(importPath, typescript)
 
           debug(`Transpiled TypeScript file: ${importPath} -> ${tempFile}`)
 
@@ -716,6 +773,14 @@ async function loadSupportObject(modulePath, supportObjectName) {
           importPath = tempFile
           // Store temp files list in a way that cleanup can access them
           tempJsFile = allTempFiles
+          fileMapping = mapping
+          // Store file mapping in container for runtime error fixing (merge with existing)
+          if (!container.tsFileMapping) {
+            container.tsFileMapping = new Map()
+          }
+          for (const [key, value] of mapping.entries()) {
+            container.tsFileMapping.set(key, value)
+          }
         } catch (tsError) {
           throw new Error(`Failed to load TypeScript file ${importPath}: ${tsError.message}. Make sure 'typescript' package is installed.`)
         }
@@ -729,6 +794,11 @@ async function loadSupportObject(modulePath, supportObjectName) {
     try {
       obj = await import(importPath)
     } catch (importError) {
+      // Fix error stack to point to original .ts files
+      if (fileMapping) {
+        fixErrorStack(importError, fileMapping)
+      }
+      
       // Clean up temp files if created before rethrowing
       if (tempJsFile) {
         const filesToClean = Array.isArray(tempJsFile) ? tempJsFile : [tempJsFile]
@@ -777,7 +847,9 @@ async function loadSupportObject(modulePath, supportObjectName) {
 
     throw new Error(`Support object "${supportObjectName}" should be an object, class, or function, but got ${typeof actualObj}`)
   } catch (err) {
-    throw new Error(`Could not include object ${supportObjectName} from module '${modulePath}'\n${err.message}\n${err.stack}`)
+    const newErr = new Error(`Could not include object ${supportObjectName} from module '${modulePath}': ${err.message}`)
+    newErr.stack = err.stack
+    throw newErr
   }
 }
 

package/lib/helper/Playwright.js

@@ -44,6 +44,36 @@ if (typeof global.__playwrightSelectorsRegistered === 'undefined') {
   global.__playwrightSelectorsRegistered = false
 }
 
+/**
+ * Creates a Playwright selector engine factory for a custom locator strategy.
+ * @param {string} name - Strategy name for error messages
+ * @param {Function} func - The locator function (selector, root) => Element|Element[]
+ * @returns {Function} Selector engine factory
+ */
+function createCustomSelectorEngine(name, func) {
+  return () => ({
+    create: () => null,
+    query(root, selector) {
+      if (!root) return null
+      try {
+        const result = func(selector, root)
+        return Array.isArray(result) ? result[0] : result
+      } catch (e) {
+        return null
+      }
+    },
+    queryAll(root, selector) {
+      if (!root) return []
+      try {
+        const result = func(selector, root)
+        return Array.isArray(result) ? result : result ? [result] : []
+      } catch (e) {
+        return []
+      }
+    },
+  })
+}
+
 const popupStore = new Popup()
 const consoleLogStore = new Console()
 const availableBrowsers = ['chromium', 'webkit', 'firefox', 'electron']
@@ -358,23 +388,13 @@ class Playwright extends Helper {
 
     // Filter out invalid customLocatorStrategies (empty arrays, objects without functions)
     // This can happen in worker threads where config is serialized/deserialized
-    let validCustomLocators = null
-    if (typeof config.customLocatorStrategies === 'object' && config.customLocatorStrategies !== null) {
-      // Check if it's an empty array or object with no function properties
-      const entries = Object.entries(config.customLocatorStrategies)
-      const hasFunctions = entries.some(([_, value]) => typeof value === 'function')
-      if (hasFunctions) {
-        validCustomLocators = config.customLocatorStrategies
-      }
-    }
-
-    this.customLocatorStrategies = validCustomLocators
+    this.customLocatorStrategies = this._parseCustomLocatorStrategies(config.customLocatorStrategies)
     this._customLocatorsRegistered = false
 
     // Add custom locator strategies to global registry for early registration
     if (this.customLocatorStrategies) {
-      for (const [strategyName, strategyFunction] of Object.entries(this.customLocatorStrategies)) {
-        globalCustomLocatorStrategies.set(strategyName, strategyFunction)
+      for (const [name, func] of Object.entries(this.customLocatorStrategies)) {
+        globalCustomLocatorStrategies.set(name, func)
       }
     }
 
@@ -565,54 +585,23 @@ class Playwright extends Helper {
       }
 
       // Register all custom locator strategies from the global registry
-      for (const [strategyName, strategyFunction] of globalCustomLocatorStrategies.entries()) {
-        if (!registeredCustomLocatorStrategies.has(strategyName)) {
-          try {
-            // Create a selector engine factory function exactly like createValueEngine pattern
-            // Capture variables in closure to avoid reference issues
-            const createCustomEngine = ((name, func) => {
-              return () => {
-                return {
-                  create() {
-                    return null
-                  },
-                  query(root, selector) {
-                    try {
-                      if (!root) return null
-                      const result = func(selector, root)
-                      return Array.isArray(result) ? result[0] : result
-                    } catch (error) {
-                      console.warn(`Error in custom locator "${name}":`, error)
-                      return null
-                    }
-                  },
-                  queryAll(root, selector) {
-                    try {
-                      if (!root) return []
-                      const result = func(selector, root)
-                      return Array.isArray(result) ? result : result ? [result] : []
-                    } catch (error) {
-                      console.warn(`Error in custom locator "${name}":`, error)
-                      return []
-                    }
-                  },
-                }
-              }
-            })(strategyName, strategyFunction)
+      await this._registerGlobalCustomLocators()
+    } catch (e) {
+      console.warn(e)
+    }
+  }
 
-            await playwright.selectors.register(strategyName, createCustomEngine)
-            registeredCustomLocatorStrategies.add(strategyName)
-          } catch (error) {
-            if (!error.message.includes('already registered')) {
-              console.warn(`Failed to register custom locator strategy '${strategyName}':`, error)
-            } else {
-              console.log(`Custom locator strategy '${strategyName}' already registered`)
-            }
-          }
+  async _registerGlobalCustomLocators() {
+    for (const [name, func] of globalCustomLocatorStrategies.entries()) {
+      if (registeredCustomLocatorStrategies.has(name)) continue
+      try {
+        await playwright.selectors.register(name, createCustomSelectorEngine(name, func))
+        registeredCustomLocatorStrategies.add(name)
+      } catch (e) {
+        if (!e.message.includes('already registered')) {
+          this.debugSection('Custom Locator', `Failed to register '${name}': ${e.message}`)
         }
       }
-    } catch (e) {
-      console.warn(e)
     }
   }
 
@@ -923,7 +912,7 @@ class Playwright extends Helper {
   }
 
   async _finishTest() {
-    if ((restartsSession() || restartsContext() || restartsBrowser()) && this.isRunning) {
+    if (this.isRunning) {
       try {
         await Promise.race([this._stopBrowser(), new Promise((_, reject) => setTimeout(() => reject(new Error('Test finish timeout')), 10000))])
       } catch (e) {
@@ -1277,28 +1266,31 @@ class Playwright extends Helper {
     return this.browser
   }
 
+  _hasCustomLocatorStrategies() {
+    return !!(this.customLocatorStrategies && Object.keys(this.customLocatorStrategies).length > 0)
+  }
+
+  _parseCustomLocatorStrategies(strategies) {
+    if (typeof strategies !== 'object' || strategies === null) return null
+    const hasValidFunctions = Object.values(strategies).some(v => typeof v === 'function')
+    return hasValidFunctions ? strategies : null
+  }
+
   _lookupCustomLocator(customStrategy) {
-    if (typeof this.customLocatorStrategies !== 'object' || this.customLocatorStrategies === null) {
-      return null
-    }
+    if (!this._hasCustomLocatorStrategies()) return null
     const strategy = this.customLocatorStrategies[customStrategy]
     return typeof strategy === 'function' ? strategy : null
   }
 
   _isCustomLocator(locator) {
     const locatorObj = new Locator(locator)
-    if (locatorObj.isCustom()) {
-      const customLocator = this._lookupCustomLocator(locatorObj.type)
-      if (customLocator) {
-        return true
-      }
-      throw new Error('Please define "customLocatorStrategies" as an Object and the Locator Strategy as a "function".')
-    }
-    return false
+    if (!locatorObj.isCustom()) return false
+    if (this._lookupCustomLocator(locatorObj.type)) return true
+    throw new Error('Please define "customLocatorStrategies" as an Object and the Locator Strategy as a "function".')
   }
 
   _isCustomLocatorStrategyDefined() {
-    return !!(this.customLocatorStrategies && Object.keys(this.customLocatorStrategies).length > 0)
+    return this._hasCustomLocatorStrategies()
   }
 
   /**
@@ -1321,49 +1313,16 @@ class Playwright extends Helper {
   }
 
   async _registerCustomLocatorStrategies() {
-    if (!this.customLocatorStrategies) return
-
-    for (const [strategyName, strategyFunction] of Object.entries(this.customLocatorStrategies)) {
-      if (!registeredCustomLocatorStrategies.has(strategyName)) {
-        try {
-          const createCustomEngine = ((name, func) => {
-            return () => {
-              return {
-                create(root, target) {
-                  return null
-                },
-                query(root, selector) {
-                  try {
-                    if (!root) return null
-                    const result = func(selector, root)
-                    return Array.isArray(result) ? result[0] : result
-                  } catch (error) {
-                    console.warn(`Error in custom locator "${name}":`, error)
-                    return null
-                  }
-                },
-                queryAll(root, selector) {
-                  try {
-                    if (!root) return []
-                    const result = func(selector, root)
-                    return Array.isArray(result) ? result : result ? [result] : []
-                  } catch (error) {
-                    console.warn(`Error in custom locator "${name}":`, error)
-                    return []
-                  }
-                },
-              }
-            }
-          })(strategyName, strategyFunction)
+    if (!this._hasCustomLocatorStrategies()) return
 
-          await playwright.selectors.register(strategyName, createCustomEngine)
-          registeredCustomLocatorStrategies.add(strategyName)
-        } catch (error) {
-          if (!error.message.includes('already registered')) {
-            console.warn(`Failed to register custom locator strategy '${strategyName}':`, error)
-          } else {
-            console.log(`Custom locator strategy '${strategyName}' already registered`)
-          }
+    for (const [name, func] of Object.entries(this.customLocatorStrategies)) {
+      if (registeredCustomLocatorStrategies.has(name)) continue
+      try {
+        await playwright.selectors.register(name, createCustomSelectorEngine(name, func))
+        registeredCustomLocatorStrategies.add(name)
+      } catch (e) {
+        if (!e.message.includes('already registered')) {
+          this.debugSection('Custom Locator', `Failed to register '${name}': ${e.message}`)
         }
       }
     }
@@ -1389,6 +1348,7 @@ class Playwright extends Helper {
       }
     }
 
+    // Close browserContext if recordHar is enabled
     if (this.options.recordHar && this.browserContext) {
       try {
         await this.browserContext.close()
@@ -1398,16 +1358,16 @@ class Playwright extends Helper {
     }
     this.browserContext = null
 
+    // Initiate browser close without waiting for it to complete
+    // The browser process will be cleaned up when the Node process exits
     if (this.browser) {
       try {
-        // Add timeout to prevent browser.close() from hanging indefinitely
-        await Promise.race([this.browser.close(), new Promise((_, reject) => setTimeout(() => reject(new Error('Browser close timeout')), 5000))])
+        // Fire and forget - don't wait for close to complete
+        this.browser.close().catch(() => {
+          // Silently ignore any errors during async close
+        })
       } catch (e) {
-        // Ignore errors if browser is already closed or timeout
-        if (!e.message?.includes('Browser close timeout')) {
-          // Non-timeout error, can be ignored as well
-        }
-        // Force cleanup even on error
+        // Ignore any synchronous errors
       }
     }
     this.browser = null

package/lib/helper/Puppeteer.js

@@ -2955,7 +2955,7 @@ async function findElements(matcher, locator) {
 async function findElement(matcher, locator) {
   if (locator.react) return findReactElements.call(this, locator)
   locator = new Locator(locator, 'css')
-  
+
   // Check if locator is a role locator and call findByRole
   if (locator.isRole()) {
     const elements = await findByRole.call(this, matcher, locator)
@@ -2967,10 +2967,13 @@ async function findElement(matcher, locator) {
     const elements = await matcher.$$(locator.simplify())
     return elements[0]
   }
-  
-  // For XPath in Puppeteer 24.x+, use the same approach as findElements
-  // $x method was removed, so we use ::-p-xpath() or fallback
-  const elements = await findElements.call(this, matcher, locator)
+  // puppeteer version < 19.4.0 is no longer supported. This one is backward support.
+  if (puppeteer.default?.defaultBrowserRevision) {
+    const elements = await matcher.$$(`xpath/${locator.value}`)
+    return elements[0]
+  }
+  // For Puppeteer 24.x+, $x method was removed - use ::-p-xpath() selector
+  const elements = await matcher.$$(`::-p-xpath(${locator.value})`)
   return elements[0]
 }
 

package/lib/listener/helpers.js

@@ -73,30 +73,18 @@ export default function () {
   })
 
   event.dispatcher.on(event.all.result, () => {
-    // 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) {
+      if (helper._finishTest) {
         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) {
+      if (helper._cleanup) {
         recorder.add(`hook ${key}._cleanup()`, () => helper._cleanup(), true, false)
       }
     })

package/lib/mocha/factory.js

@@ -62,34 +62,9 @@ class MochaFactory {
         const jsFiles = this.files.filter(file => !file.match(/\.feature$/))
         this.files = this.files.filter(file => !file.match(/\.feature$/))
 
-        // Load JavaScript test files using ESM imports
+        // Load JavaScript test files using original loadFiles
         if (jsFiles.length > 0) {
-          try {
-            // Try original loadFiles first for compatibility
-            originalLoadFiles.call(this, fn)
-          } catch (e) {
-            // If original loadFiles fails, load ESM files manually
-            if (e.message.includes('not in cache') || e.message.includes('ESM') || e.message.includes('getStatus')) {
-              // Load ESM files by importing them synchronously using top-level await workaround
-              for (const file of jsFiles) {
-                try {
-                  // Convert file path to file:// URL for dynamic import
-                  const fileUrl = `file://${file}`
-                  // Use import() but don't await it - let it load in the background
-                  import(fileUrl).catch(importErr => {
-                    // If dynamic import fails, the file may have syntax errors or other issues
-                    console.error(`Failed to load test file ${file}:`, importErr.message)
-                  })
-                  if (fn) fn()
-                } catch (fileErr) {
-                  console.error(`Error processing test file ${file}:`, fileErr.message)
-                  if (fn) fn(fileErr)
-                }
-              }
-            } else {
-              throw e
-            }
-          }
+          originalLoadFiles.call(this, fn)
         }
 
         // add ids for each test and check uniqueness