Merge branch '4.x' of https://github.com/codeceptjs/CodeceptJS into fix/esm-test-loading

Author: DenysKuchma

.github/workflows/docker.yml

@@ -29,6 +29,9 @@ jobs:
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
@@ -51,6 +54,7 @@ jobs:
         with:
           context: .
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: |
             ${{ env.DOCKER_REPO }}:latest
             ${{ env.DOCKER_REPO }}:${{ env.VERSION }}

.prettierignore

@@ -0,0 +1,2 @@
+# Vendored third-party bundles used by rich-text editor test fixtures
+test/data/app/js/

Dockerfile

@@ -1,5 +1,5 @@
 # Download Playwright and its dependencies
-FROM mcr.microsoft.com/playwright:v1.55.0-noble
+FROM mcr.microsoft.com/playwright:v1.61.0-noble
 
 # Set non-interactive mode for apt operations
 ENV DEBIAN_FRONTEND=noninteractive

docs/playwright.md

@@ -63,6 +63,25 @@ Make sure `Playwright` helper is enabled in `codecept.conf.js` config:
 > Turn off the `show` option if you want to run test in headless mode.
 > If you don't specify the browser here, `chromium` will be used. Possible browsers are: `chromium`, `firefox` and `webkit`
 
+To point `firefox` at a custom build instead of the bundled one, pass `executablePath` under the
+`firefox` key:
+
+```js
+  helpers: {
+    Playwright: {
+      url: "http://localhost",
+      browser: 'firefox',
+      firefox: {
+        executablePath: '/path/to/firefox'
+      }
+    }
+  }
+```
+
+Useful with a build like [invisible_playwright](https://github.com/feder-cr/invisible_playwright),
+patched at the source level for a realistic fingerprint, for sites that detect the default Chromium
+path.
+
 Playwright uses different strategies to detect if a page is loaded. In configuration use `waitForNavigation` option for that:
 
 When to consider navigation succeeded, defaults to `load`. Given an array of event strings, navigation is considered to be successful after all events have been fired. Events can be either:

eslint.config.mjs

@@ -14,7 +14,7 @@ const compat = new FlatCompat({
 
 export default [
   {
-    ignores: ['test/data/output', 'lib/css2xpath/*'],
+    ignores: ['test/data/output', 'test/data/app/js/*', 'lib/css2xpath/*'],
   },
   {
     languageOptions: {

lib/data/context.js

@@ -82,8 +82,13 @@ function isTableDataRow(row) {
   return has.call(row, 'data') && has.call(row, 'skip')
 }
 
+function isDataTable(dataTable) {
+  if (dataTable instanceof DataTable) return true
+  return Boolean(dataTable) && Array.isArray(dataTable.array) && Array.isArray(dataTable.rows) && typeof dataTable.add === 'function'
+}
+
 function detectDataType(dataTable) {
-  if (dataTable instanceof DataTable) {
+  if (isDataTable(dataTable)) {
     return dataTable.rows
   }
 

lib/globals.js

@@ -30,10 +30,8 @@ export async function initCodeceptGlobals(dir, config, container) {
   // pause/inject/share stay global even under noGlobals — they're the everyday
   // debugging/wiring entry points and have no useful import alternative for
   // page-object code that runs before the container is available.
-  global.pause = async (...args) => {
-    const pauseModule = await import('./pause.js')
-    return (pauseModule.default || pauseModule)(...args)
-  }
+  const pauseModule = await import('./pause.js')
+  global.pause = pauseModule.default || pauseModule
   global.inject = () => container.support()
   global.share = container.share
 

lib/helper/GraphQL.js

@@ -53,14 +53,6 @@ class GraphQL extends Helper {
     this.axios.defaults.headers = this.options.defaultHeaders
   }
 
-  static _checkRequirements() {
-    try {
-      require('axios')
-    } catch (e) {
-      return ['axios']
-    }
-  }
-
   static _config() {
     return [
       {

lib/helper/GraphQLDataFactory.js

@@ -174,15 +174,6 @@ class GraphQLDataFactory extends Helper {
     Object.keys(this.factories).forEach(f => (this.created[f] = []))
   }
 
-  static _checkRequirements() {
-    try {
-      require('axios')
-      require('rosie')
-    } catch (e) {
-      return ['axios', 'rosie']
-    }
-  }
-
   _after() {
     if (!this.config.cleanup) {
       return Promise.resolve()

lib/mocha/loadTests.js

@@ -4,7 +4,9 @@ import gherkinParser, { loadTranslations } from './gherkin.js'
 import output from '../output.js'
 import { resolveImportModulePath } from '../utils.js'
 
-export default async function loadTests(mocha) {
+let reloadId = 0
+
+export default async function loadTests(mocha, options = {}) {
   mocha.lazyLoadFiles(true)
 
   const featureFiles = mocha.files.filter(file => file.match(/\.feature$/))
@@ -19,9 +21,14 @@ export default async function loadTests(mocha) {
 
   for (const file of testFiles) {
     const resolvedPath = resolveImportModulePath(fsPath.resolve(file))
+    const moduleUrl = new URL(resolvedPath)
+    if (options.reload) {
+      moduleUrl.searchParams.set('codeceptjsReload', String(++reloadId))
+    }
+
     mocha.suite.emit('pre-require', global, file, mocha)
     try {
-      const module = await import(resolvedPath)
+      const module = await import(moduleUrl.href)
       mocha.suite.emit('require', module, file, mocha)
     } catch (err) {
       throw enrichLoaderError(err, file)