Merge branch '4.x' into feat/locator-json-as-string

Resolved conflict in test/unit/plugin/htmlReporter_test.js by keeping ESM import.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: DavertMik

docs/helpers/WebDriver.md

@@ -1469,6 +1469,21 @@ const webElement = await I.grabWebElement('#button');
 
 Returns **[Promise][23]<any>** WebElement of being used Web helper
 
+### grabWebElement
+
+Grab WebElement for given locator
+Resumes test execution, so **should be used inside an async function with `await`** operator.
+
+```js
+const webElement = await I.grabWebElement('#button');
+```
+
+#### Parameters
+
+*   `locator` **([string][18] | [object][17])** element located by CSS|XPath|strict locator.
+
+Returns **[Promise][26]<any>** WebElement of being used Web helper
+
 ### grabWebElements
 
 Grab WebElements for given locator

…ndbox/custom-worker/share_test.worker.js …box/custom-worker/1_share_test.worker.jstest/data/sandbox/custom-worker/share_test.worker.js renamed to test/data/sandbox/custom-worker/1_share_test.worker.js test/data/sandbox/custom-worker/share_test.worker.js renamed to test/data/sandbox/custom-worker/1_share_test.worker.js

@@ -1101,7 +1101,11 @@ describe('Playwright', function () {
 
     it('should convert to axios response with onResponse hook', async () => {
       let response
+<<<<<<< HEAD
       I.options.onResponse = resp => (response = resp)
+=======
+      I.config.onResponse = resp => (response = resp)
+>>>>>>> 875a660b5219dd2475883ed35db6adb58852216f
       await I.makeApiRequest('get', 'http://localhost:3001/api/users?page=2')
       expect(response).to.be.ok
       expect(response.status).to.equal(200)
@@ -2087,6 +2091,7 @@ describe('Playwright - storageState file path', function () {
     } catch (_) {}
   })
 })
+<<<<<<< HEAD
 
 // Global after hook to ensure process exits after all tests complete
 // This prevents the process from hanging due to Playwright event loops
@@ -2097,3 +2102,5 @@ after(function () {
     }, 1000).unref()
   }
 })
+=======
+>>>>>>> 875a660b5219dd2475883ed35db6adb58852216f

…dbox/custom-worker/custom_test.worker.js …ox/custom-worker/2_custom_test.worker.jstest/data/sandbox/custom-worker/custom_test.worker.js renamed to test/data/sandbox/custom-worker/2_custom_test.worker.js test/data/sandbox/custom-worker/custom_test.worker.js renamed to test/data/sandbox/custom-worker/2_custom_test.worker.js

@@ -0,0 +1,92 @@
+const path = require('path')
+const assert = require('assert')
+
+const TestHelper = require('../support/TestHelper')
+const TestCafe = require('../../lib/helper/TestCafe')
+const webApiTests = require('./webapi')
+global.codeceptjs = require('../../lib')
+
+let I
+const siteUrl = TestHelper.siteUrl()
+
+describe('TestCafe', function () {
+  this.timeout(60000) // Reduced timeout from 120s to 60s for faster feedback
+  this.retries(1)
+
+  before(() => {
+    global.codecept_dir = path.join(__dirname, '/../data')
+    global.output_dir = path.join(__dirname, '/../data/output')
+    global.codeceptjs = require('../../lib/index')
+
+    I = new TestCafe({
+      url: siteUrl,
+      windowSize: '1000x700',
+      show: false,
+      browser: 'chrome:headless --no-sandbox --disable-setuid-sandbox --disable-dev-shm-usage --disable-gpu',
+      restart: false,
+      waitForTimeout: 50000,
+    })
+    I._init()
+    return I._beforeSuite()
+  })
+
+  after(() => {
+    return I._finishTest()
+  })
+
+  beforeEach(() => {
+    webApiTests.init({
+      I,
+      siteUrl,
+    })
+    return I._before().then(() => {
+      page = I.page
+      browser = I.browser
+    })
+  })
+
+  afterEach(() => {
+    return I._after()
+  })
+
+  describe('open page : #amOnPage', () => {
+    it('should open main page of configured site', async () => {
+      await I.amOnPage('/')
+      const url = await I.grabCurrentUrl()
+      await url.should.eql(`${siteUrl}/`)
+    })
+    it('should open any page of configured site', async () => {
+      await I.amOnPage('/info')
+      const url = await I.grabCurrentUrl()
+      return url.should.eql(`${siteUrl}/info`)
+    })
+
+    it('should open absolute url', async () => {
+      await I.amOnPage(siteUrl)
+      const url = await I.grabCurrentUrl()
+      return url.should.eql(`${siteUrl}/`)
+    })
+  })
+
+  describe('#waitForFunction', () => {
+    it('should wait for function returns true', () => {
+      return I.amOnPage('/form/wait_js').then(() => I.waitForFunction(() => window.__waitJs, 3))
+    })
+
+    it('should pass arguments and wait for function returns true', () => {
+      return I.amOnPage('/form/wait_js').then(() => I.waitForFunction(varName => window[varName], ['__waitJs'], 3))
+    })
+  })
+
+  webApiTests.tests()
+
+  describe('#useTestCafeTo', () => {
+    it('should return title', async () => {
+      await I.amOnPage('/')
+      const title = await I.useTestCafeTo('test', async ({ t }) => {
+        return t.eval(() => document.title, { boundTestRun: null })
+      })
+      assert.equal('TestEd Beta 2.0', title)
+    })
+  })
+})

…andbox/custom-worker/base_test.worker.js …dbox/custom-worker/3_base_test.worker.jstest/data/sandbox/custom-worker/base_test.worker.js renamed to test/data/sandbox/custom-worker/3_base_test.worker.js test/data/sandbox/custom-worker/base_test.worker.js renamed to test/data/sandbox/custom-worker/3_base_test.worker.js

@@ -0,0 +1,84 @@
+const expect = require('chai').expect
+const Codecept = require('../../lib/codecept')
+const path = require('path')
+const fs = require('fs')
+
+describe('Test Files Alphabetical Order', () => {
+  let codecept
+  const tempDir = path.join(__dirname, '../data/sandbox/configs/alphabetical_order')
+  const config = {
+    tests: `${tempDir}/*_test.js`,
+    gherkin: { features: null },
+    output: './output',
+    hooks: [],
+  }
+
+  before(() => {
+    if (!fs.existsSync(tempDir)) {
+      fs.mkdirSync(tempDir, { recursive: true })
+    }
+
+    fs.writeFileSync(
+      path.join(tempDir, 'zzz_test.js'),
+      `
+        Feature('Test');
+        Scenario('zzz test', () => {});
+      `,
+    )
+    fs.writeFileSync(
+      path.join(tempDir, 'aaa_test.js'),
+      `
+        Feature('Test');
+        Scenario('aaa test', () => {});
+      `,
+    )
+    fs.writeFileSync(
+      path.join(tempDir, 'mmm_test.js'),
+      `
+        Feature('Test');
+        Scenario('mmm test', () => {});
+      `,
+    )
+  })
+
+  after(() => {
+    const files = ['zzz_test.js', 'aaa_test.js', 'mmm_test.js']
+    files.forEach(file => {
+      const filePath = path.join(tempDir, file)
+      if (fs.existsSync(filePath)) {
+        fs.unlinkSync(filePath)
+      }
+    })
+  })
+
+  beforeEach(() => {
+    codecept = new Codecept(config, {})
+    codecept.init(path.join(__dirname, '../data/sandbox'))
+  })
+
+  it('should sort test files alphabetically after loading', () => {
+    codecept.loadTests()
+
+    if (codecept.testFiles.length === 0) {
+      console.log('No test files found, skipping test')
+      return
+    }
+
+    const filenames = codecept.testFiles.map(filePath => path.basename(filePath))
+
+    const sortedFilenames = [...filenames].sort()
+
+    expect(filenames).to.deep.equal(sortedFilenames)
+
+    const aaaIndex = filenames.findIndex(f => f.includes('aaa_test.js'))
+    const mmmIndex = filenames.findIndex(f => f.includes('mmm_test.js'))
+    const zzzIndex = filenames.findIndex(f => f.includes('zzz_test.js'))
+
+    expect(aaaIndex).to.be.greaterThan(-1)
+    expect(mmmIndex).to.be.greaterThan(-1)
+    expect(zzzIndex).to.be.greaterThan(-1)
+
+    expect(aaaIndex).to.be.lessThan(mmmIndex, 'aaa_test.js should come before mmm_test.js')
+    expect(mmmIndex).to.be.lessThan(zzzIndex, 'mmm_test.js should come before zzz_test.js')
+  })
+})