Merge branch '3.x' into copilot/fix-4185

Author: kobenguyent

.github/workflows/testcafe.yml

@@ -16,12 +16,14 @@ env:
 
 jobs:
   build:
-
-    runs-on: ubuntu-22.04
-
     strategy:
       matrix:
-        node-version: [20.x]
+        os: [ubuntu-22.04]
+        php-version: ['8.1']
+        node-version: [22.x]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v5
@@ -31,14 +33,21 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: 7.4
+        php-version: ${{ matrix.php-version }}
     - name: npm install
       run: |
         npm i --force
       env:
         PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: true
         PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
     - name: start a server
-      run: "php -S 127.0.0.1:8000 -t test/data/app &"
+      run: |
+        if [ "$RUNNER_OS" == "Windows" ]; then
+          start /B php -S 127.0.0.1:8000 -t test/data/app
+        else
+          php -S 127.0.0.1:8000 -t test/data/app &
+        fi
+        sleep 3
+      shell: bash
     - name: run unit tests
-      run: xvfb-run --server-args="-screen 0 1280x720x24" ./node_modules/.bin/mocha test/helper/TestCafe_test.js
+      run: npm run test:unit:webbapi:testCafe

lib/utils.js

@@ -12,6 +12,8 @@ import { convertColorToRGBA, isColorProperty } from './colorUtils.js';
 import Fuse from 'fuse.js';
 
 const { js: jsBeautify } = jsBeautifyPkg;
+import { spawnSync } from 'node:child_process';
+
 
 function deepMerge(target, source) {
   return merge(target, source)
@@ -194,8 +196,39 @@ export const test = {
   submittedData(dataFile) {
     return function (key) {
       if (!fs.existsSync(dataFile)) {
-        const waitTill = new Date(new Date().getTime() + 1 * 1000) // wait for one sec for file to be created
-        while (waitTill > new Date()) {}
+        // Extended timeout for CI environments to handle slower processing
+        const waitTime = process.env.CI ? 60 * 1000 : 2 * 1000 // 60 seconds in CI, 2 seconds otherwise
+        let pollInterval = 100 // Start with 100ms polling interval
+        const maxPollInterval = 2000 // Max 2 second intervals
+        const startTime = new Date().getTime()
+
+        // Synchronous polling with exponential backoff to reduce CPU usage
+        while (new Date().getTime() - startTime < waitTime) {
+          if (fs.existsSync(dataFile)) {
+            break
+          }
+          
+          // Use Node.js child_process.spawnSync with platform-specific sleep commands
+          // This avoids busy waiting and allows other processes to run
+          try {
+            if (os.platform() === 'win32') {
+              // Windows: use ping with precise timing (ping waits exactly the specified ms)
+              spawnSync('ping', ['-n', '1', '-w', pollInterval.toString(), '127.0.0.1'], { stdio: 'ignore' })
+            } else {
+              // Unix/Linux/macOS: use sleep with fractional seconds
+              spawnSync('sleep', [(pollInterval / 1000).toString()], { stdio: 'ignore' })
+            }
+          } catch (err) {
+            // If system commands fail, use a simple busy wait with minimal CPU usage
+            const end = new Date().getTime() + pollInterval
+            while (new Date().getTime() < end) {
+              // No-op loop - much lighter than previous approaches
+            }
+          }
+          
+          // Exponential backoff: gradually increase polling interval to reduce resource usage
+          pollInterval = Math.min(pollInterval * 1.2, maxPollInterval)
+        }
       }
       if (!fs.existsSync(dataFile)) {
         throw new Error('Data file was not created in time')

test/helper/TestCafe_test.js

@@ -15,7 +15,7 @@ let I
 const siteUrl = TestHelper.siteUrl()
 
 describe('TestCafe', function () {
-  this.timeout(35000)
+  this.timeout(60000) // Reduced timeout from 120s to 60s for faster feedback
   this.retries(1)
 
   before(() => {
@@ -26,9 +26,9 @@ describe('TestCafe', function () {
       url: siteUrl,
       windowSize: '1000x700',
       show: false,
-      browser: 'chromium',
+      browser: 'chrome:headless --no-sandbox --disable-setuid-sandbox --disable-dev-shm-usage --disable-gpu',
       restart: false,
-      waitForTimeout: 5000,
+      waitForTimeout: 50000,
     })
     I._init()
     return I._beforeSuite()

test/helper/webapi.js

@@ -319,11 +319,13 @@ module.exports.tests = function () {
 
   // Could not get double click to work
   describe('#doubleClick', () => {
-    it('it should doubleClick', async () => {
+    it('it should doubleClick', async function () {
+      if (isHelper('TestCafe')) this.skip() // jQuery CDN not accessible in test environment
+
       await I.amOnPage('/form/doubleclick')
-      await I.dontSee('Done')
+      await I.dontSee('Done!')
       await I.doubleClick('#block')
-      await I.see('Done')
+      await I.see('Done!')
     })
   })
 
@@ -534,15 +536,6 @@ module.exports.tests = function () {
       assert.equal(formContents('name'), 'Nothing special')
     })
 
-    it('should fill field by name', async () => {
-      await I.amOnPage('/form/example1')
-      await I.fillField('LoginForm[username]', 'davert')
-      await I.fillField('LoginForm[password]', '123456')
-      await I.click('Login')
-      assert.equal(formContents('LoginForm').username, 'davert')
-      assert.equal(formContents('LoginForm').password, '123456')
-    })
-
     it('should fill textarea by css', async () => {
       await I.amOnPage('/form/textarea')
       await I.fillField('textarea', 'Nothing special')
@@ -581,6 +574,16 @@ module.exports.tests = function () {
       assert.equal(formContents('name'), 'OLD_VALUE_AND_NEW')
     })
 
+    it('should fill field by name', async () => {
+      if (isHelper('TestCafe')) return // TODO Chrome popup causes problems with TestCafe
+      await I.amOnPage('/form/example1')
+      await I.fillField('LoginForm[username]', 'davert')
+      await I.fillField('LoginForm[password]', '123456')
+      await I.click('Login')
+      assert.equal(formContents('LoginForm').username, 'davert')
+      assert.equal(formContents('LoginForm').password, '123456')
+    })
+
     it.skip('should not fill invisible fields', async () => {
       if (isHelper('Playwright')) return // It won't be implemented
       await I.amOnPage('/form/field')