codeceptjs 4.0.0-beta.4 → 4.0.0-beta.6.esm-aria

package/lib/helper/ApiDataFactory.js

@@ -1,7 +1,6 @@
-const path = require('path')
-
-const Helper = require('@codeceptjs/helper')
-const REST = require('./REST')
+import path from 'path'
+import Helper from '@codeceptjs/helper'
+import REST from './REST.js'
 
 /**
  * Helper for managing remote data using REST API.
@@ -217,15 +216,16 @@ class ApiDataFactory extends Helper {
     }
 
     this.created = {}
-    Object.keys(this.factories).forEach((f) => (this.created[f] = []))
+    Object.keys(this.factories).forEach(f => (this.created[f] = []))
   }
 
   static _checkRequirements() {
     try {
-      require('axios')
-      require('rosie')
+      // In ESM, dependencies are already imported at the top
+      // The import will fail at module load time if dependencies are missing
+      return null
     } catch (e) {
-      return ['axios', 'rosie']
+      return ['axios']
     }
   }
 
@@ -265,8 +265,8 @@ class ApiDataFactory extends Helper {
    * @param {*} [options] options for programmatically generate the attributes
    * @returns {Promise<*>}
    */
-  have(factory, params, options) {
-    const item = this._createItem(factory, params, options)
+  async have(factory, params, options) {
+    const item = await this._createItem(factory, params, options)
     this.debug(`Creating ${factory} ${JSON.stringify(item)}`)
     return this._requestCreate(factory, item)
   }
@@ -298,19 +298,22 @@ class ApiDataFactory extends Helper {
     return Promise.all(promises)
   }
 
-  _createItem(model, data, options) {
+  async _createItem(model, data, options) {
     if (!this.factories[model]) {
       throw new Error(`Factory ${model} is not defined in config`)
     }
     let modulePath = this.factories[model].factory
     try {
       try {
-        require.resolve(modulePath)
+        // Try to resolve the path as-is first
+        await import.meta.resolve(modulePath)
       } catch (e) {
+        // If not found, try relative to codecept_dir
         modulePath = path.join(global.codecept_dir, modulePath)
       }
       // check if the new syntax `export default new Factory()` is used and loads the builder, otherwise loads the module that used old syntax `module.exports = new Factory()`.
-      const builder = require(modulePath).default || require(modulePath)
+      const module = await import(modulePath)
+      const builder = module.default || module
       return builder.build(data, options)
     } catch (err) {
       throw new Error(`Couldn't load factory file from ${modulePath}, check that
@@ -357,7 +360,7 @@ Current file error: ${err.message}`)
 
     request.baseURL = this.config.endpoint
 
-    return this.restHelper._executeRequest(request).then((resp) => {
+    return this.restHelper._executeRequest(request).then(resp => {
       const id = this._fetchId(resp.data, factory)
       this.created[factory].push(id)
       this.debugSection('Created', `Id: ${id}`)
@@ -391,10 +394,7 @@ Current file error: ${err.message}`)
     request.baseURL = this.config.endpoint
 
     if (request.url.match(/^undefined/)) {
-      return this.debugSection(
-        'Please configure the delete request in your ApiDataFactory helper',
-        "delete: () => ({ method: 'DELETE',  url: '/api/users' })",
-      )
+      return this.debugSection('Please configure the delete request in your ApiDataFactory helper', "delete: () => ({ method: 'DELETE',  url: '/api/users' })")
     }
 
     return this.restHelper._executeRequest(request).then(() => {
@@ -405,7 +405,7 @@ Current file error: ${err.message}`)
   }
 }
 
-module.exports = ApiDataFactory
+export { ApiDataFactory as default }
 
 function createRequestFromFunction(param, data) {
   if (typeof param !== 'function') return

package/lib/helper/Appium.js

@@ -44,7 +44,7 @@ const vendorPrefix = {
  *
  * This helper should be configured in codecept.conf.ts or codecept.conf.js
  *
- * * `appiumV2`: set this to true if you want to run tests with AppiumV2. See more how to setup [here](https://codecept.io/mobile/#setting-up)
+ * * `appiumV2`: by default is true, set this to false if you want to run tests with AppiumV1. See more how to setup [here](https://codecept.io/mobile/#setting-up)
  * * `app`: Application path. Local path or remote URL to an .ipa or .apk file, or a .zip containing one of these. Alias to desiredCapabilities.appPackage
  * * `host`: (default: 'localhost') Appium host
  * * `port`: (default: '4723') Appium port
@@ -124,7 +124,7 @@ const vendorPrefix = {
  * {
  * helpers: {
  *   Appium: {
- *         appiumV2: true,
+ *         appiumV2: true, // By default is true, set to false if you want to run against Appium v1
  *         host: "hub-cloud.browserstack.com",
  *         port: 4444,
  *         user: process.env.BROWSERSTACK_USER,
@@ -178,16 +178,12 @@ class Appium extends Webdriver {
     super(config)
 
     this.isRunning = false
-    if (config.appiumV2 === true) {
-      this.appiumV2 = true
-    }
+    this.appiumV2 = config.appiumV2 || true
     this.axios = axios.create()
 
     webdriverio = require('webdriverio')
     if (!config.appiumV2) {
-      console.log(
-        'The Appium core team does not maintain Appium 1.x anymore since the 1st of January 2022. Please migrating to Appium 2.x by adding appiumV2: true to your config.',
-      )
+      console.log('The Appium core team does not maintain Appium 1.x anymore since the 1st of January 2022. Appium 2.x is used by default.')
       console.log('More info: https://bit.ly/appium-v2-migration')
       console.log('This Appium 1.x support will be removed in next major release.')
     }
@@ -234,20 +230,14 @@ class Appium extends Webdriver {
 
     config.baseUrl = config.url || config.baseUrl
     if (config.desiredCapabilities && Object.keys(config.desiredCapabilities).length) {
-      config.capabilities =
-        this.appiumV2 === true ? this._convertAppiumV2Caps(config.desiredCapabilities) : config.desiredCapabilities
+      config.capabilities = this.appiumV2 === true ? this._convertAppiumV2Caps(config.desiredCapabilities) : config.desiredCapabilities
     }
 
     if (this.appiumV2) {
-      config.capabilities[`${vendorPrefix.appium}:deviceName`] =
-        config[`${vendorPrefix.appium}:device`] || config.capabilities[`${vendorPrefix.appium}:deviceName`]
-      config.capabilities[`${vendorPrefix.appium}:browserName`] =
-        config[`${vendorPrefix.appium}:browser`] || config.capabilities[`${vendorPrefix.appium}:browserName`]
-      config.capabilities[`${vendorPrefix.appium}:app`] =
-        config[`${vendorPrefix.appium}:app`] || config.capabilities[`${vendorPrefix.appium}:app`]
-      config.capabilities[`${vendorPrefix.appium}:tunnelIdentifier`] =
-        config[`${vendorPrefix.appium}:tunnelIdentifier`] ||
-        config.capabilities[`${vendorPrefix.appium}:tunnelIdentifier`] // Adding the code to connect to sauce labs via sauce tunnel
+      config.capabilities[`${vendorPrefix.appium}:deviceName`] = config[`${vendorPrefix.appium}:device`] || config.capabilities[`${vendorPrefix.appium}:deviceName`]
+      config.capabilities[`${vendorPrefix.appium}:browserName`] = config[`${vendorPrefix.appium}:browser`] || config.capabilities[`${vendorPrefix.appium}:browserName`]
+      config.capabilities[`${vendorPrefix.appium}:app`] = config[`${vendorPrefix.appium}:app`] || config.capabilities[`${vendorPrefix.appium}:app`]
+      config.capabilities[`${vendorPrefix.appium}:tunnelIdentifier`] = config[`${vendorPrefix.appium}:tunnelIdentifier`] || config.capabilities[`${vendorPrefix.appium}:tunnelIdentifier`] // Adding the code to connect to sauce labs via sauce tunnel
     } else {
       config.capabilities.deviceName = config.device || config.capabilities.deviceName
       config.capabilities.browserName = config.browser || config.capabilities.browserName
@@ -393,8 +383,10 @@ class Appium extends Webdriver {
 
   _buildAppiumEndpoint() {
     const { protocol, port, hostname, path } = this.browser.options
+    // Ensure path does NOT end with a slash to prevent double slashes
+    const normalizedPath = path.replace(/\/$/, '')
     // Build path to Appium REST API endpoint
-    return `${protocol}://${hostname}:${port}${path}`
+    return `${protocol}://${hostname}:${port}${normalizedPath}/session/${this.browser.sessionId}`
   }
 
   /**
@@ -610,7 +602,7 @@ class Appium extends Webdriver {
 
     return this.axios({
       method: 'post',
-      url: `${this._buildAppiumEndpoint()}/session/${this.browser.sessionId}/appium/device/remove_app`,
+      url: `${this._buildAppiumEndpoint()}/appium/device/remove_app`,
       data: { appId, bundleId },
     })
   }
@@ -627,7 +619,7 @@ class Appium extends Webdriver {
     onlyForApps.call(this)
     return this.axios({
       method: 'post',
-      url: `${this._buildAppiumEndpoint()}/session/${this.browser.sessionId}/appium/app/reset`,
+      url: `${this._buildAppiumEndpoint()}/appium/app/reset`,
     })
   }
 
@@ -701,7 +693,7 @@ class Appium extends Webdriver {
 
     const res = await this.axios({
       method: 'get',
-      url: `${this._buildAppiumEndpoint()}/session/${this.browser.sessionId}/orientation`,
+      url: `${this._buildAppiumEndpoint()}/orientation`,
     })
 
     const currentOrientation = res.data.value
@@ -725,7 +717,7 @@ class Appium extends Webdriver {
 
     return this.axios({
       method: 'post',
-      url: `${this._buildAppiumEndpoint()}/session/${this.browser.sessionId}/orientation`,
+      url: `${this._buildAppiumEndpoint()}/orientation`,
       data: { orientation },
     })
   }
@@ -964,21 +956,19 @@ class Appium extends Webdriver {
    * ```js
    * // taps outside to hide keyboard per default
    * I.hideDeviceKeyboard();
-   * I.hideDeviceKeyboard('tapOutside');
-   *
-   * // or by pressing key
-   * I.hideDeviceKeyboard('pressKey', 'Done');
    * ```
    *
    * Appium: support Android and iOS
    *
-   * @param {'tapOutside' | 'pressKey'} [strategy] Desired strategy to close keyboard (‘tapOutside’ or ‘pressKey’)
-   * @param {string} [key] Optional key
    */
-  async hideDeviceKeyboard(strategy, key) {
+  async hideDeviceKeyboard() {
     onlyForApps.call(this)
-    strategy = strategy || 'tapOutside'
-    return this.browser.hideKeyboard(strategy, key)
+
+    return this.axios({
+      method: 'post',
+      url: `${this._buildAppiumEndpoint()}/appium/device/hide_keyboard`,
+      data: {},
+    })
   }
 
   /**
@@ -1054,7 +1044,13 @@ class Appium extends Webdriver {
    * @param {*} locator
    */
   async tap(locator) {
-    return this.makeTouchAction(locator, 'tap')
+    const { elementId } = await this.browser.$(parseLocator.call(this, locator))
+
+    return this.axios({
+      method: 'post',
+      url: `${this._buildAppiumEndpoint()}/element/${elementId}/click`,
+      data: {},
+    })
   }
 
   /**
@@ -1304,14 +1300,14 @@ class Appium extends Webdriver {
           }
           return browser
             .$$(parseLocator.call(this, searchableLocator))
-            .then((els) => els.length && els[0].isDisplayed())
-            .then((res) => {
+            .then(els => els.length && els[0].isDisplayed())
+            .then(res => {
               if (res) {
                 return true
               }
               return this[direction](scrollLocator, offset, speed)
                 .getSource()
-                .then((source) => {
+                .then(source => {
                   if (source === currentSource) {
                     err = true
                   } else {
@@ -1324,12 +1320,9 @@ class Appium extends Webdriver {
         timeout * 1000,
         errorMsg,
       )
-      .catch((e) => {
+      .catch(e => {
         if (e.message.indexOf('timeout') && e.type !== 'NoSuchElement') {
-          throw new AssertionFailedError(
-            { customMessage: `Scroll to the end and element ${searchableLocator} was not found` },
-            '',
-          )
+          throw new AssertionFailedError({ customMessage: `Scroll to the end and element ${searchableLocator} was not found` }, '')
         } else {
           throw e
         }
@@ -1386,8 +1379,8 @@ class Appium extends Webdriver {
    */
   async pullFile(path, dest) {
     onlyForApps.call(this)
-    return this.browser.pullFile(path).then((res) =>
-      fs.writeFile(dest, Buffer.from(res, 'base64'), (err) => {
+    return this.browser.pullFile(path).then(res =>
+      fs.writeFile(dest, Buffer.from(res, 'base64'), err => {
         if (err) {
           return false
         }
@@ -1504,7 +1497,14 @@ class Appium extends Webdriver {
    */
   async click(locator, context) {
     if (this.isWeb) return super.click(locator, context)
-    return super.click(parseLocator.call(this, locator), parseLocator.call(this, context))
+
+    const { elementId } = await this.browser.$(parseLocator.call(this, locator), parseLocator.call(this, context))
+
+    return this.axios({
+      method: 'post',
+      url: `${this._buildAppiumEndpoint()}/element/${elementId}/click`,
+      data: {},
+    })
   }
 
   /**
@@ -1759,12 +1759,8 @@ function parseLocator(locator) {
   }
 
   locator = new Locator(locator, 'xpath')
-  if (locator.type === 'css' && !this.isWeb)
-    throw new Error(
-      'Unable to use css locators in apps. Locator strategies for this request: xpath, id, class name or accessibility id',
-    )
-  if (locator.type === 'name' && !this.isWeb)
-    throw new Error("Can't locate element by name in Native context. Use either ID, class name or accessibility id")
+  if (locator.type === 'css' && !this.isWeb) throw new Error('Unable to use css locators in apps. Locator strategies for this request: xpath, id, class name or accessibility id')
+  if (locator.type === 'name' && !this.isWeb) throw new Error("Can't locate element by name in Native context. Use either ID, class name or accessibility id")
   if (locator.type === 'id' && !this.isWeb && this.platform === 'android') return `//*[@resource-id='${locator.value}']`
   return locator.simplify()
 }

package/lib/helper/FileSystem.js

@@ -1,11 +1,11 @@
-const assert = require('assert')
-const path = require('path')
-const fs = require('fs')
+import assert from 'assert'
+import path from 'path'
+import fs from 'fs'
 
-const Helper = require('@codeceptjs/helper')
-const { fileExists } = require('../utils')
-const { fileIncludes } = require('../assert/include')
-const { fileEquals } = require('../assert/equal')
+import Helper from '@codeceptjs/helper'
+import { fileExists } from '../utils.js'
+import { fileIncludes } from '../assert/include.js'
+import { fileEquals } from '../assert/equal.js'
 
 /**
  * Helper for testing filesystem.
@@ -38,7 +38,12 @@ class FileSystem extends Helper {
   }
 
   _before() {
-    this.debugSection('Dir', this.dir)
+    try {
+      this.debugSection('Dir', this.dir)
+    } catch (e) {
+      // Fallback debug for ESM transition
+      console.log(`[Dir] ${this.dir}`)
+    }
   }
 
   /**
@@ -48,7 +53,12 @@ class FileSystem extends Helper {
    */
   amInPath(openPath) {
     this.dir = path.join(global.codecept_dir, openPath)
-    this.debugSection('Dir', this.dir)
+    try {
+      this.debugSection('Dir', this.dir)
+    } catch (e) {
+      // Fallback debug for ESM transition
+      console.log(`[Dir] ${this.dir}`)
+    }
   }
 
   /**
@@ -66,7 +76,12 @@ class FileSystem extends Helper {
    */
   seeFile(name) {
     this.file = path.join(this.dir, name)
-    this.debugSection('File', this.file)
+    try {
+      this.debugSection('File', this.file)
+    } catch (e) {
+      // Fallback debug for ESM transition
+      console.log(`[File] ${this.file}`)
+    }
     assert.ok(fileExists(this.file), `File ${name} not found in ${this.dir}`)
   }
 
@@ -86,7 +101,12 @@ class FileSystem extends Helper {
     if (sec === 0) assert.fail('Use `seeFile` instead of waiting 0 seconds!')
     const waitTimeout = sec * 1000
     this.file = path.join(this.dir, name)
-    this.debugSection('File', this.file)
+    try {
+      this.debugSection('File', this.file)
+    } catch (e) {
+      // Fallback debug for ESM transition
+      console.log(`[File] ${this.file}`)
+    }
     return isFileExists(this.file, waitTimeout).catch(() => {
       throw new Error(`file (${name}) still not present in directory ${this.dir} after ${waitTimeout / 1000} sec`)
     })
@@ -105,7 +125,7 @@ class FileSystem extends Helper {
    */
   seeFileNameMatching(text) {
     assert.ok(
-      this.grabFileNames().some((file) => file.includes(text)),
+      this.grabFileNames().some(file => file.includes(text)),
       `File name which contains ${text} not found in ${this.dir}`,
     )
   }
@@ -175,11 +195,11 @@ class FileSystem extends Helper {
    * ```
    */
   grabFileNames() {
-    return fs.readdirSync(this.dir).filter((item) => !fs.lstatSync(path.join(this.dir, item)).isDirectory())
+    return fs.readdirSync(this.dir).filter(item => !fs.lstatSync(path.join(this.dir, item)).isDirectory())
   }
 }
 
-module.exports = FileSystem
+export { FileSystem as default }
 
 /**
  * @param {string} file
@@ -216,7 +236,7 @@ function isFileExists(file, timeout) {
       }
     })
 
-    fs.access(file, fs.constants.R_OK, (err) => {
+    fs.access(file, fs.constants.R_OK, err => {
       if (!err) {
         clearTimeout(timer)
         watcher.close()

package/lib/helper/GraphQL.js

@@ -1,5 +1,5 @@
 const axios = require('axios').default
-const Helper = require('@codeceptjs/helper')
+const HelperModule = require('@codeceptjs/helper')
 
 /**
  * GraphQL helper allows to send additional requests to a GraphQl endpoint during acceptance tests.

package/lib/helper/GraphQLDataFactory.js

@@ -1,6 +1,6 @@
 const path = require('path')
 
-const Helper = require('@codeceptjs/helper')
+const HelperModule = require('@codeceptjs/helper')
 const GraphQL = require('./GraphQL')
 
 /**
@@ -170,7 +170,7 @@ class GraphQLDataFactory extends Helper {
     this.factories = this.config.factories
 
     this.created = {}
-    Object.keys(this.factories).forEach((f) => (this.created[f] = []))
+    Object.keys(this.factories).forEach(f => (this.created[f] = []))
   }
 
   static _checkRequirements() {
@@ -278,7 +278,7 @@ class GraphQLDataFactory extends Helper {
    */
   _requestCreate(operation, variables) {
     const { query } = this.factories[operation]
-    return this.graphqlHelper.sendMutation(query, variables).then((response) => {
+    return this.graphqlHelper.sendMutation(query, variables).then(response => {
       const data = response.data.data[operation]
       this.created[operation].push(data)
       this.debugSection('Created', `record: ${data}`)
@@ -297,7 +297,7 @@ class GraphQLDataFactory extends Helper {
     const deleteOperation = this.factories[operation].revert(data)
     const { query, variables } = deleteOperation
 
-    return this.graphqlHelper.sendMutation(query, variables).then((response) => {
+    return this.graphqlHelper.sendMutation(query, variables).then(response => {
       const idx = this.created[operation].indexOf(data)
       this.debugSection('Deleted', `record: ${response.data.data}`)
       this.created[operation].splice(idx, 1)