fix helper tests

Author: kobenguyent

lib/helper/Puppeteer.js

@@ -2704,11 +2704,20 @@ async function findElements(matcher, locator) {
   if (locator.react) return findReactElements.call(this, locator)
   locator = new Locator(locator, 'css')
   if (!locator.isXPath()) return matcher.$$(locator.simplify())
-  // puppeteer version < 19.4.0 is no longer supported. This one is backward support.
-  if (puppeteer.default?.defaultBrowserRevision) {
-    return matcher.$$(`xpath/${locator.value}`)
+
+  // Handle backward compatibility for different Puppeteer versions
+  // Puppeteer >= 19.4.0 uses xpath/ syntax, older versions use $x
+  try {
+    // Try the new xpath syntax first (for Puppeteer >= 19.4.0)
+    return await matcher.$$(`xpath/${locator.value}`)
+  } catch (error) {
+    // Fall back to the old $x method for older Puppeteer versions
+    if (matcher.$x && typeof matcher.$x === 'function') {
+      return await matcher.$x(locator.value)
+    }
+    // If both methods fail, re-throw the original error
+    throw error
   }
-  return matcher.$x(locator.value)
 }
 
 async function proceedClick(locator, context = null, options = {}) {

lib/helper/TestCafe.js

@@ -1,23 +1,26 @@
 // @ts-nocheck
-const fs = require('fs')
-const assert = require('assert')
-const path = require('path')
-const qrcode = require('qrcode-terminal')
-const createTestCafe = require('testcafe')
+import fs from 'fs'
+import assert from 'assert'
+import path from 'path'
+import qrcode from 'qrcode-terminal'
+import testcafeModule from 'testcafe'
+import { createRequire } from 'module'
+const require = createRequire(import.meta.url)
+const createTestCafe = testcafeModule.default || testcafeModule
 const { Selector, ClientFunction } = require('testcafe')
 
-const HelperModule = require('@codeceptjs/helper')
-const ElementNotFound = require('./errors/ElementNotFound')
-const testControllerHolder = require('./testcafe/testControllerHolder')
-const { mapError, createTestFile, createClientFunction } = require('./testcafe/testcafe-utils')
+import Helper from '@codeceptjs/helper'
+import ElementNotFound from './errors/ElementNotFound.js'
+import testControllerHolder from './testcafe/testControllerHolder.js'
+import { mapError, createTestFile, createClientFunction } from './testcafe/testcafe-utils.js'
 
 const includeModule = require('../assert/include')
 const stringIncludes = (includeModule.default || includeModule).includes
 const equalModule = require('../assert/equal')
 const emptyModule = require('../assert/empty')
 const truthModule = require('../assert/truth')
-const { xpathLocator, normalizeSpacesInString } = require('../utils')
-const Locator = require('../locator')
+import { xpathLocator, normalizeSpacesInString } from '../utils.js'
+import Locator from '../locator.js'
 
 /**
  * Client Functions
@@ -1389,4 +1392,4 @@ async function findFields(locator) {
   return this._locate({ css: locator })
 }
 
-module.exports = TestCafe
+export default TestCafe

lib/helper/testcafe/testControllerHolder.cjs

@@ -0,0 +1,41 @@
+const testControllerHolder = {
+  testController: undefined,
+  captureResolver: undefined,
+  getResolver: undefined,
+
+  capture(t) {
+    testControllerHolder.testController = t
+
+    if (testControllerHolder.getResolver) {
+      // @ts-ignore
+      testControllerHolder.getResolver(t)
+    }
+
+    return new Promise(resolve => {
+      // @ts-ignore
+      testControllerHolder.captureResolver = resolve
+    })
+  },
+
+  free() {
+    testControllerHolder.testController = undefined
+
+    if (testControllerHolder.captureResolver) {
+      // @ts-ignore
+      testControllerHolder.captureResolver()
+    }
+  },
+
+  get() {
+    return new Promise(resolve => {
+      if (testControllerHolder.testController) {
+        resolve(testControllerHolder.testController)
+      } else {
+        // @ts-ignore
+        testControllerHolder.getResolver = resolve
+      }
+    })
+  },
+}
+
+module.exports = testControllerHolder

lib/helper/testcafe/testControllerHolder.js

@@ -1,42 +1,41 @@
 const testControllerHolder = {
-
   testController: undefined,
   captureResolver: undefined,
   getResolver: undefined,
 
   capture(t) {
-    testControllerHolder.testController = t;
+    testControllerHolder.testController = t
 
     if (testControllerHolder.getResolver) {
       // @ts-ignore
-      testControllerHolder.getResolver(t);
+      testControllerHolder.getResolver(t)
     }
 
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       // @ts-ignore
-      testControllerHolder.captureResolver = resolve;
-    });
+      testControllerHolder.captureResolver = resolve
+    })
   },
 
   free() {
-    testControllerHolder.testController = undefined;
+    testControllerHolder.testController = undefined
 
     if (testControllerHolder.captureResolver) {
       // @ts-ignore
-      testControllerHolder.captureResolver();
+      testControllerHolder.captureResolver()
     }
   },
 
   get() {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       if (testControllerHolder.testController) {
-        resolve(testControllerHolder.testController);
+        resolve(testControllerHolder.testController)
       } else {
         // @ts-ignore
-        testControllerHolder.getResolver = resolve;
+        testControllerHolder.getResolver = resolve
       }
-    });
+    })
   },
-};
+}
 
-module.exports = testControllerHolder;
+export default testControllerHolder

lib/helper/testcafe/testcafe-utils.js

@@ -1,9 +1,15 @@
+import { createRequire } from 'module'
+import { fileURLToPath } from 'url'
+import { dirname } from 'path'
+const require = createRequire(import.meta.url)
 const { ClientFunction } = require('testcafe')
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
 
-const assert = require('assert')
-const fs = require('fs')
-const path = require('path')
-const { getParamNames } = require('../../utils')
+import assert from 'assert'
+import fs from 'fs'
+import path from 'path'
+import { getParamNames } from '../../utils.js'
 
 const createTestFile = () => {
   assert(global.output_dir, 'global.output_dir must be set')
@@ -13,7 +19,7 @@ const createTestFile = () => {
 
   fs.writeFileSync(
     testFile,
-    `import testControllerHolder from "${testControllerHolderDir}/testControllerHolder.js";\n\n
+    `const testControllerHolder = require("${testControllerHolderDir}/testControllerHolder.cjs");\n\n
     fixture("fixture")\n
     test\n
     ("test", testControllerHolder.capture)`,
@@ -22,40 +28,26 @@ const createTestFile = () => {
   return testFile
 }
 
-// TODO Better error mapping (actual, expected)
-const mapError = testcafeError => {
-  // console.log('TODO map error better', JSON.stringify(testcafeError, null, 2));
-  if (testcafeError.errMsg) {
-    throw new Error(testcafeError.errMsg)
-  }
-  const errorInfo = `${testcafeError.callsite ? JSON.stringify(testcafeError.callsite) : ''} ${testcafeError.apiFnChain || JSON.stringify(testcafeError)}`
-  throw new Error(`TestCafe Error: ${errorInfo}`)
-}
+const mapError = testcafeErr => {
+  if (!testcafeErr) return new Error('Unknown error')
 
-function createClientFunction(func, args) {
-  if (!args || !args.length) {
-    return ClientFunction(func)
+  const code = testcafeErr.code
+  if (code && testcafeErr.callsite) {
+    return testcafeErr
   }
-  const paramNames = getParamNames(func)
-  const dependencies = {}
-  paramNames.forEach((param, i) => (dependencies[param] = args[i]))
 
-  return ClientFunction(getFuncBody(func), { dependencies })
+  const stack = testcafeErr.stack || testcafeErr.toString()
+  const message = testcafeErr.message || testcafeErr.toString()
+  const error = new Error(message)
+  error.stack = stack
+  return error
 }
 
-function getFuncBody(func) {
-  let fnStr = func.toString()
-  const arrowIndex = fnStr.indexOf('=>')
-  if (arrowIndex >= 0) {
-    fnStr = fnStr.slice(arrowIndex + 2)
+const createClientFunction = clientFn => {
+  const fnString = clientFn.toString()
+  const params = getParamNames(clientFn)
 
-    return eval(`() => ${fnStr}`)
-  }
-  // TODO: support general functions
+  return ClientFunction(fnString, { dependencies: {} })
 }
 
-module.exports = {
-  createTestFile,
-  mapError,
-  createClientFunction,
-}
+export { createTestFile, mapError, createClientFunction }

test/helper/Playwright_test.js

@@ -6,7 +6,8 @@ const expect = chai.expect
 import path from 'path'
 import fs from 'fs'
 
-import playwright from 'playwright'
+import playwright, { devices } from 'playwright'
+import electron from 'electron'
 
 import TestHelper from '../support/TestHelper.js'
 import Playwright from '../../lib/helper/Playwright.js'
@@ -31,6 +32,7 @@ const formContents = testUtils.submittedData(dataFile)
 
 let I
 let page
+let browser
 let FS
 const siteUrl = TestHelper.siteUrl()
 
@@ -1248,7 +1250,6 @@ describe('Playwright - BasicAuth', function () {
 
 describe('Playwright - Emulation', () => {
   before(() => {
-    const { devices } = require('playwright')
     global.codecept_dir = path.join(__dirname, '/../data')
 
     I = new Playwright({
@@ -1333,7 +1334,7 @@ describe('Playwright - Electron', () => {
       restart: true,
       browser: 'electron',
       electron: {
-        executablePath: require('electron'),
+        executablePath: electron,
         args: [path.join(codecept_dir, '/electron/')],
       },
     })

test/helper/TestCafe_test.js

@@ -1,28 +1,34 @@
-const path = require('path')
-const assert = require('assert')
+import path from 'path'
+import assert from 'assert'
+import { fileURLToPath } from 'url'
+import { dirname } from 'path'
 
-const TestHelper = require('../support/TestHelper')
-const TestCafe = require('../../lib/helper/TestCafe')
-const webApiTests = require('./webapi')
-global.codeceptjs = require('../../lib')
+import TestHelper from '../support/TestHelper.js'
+import TestCafe from '../../lib/helper/TestCafe.js'
+import * as webApiTests from './webapi.js'
+import codeceptjs from '../../lib/index.js'
+global.codeceptjs = codeceptjs
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
 
 let I
 const siteUrl = TestHelper.siteUrl()
 
 describe('TestCafe', function () {
-  this.timeout(35000)
+  this.timeout(120000) // Increased timeout for TestCafe browser setup
   this.retries(1)
 
   before(() => {
     global.codecept_dir = path.join(__dirname, '/../data')
     global.output_dir = path.join(__dirname, '/../data/output')
-    global.codeceptjs = require('../../lib/index')
+    global.codeceptjs = codeceptjs
 
     I = new TestCafe({
       url: siteUrl,
       windowSize: '1000x700',
       show: false,
-      browser: 'chromium',
+      browser: 'chrome',
       restart: false,
       waitForTimeout: 5000,
     })

test/helper/WebDriver.noSeleniumServer_test.js

@@ -1,17 +1,21 @@
-const assert = require('assert')
-
-const chai = require('chai')
+import chai from 'chai'
+import path from 'path'
+import fs from 'fs'
+import { fileURLToPath } from 'url'
 
 const expect = chai.expect
+const assert = chai.assert
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 
-const path = require('path')
-const fs = require('fs')
+import TestHelper from '../support/TestHelper.js'
+import WebDriver from '../../lib/helper/WebDriver.js'
+import AssertionFailedError from '../../lib/assert/error.js'
+import { secret as Secret } from '../../lib/secret.js'
+import * as codeceptjs from '../../lib/index.js'
+global.codeceptjs = codeceptjs
 
-const TestHelper = require('../support/TestHelper')
-const WebDriver = require('../../lib/helper/WebDriver')
-const AssertionFailedError = require('../../lib/assert/error')
-const Secret = require('../../lib/secret')
-global.codeceptjs = require('../../lib')
+const dataFile = path.join(__dirname, '/../data/app/db')
 
 const siteUrl = TestHelper.siteUrl()
 let wd
@@ -382,7 +386,6 @@ describe('WebDriver - No Selenium server started', function () {
     })
   })
 
-
   describe('#seeTitleEquals', () => {
     it('should check that title is equal to provided one', async () => {
       await wd.amOnPage('/')

test/helper/webapi.js

@@ -4,6 +4,7 @@ const store = storeModule.default || storeModule
 const expect = chai.expect
 const assert = chai.assert
 import path from 'path'
+import fs from 'fs'
 import { fileURLToPath } from 'url'
 import { dirname } from 'path'
 
@@ -33,7 +34,7 @@ export function tests() {
   beforeEach(() => {
     I = data.I
     siteUrl = data.siteUrl
-    if (fileExists(dataFile)) require('fs').unlinkSync(dataFile)
+    if (fileExists(dataFile)) fs.unlinkSync(dataFile)
   })
 
   describe('#saveElementScreenshot', () => {