codeceptjs 3.5.10 → 3.5.12-beta.1

package/lib/helper/Puppeteer.js

@@ -259,6 +259,7 @@ class Puppeteer extends Helper {
       headless: !this.options.show,
       ...this._getOptions(config),
     };
+    if (this.puppeteerOptions.headless) this.puppeteerOptions.headless = 'new';
     this.isRemoteBrowser = !!this.puppeteerOptions.browserWSEndpoint;
     popupStore.defaultAction = this.options.defaultPopupAction;
   }
@@ -684,11 +685,13 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * {{> resizeWindow }}
    *
    * Unlike other drivers Puppeteer changes the size of a viewport, not the window!
-   * Puppeteer does not control the window of a browser so it can't adjust its real size.
+   * Puppeteer does not control the window of a browser, so it can't adjust its real size.
    * It also can't maximize a window.
+   *
+   * {{> resizeWindow }}
+   *
    */
   async resizeWindow(width, height) {
     if (width === 'maximize') {
@@ -740,7 +743,8 @@ class Puppeteer extends Helper {
     assertElementExists(els, locator, 'Element to focus');
     const el = els[0];
 
-    await focusElement(el, this.page);
+    await el.click();
+    await el.focus();
     return this._waitForAction();
   }
 
@@ -880,7 +884,7 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * Find a checkbox by providing human readable text:
+   * Find a checkbox by providing human-readable text:
    * NOTE: Assumes the checkable element exists
    *
    * ```js
@@ -895,7 +899,7 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * Find a clickable element by providing human readable text:
+   * Find a clickable element by providing human-readable text:
    *
    * ```js
    * this.helpers['Puppeteer']._locateClickable('Next page').then // ...
@@ -907,7 +911,7 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * Find field elements by providing human readable text:
+   * Find field elements by providing human-readable text:
    *
    * ```js
    * this.helpers['Puppeteer']._locateFields('Your email').then // ...
@@ -1119,7 +1123,7 @@ class Puppeteer extends Helper {
    * Sets a directory to where save files. Allows to test file downloads.
    * Should be used with [FileSystem helper](https://codecept.io/helpers/FileSystem) to check that file were downloaded correctly.
    *
-   * By default files are saved to `output/downloads`.
+   * By default, files are saved to `output/downloads`.
    * This directory is cleaned on every `handleDownloads` call, to ensure no old files are kept.
    *
    * ```js
@@ -1291,9 +1295,9 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * {{> pressKeyWithKeyNormalization }}
-   *
    * _Note:_ Shortcuts like `'Meta'` + `'A'` do not work on macOS ([GoogleChrome/puppeteer#1313](https://github.com/GoogleChrome/puppeteer/issues/1313)).
+   *
+   * {{> pressKeyWithKeyNormalization }}
    */
   async pressKey(key) {
     const modifiers = [];
@@ -1395,9 +1399,9 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * {{> attachFile }}
-   *
    * > ⚠ There is an [issue with file upload in Puppeteer 2.1.0 & 2.1.1](https://github.com/puppeteer/puppeteer/issues/5420), downgrade to 2.0.0 if you face it.
+   *
+   * {{> attachFile }}
    */
   async attachFile(locator, pathToFile) {
     const file = path.join(global.codecept_dir, pathToFile);
@@ -1628,9 +1632,9 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * {{> executeScript }}
+   * If a function returns a Promise, tt will wait for its resolution.
    *
-   * If a function returns a Promise It will wait for it resolution.
+   * {{> executeScript }}
    */
   async executeScript(...args) {
     let context = this.page;
@@ -1641,9 +1645,8 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * {{> executeAsyncScript }}
-   *
    * Asynchronous scripts can also be executed with `executeScript` if a function returns a Promise.
+   * {{> executeAsyncScript }}
    */
   async executeAsyncScript(...args) {
     const asyncFn = function () {
@@ -1822,7 +1825,8 @@ class Puppeteer extends Helper {
       for (let i = 0; i < val.length; ++i) {
         const _actual = Number.isNaN(val[i]) || (typeof values[i]) === 'string' ? val[i] : Number.parseInt(values[i], 10);
         const _expected = Number.isNaN(values[i]) || (typeof values[i]) === 'string' ? values[i] : Number.parseInt(values[i], 10);
-        if (!_actual.includes(_expected)) return false;
+        // if the attribute doesn't exist, returns false as well
+        if (!_actual || !_actual.includes(_expected)) return false;
       }
       return true;
     });
@@ -2092,7 +2096,7 @@ class Puppeteer extends Helper {
   /**
    * {{> waitForVisible }}
    *
-   * This method accepts [React selectors](https://codecept.io/react).
+   * {{ react }}
    */
   async waitForVisible(locator, sec) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout;
@@ -2147,6 +2151,24 @@ class Puppeteer extends Helper {
     });
   }
 
+  /**
+   * {{> waitForNumberOfTabs }}
+   */
+  async waitForNumberOfTabs(expectedTabs, sec) {
+    const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout;
+    let currentTabs;
+    let count = 0;
+
+    do {
+      currentTabs = await this.grabNumberOfOpenTabs();
+      await this.wait(1);
+      count += 1000;
+      if (currentTabs >= expectedTabs) return;
+    } while (count <= waitTimeout);
+
+    throw new Error(`Expected ${expectedTabs} tabs are not met after ${waitTimeout / 1000} sec.`);
+  }
+
   async _getContext() {
     if (this.context && this.context.constructor.name === 'Frame') {
       return this.context;
@@ -2321,9 +2343,9 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * Waits for navigation to finish. By default takes configured `waitForNavigation` option.
+   * Waits for navigation to finish. By default, takes configured `waitForNavigation` option.
    *
-   * See [Pupeteer's reference](https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#pagewaitfornavigationoptions)
+   * See [Puppeteer's reference](https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#pagewaitfornavigationoptions)
    *
    * @param {*} opts
    */

package/lib/helper/WebDriver.js

@@ -63,6 +63,8 @@ const webRoot = 'body';
  * @prop {boolean} [manualStart=false] - do not start browser before a test, start it manually inside a helper with `this.helpers["WebDriver"]._startBrowser()`.
  * @prop {object} [timeouts] [WebDriver timeouts](http://webdriver.io/docs/timeouts.html) defined as hash.
  * @prop {boolean} [highlightElement] - highlight the interacting elements. Default: false. Note: only activate under verbose mode (--verbose).
+ * @prop {string} [logLevel=silent] - level of logging verbosity. Default: silent. Options: trace | debug | info | warn | error | silent. More info: https://webdriver.io/docs/configuration/#loglevel
+ * @prop {boolean} [devtoolsProtocol=false] - enable devtools protocol. Default: false. More info: https://webdriver.io/docs/automationProtocols/#devtools-protocol.
  */
 const config = {};
 
@@ -72,6 +74,13 @@ const config = {};
  *
  * WebDriver requires Selenium Server and ChromeDriver/GeckoDriver to be installed. Those tools can be easily installed via NPM. Please check [Testing with WebDriver](https://codecept.io/webdriver/#testing-with-webdriver) for more details.
  *
+ * With the release of WebdriverIO version v8.14.0, and onwards, all driver management hassles are now a thing of the past 🙌. Read more [here](https://webdriver.io/blog/2023/07/31/driver-management/).
+ * One of the significant advantages of this update is that you can now get rid of any driver services you previously had to manage, such as
+ * `wdio-chromedriver-service`, `wdio-geckodriver-service`, `wdio-edgedriver-service`, `wdio-safaridriver-service`, and even `@wdio/selenium-standalone-service`.
+ *
+ * For those who require custom driver options, fear not; WebDriver Helper allows you to pass in driver options through custom WebDriver configuration.
+ * If you have a custom grid, use a cloud service, or prefer to run your own driver, there's no need to worry since WebDriver Helper will only start a driver when there are no other connection information settings like hostname or port specified.
+ *
  * <!-- configuration -->
  *
  * Example:
@@ -93,6 +102,28 @@ const config = {};
  * }
  * ```
  *
+ * Testing Chrome locally is now more convenient than ever. You can define a browser channel, and WebDriver Helper will take care of downloading the specified browser version for you.
+ * For example:
+ *
+ * ```js
+ * {
+ *    helpers: {
+ *      WebDriver : {
+ *        smartWait: 5000,
+ *        browser: "chrome",
+ *        browserVersion: '116.0.5793.0', // or 'stable', 'beta', 'dev' or 'canary'
+ *        restart: false,
+ *        windowSize: "maximize",
+ *        timeouts: {
+ *          "script": 60000,
+ *          "page load": 10000
+ *        }
+ *      }
+ *    }
+ * }
+ * ```
+ *
+ *
  * Example with basic authentication
  * ```js
  * {
@@ -133,6 +164,25 @@ const config = {};
  * }
  * ```
  *
+ * ### Running with devtools protocol
+ *
+ * ```js
+ * {
+ *    helpers: {
+ *      WebDriver : {
+ *        url: "http://localhost",
+ *        browser: "chrome",
+ *        devtoolsProtocol: true,
+ *        desiredCapabilities: {
+ *          chromeOptions: {
+ *            args: [ "--headless", "--disable-gpu", "--no-sandbox" ]
+ *          }
+ *        }
+ *      }
+ *    }
+ * }
+ * ```
+ *
  * ### Internet Explorer
  *
  * Additional configuration params can be used from [IE options](https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/IE/Options.html)
@@ -415,7 +465,6 @@ class WebDriver extends Helper {
   _validateConfig(config) {
     const defaults = {
       logLevel: 'silent',
-      path: '/wd/hub',
       // codeceptjs
       remoteFileUpload: true,
       smartWait: 0,
@@ -435,12 +484,17 @@ class WebDriver extends Helper {
     // override defaults with config
     config = Object.assign(defaults, config);
 
-    if (typeof config.host !== 'undefined') config.hostname = config.host; // webdriverio spec
+    if (config.host) {
+      // webdriverio spec
+      config.hostname = config.host;
+      config.path = '/wd/hub';
+    }
     config.baseUrl = config.url || config.baseUrl;
     if (config.desiredCapabilities && Object.keys(config.desiredCapabilities).length) {
       config.capabilities = config.desiredCapabilities;
     }
     config.capabilities.browserName = config.browser || config.capabilities.browserName;
+    config.capabilities.browserVersion = config.browserVersion || config.capabilities.browserVersion;
     if (config.capabilities.chromeOptions) {
       config.capabilities['goog:chromeOptions'] = config.capabilities.chromeOptions;
       delete config.capabilities.chromeOptions;
@@ -542,6 +596,10 @@ class WebDriver extends Helper {
         delete this.options.capabilities.hostname;
         delete this.options.capabilities.port;
         delete this.options.capabilities.path;
+        if (this.options.devtoolsProtocol) {
+          if (!['chrome', 'chromium'].includes(this.options.browser.toLowerCase())) throw Error('The devtools protocol is only working with Chrome or Chromium');
+          this.options.automationProtocol = 'devtools';
+        }
         this.browser = await webdriverio.remote(this.options);
       }
     } catch (err) {
@@ -1043,7 +1101,8 @@ class WebDriver extends Helper {
     assertElementExists(res, field, 'Field');
     const elem = usingFirstElement(res);
     highlightActiveElement.call(this, elem);
-    return elem.setValue(value.toString());
+    await elem.clearValue();
+    await elem.setValue(value.toString());
   }
 
   /**
@@ -1055,6 +1114,10 @@ class WebDriver extends Helper {
     assertElementExists(res, field, 'Field');
     const elem = usingFirstElement(res);
     highlightActiveElement.call(this, elem);
+    if (this.options.automationProtocol) {
+      const curentValue = await elem.getValue();
+      return elem.setValue(curentValue + value.toString());
+    }
     return elem.addValue(value.toString());
   }
 
@@ -1067,6 +1130,9 @@ class WebDriver extends Helper {
     assertElementExists(res, field, 'Field');
     const elem = usingFirstElement(res);
     highlightActiveElement.call(this, elem);
+    if (this.options.automationProtocol) {
+      return elem.setValue('');
+    }
     return elem.clearValue(getElementId(elem));
   }
 
@@ -1104,8 +1170,9 @@ class WebDriver extends Helper {
   }
 
   /**
-   * {{> attachFile }}
    * Appium: not tested
+   *
+   * {{> attachFile }}
    */
   async attachFile(locator, pathToFile) {
     let file = path.join(global.codecept_dir, pathToFile);
@@ -1119,7 +1186,7 @@ class WebDriver extends Helper {
     const el = usingFirstElement(res);
 
     // Remote Upload (when running Selenium Server)
-    if (this.options.remoteFileUpload) {
+    if (this.options.remoteFileUpload && !this.options.automationProtocol) {
       try {
         this.debugSection('File', 'Uploading file to remote server');
         file = await this.browser.uploadFile(file);
@@ -1132,8 +1199,8 @@ class WebDriver extends Helper {
   }
 
   /**
-   * {{> checkOption }}
    * Appium: not tested
+   * {{> checkOption }}
    */
   async checkOption(field, context = null) {
     const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick';
@@ -1152,8 +1219,8 @@ class WebDriver extends Helper {
   }
 
   /**
-   * {{> uncheckOption }}
    * Appium: not tested
+   * {{> uncheckOption }}
    */
   async uncheckOption(field, context = null) {
     const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick';
@@ -1370,16 +1437,16 @@ class WebDriver extends Helper {
   }
 
   /**
-   * {{> seeCheckboxIsChecked }}
    * Appium: not tested
+   * {{> seeCheckboxIsChecked }}
    */
   async seeCheckboxIsChecked(field) {
     return proceedSeeCheckbox.call(this, 'assert', field);
   }
 
   /**
-   * {{> dontSeeCheckboxIsChecked }}
    * Appium: not tested
+   * {{> dontSeeCheckboxIsChecked }}
    */
   async dontSeeCheckboxIsChecked(field) {
     return proceedSeeCheckbox.call(this, 'negate', field);
@@ -1497,35 +1564,33 @@ class WebDriver extends Helper {
   async seeCssPropertiesOnElements(locator, cssProperties) {
     const res = await this._locate(locator);
     assertElementExists(res, locator);
+
+    const cssPropertiesCamelCase = convertCssPropertiesToCamelCase(cssProperties);
     const elemAmount = res.length;
+    let props = [];
 
-    let props = await forEachAsync(res, async (el) => {
-      return forEachAsync(Object.keys(cssProperties), async (prop) => {
-        const propValue = await this.browser.getElementCSSValue(getElementId(el), prop);
-        if (isColorProperty(prop) && propValue && propValue.value) {
-          return convertColorToRGBA(propValue.value);
+    for (const element of res) {
+      for (const prop of Object.keys(cssProperties)) {
+        const cssProp = await this.grabCssPropertyFrom(locator, prop);
+        if (isColorProperty(prop)) {
+          props.push(convertColorToRGBA(cssProp));
+        } else {
+          props.push(cssProp);
         }
-        return propValue;
-      });
-    });
-
-    const cssPropertiesCamelCase = convertCssPropertiesToCamelCase(cssProperties);
+      }
+    }
 
     const values = Object.keys(cssPropertiesCamelCase).map(key => cssPropertiesCamelCase[key]);
     if (!Array.isArray(props)) props = [props];
     let chunked = chunkArray(props, values.length);
     chunked = chunked.filter((val) => {
       for (let i = 0; i < val.length; ++i) {
-        const _acutal = Number.isNaN(val[i]) || (typeof values[i]) === 'string' ? val[i] : Number.parseInt(val[i], 10);
-        const _expected = Number.isNaN(values[i]) || (typeof values[i]) === 'string' ? values[i] : Number.parseInt(values[i], 10);
-        if (_acutal !== _expected) return false;
+        // eslint-disable-next-line eqeqeq
+        if (val[i] != values[i]) return false;
       }
       return true;
     });
-    return assert.ok(
-      chunked.length === elemAmount,
-      `expected all elements (${(new Locator(locator))}) to have CSS property ${JSON.stringify(cssProperties)}`,
-    );
+    return equals(`all elements (${(new Locator(locator))}) to have CSS property ${JSON.stringify(cssProperties)}`).assert(chunked.length, elemAmount);
   }
 
   /**
@@ -1545,9 +1610,9 @@ class WebDriver extends Helper {
     let chunked = chunkArray(attrs, values.length);
     chunked = chunked.filter((val) => {
       for (let i = 0; i < val.length; ++i) {
-        const _acutal = Number.isNaN(val[i]) || (typeof values[i]) === 'string' ? val[i] : Number.parseInt(val[i], 10);
+        const _actual = Number.isNaN(val[i]) || (typeof values[i]) === 'string' ? val[i] : Number.parseInt(val[i], 10);
         const _expected = Number.isNaN(values[i]) || (typeof values[i]) === 'string' ? values[i] : Number.parseInt(values[i], 10);
-        if (_acutal !== _expected) return false;
+        if (_actual !== _expected) return false;
       }
       return true;
     });
@@ -1606,10 +1671,9 @@ class WebDriver extends Helper {
   }
 
   /**
-   * {{> executeScript }}
-   *
-   *
    * Wraps [execute](http://webdriver.io/api/protocol/execute.html) command.
+   *
+   * {{> executeScript }}
    */
   executeScript(...args) {
     return this.browser.execute.apply(this.browser, args);
@@ -1672,7 +1736,11 @@ class WebDriver extends Helper {
     const res = await this._locate(withStrictLocator(locator), true);
     assertElementExists(res, locator);
     const elem = usingFirstElement(res);
-    return elem.moveTo({ xOffset, yOffset });
+    try {
+      await elem.moveTo({ xOffset, yOffset });
+    } catch (e) {
+      debug(e.message);
+    }
   }
 
   /**
@@ -1731,11 +1799,8 @@ class WebDriver extends Helper {
   }
 
   /**
+   * Uses Selenium's JSON [cookie format](https://code.google.com/p/selenium/wiki/JsonWireProtocol#Cookie_JSON_Object).
    * {{> setCookie }}
-   *
-   *
-   * Uses Selenium's JSON [cookie
-   * format](https://code.google.com/p/selenium/wiki/JsonWireProtocol#Cookie_JSON_Object).
    */
   async setCookie(cookie) {
     return this.browser.setCookies(cookie);
@@ -1788,7 +1853,7 @@ class WebDriver extends Helper {
   }
 
   /**
-   * Dismisses the active JavaScript popup, as created by window.alert|window.confirm|window.prompt.
+   * Dismisses the active JavaScript popup, as created by `window.alert|window.confirm|window.prompt`.
    *
    */
   async cancelPopup() {
@@ -1862,9 +1927,9 @@ class WebDriver extends Helper {
   }
 
   /**
-   * {{> pressKeyWithKeyNormalization }}
-   *
    * _Note:_ In case a text field or textarea is focused be aware that some browsers do not respect active modifier when combining modifier keys with other keys.
+   *
+   * {{> pressKeyWithKeyNormalization }}
    */
   async pressKey(key) {
     const modifiers = [];
@@ -1923,11 +1988,12 @@ class WebDriver extends Helper {
   }
 
   /**
-   * {{> resizeWindow }}
    * Appium: not tested in web, in apps doesn't work
+   *
+   * {{> resizeWindow }}
    */
   async resizeWindow(width, height) {
-    return this._resizeBrowserWindow(this.browser, width, height);
+    return this.browser.setWindowSize(width, height);
   }
 
   async _resizeBrowserWindow(browser, width, height) {
@@ -1976,8 +2042,8 @@ class WebDriver extends Helper {
   }
 
   /**
-   * {{> dragAndDrop }}
    * Appium: not tested
+   * {{> dragAndDrop }}
    */
   async dragAndDrop(srcElement, destElement) {
     let sourceEl = await this._locate(srcElement);
@@ -2308,12 +2374,33 @@ class WebDriver extends Helper {
     return this.browser.waitUntil(async () => this.browser.execute(fn, ...args), { timeout: aSec * 1000, timeoutMsg: '' });
   }
 
+  /**
+   * {{> waitForNumberOfTabs }}
+   */
+  async waitForNumberOfTabs(expectedTabs, sec) {
+    const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeoutInSeconds;
+    let currentTabs;
+    let count = 0;
+
+    do {
+      currentTabs = await this.grabNumberOfOpenTabs();
+      await this.wait(1);
+      count += 1000;
+      if (currentTabs >= expectedTabs) return;
+    } while (count <= waitTimeout);
+
+    throw new Error(`Expected ${expectedTabs} tabs are not met after ${waitTimeout / 1000} sec.`);
+  }
+
   /**
    * {{> switchTo }}
    */
   async switchTo(locator) {
     this.browser.isInsideFrame = true;
     if (Number.isInteger(locator)) {
+      if (this.options.automationProtocol) {
+        return this.browser.switchToFrame(locator + 1);
+      }
       return this.browser.switchToFrame(locator);
     }
     if (!locator) {
@@ -2450,21 +2537,41 @@ class WebDriver extends Helper {
   }
 
   /**
+   * This method is **deprecated**.
+   *
+   *
    * {{> setGeoLocation }}
    */
-  async setGeoLocation(latitude, longitude, altitude = null) {
-    if (altitude) {
-      return this.browser.setGeoLocation({ latitude, longitude });
+  async setGeoLocation(latitude, longitude) {
+    if (!this.options.automationProtocol) {
+      console.log(`setGeoLocation deprecated:
+    * This command is deprecated due to using deprecated JSON Wire Protocol command. More info: https://webdriver.io/docs/api/jsonwp/#setgeolocation
+    * Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration`);
+      return;
     }
-    return this.browser.setGeoLocation({ latitude, longitude, altitude });
+    this.geoLocation = { latitude, longitude };
+    const puppeteerBrowser = await this.browser.getPuppeteer();
+    await this.browser.call(async () => {
+      const pages = await puppeteerBrowser.pages();
+      await pages[0].setGeolocation({ latitude, longitude });
+    });
   }
 
   /**
+   * This method is **deprecated**.
+   *
    * {{> grabGeoLocation }}
    *
    */
   async grabGeoLocation() {
-    return this.browser.getGeoLocation();
+    if (!this.options.automationProtocol) {
+      console.log(`grabGeoLocation deprecated:
+    * This command is deprecated due to using deprecated JSON Wire Protocol command. More info: https://webdriver.io/docs/api/jsonwp/#getgeolocation
+    * Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration`);
+      return;
+    }
+    if (!this.geoLocation) return 'No GeoLocation is set!';
+    return this.geoLocation;
   }
 
   /**
@@ -2660,7 +2767,7 @@ async function proceedSeeField(assertType, field, value) {
     }
   };
 
-  const proceedSingle = el => this.browser.getElementAttribute(getElementId(el), 'value').then((res) => {
+  const proceedSingle = el => el.getValue().then((res) => {
     if (res === null) {
       throw new Error(`Element ${el.selector} has no value attribute`);
     }

package/lib/helper/extras/PlaywrightReactVueLocator.js

@@ -0,0 +1,38 @@
+async function findReact(matcher, locator) {
+  let _locator = `_react=${locator.react}`;
+  let props = '';
+
+  if (locator.props) {
+    props += propBuilder(locator.props);
+    _locator += props;
+  }
+  return matcher.locator(_locator).all();
+}
+
+async function findVue(matcher, locator) {
+  let _locator = `_vue=${locator.vue}`;
+  let props = '';
+
+  if (locator.props) {
+    props += propBuilder(locator.props);
+    _locator += props;
+  }
+  return matcher.locator(_locator).all();
+}
+
+function propBuilder(props) {
+  let _props = '';
+
+  for (const [key, value] of Object.entries(props)) {
+    if (typeof value === 'object') {
+      for (const [k, v] of Object.entries(value)) {
+        _props += `[${key}.${k} = "${v}"]`;
+      }
+    } else {
+      _props += `[${key} = "${value}"]`;
+    }
+  }
+  return _props;
+}
+
+module.exports = { findReact, findVue };

package/lib/locator.js

@@ -1,4 +1,4 @@
-const cssToXPath = require('convert-cssxpath');
+const cssToXPath = require('csstoxpath');
 const { sprintf } = require('sprintf-js');
 
 const { xpathLocator } = require('./utils');
@@ -158,11 +158,12 @@ class Locator {
   }
 
   /**
+   * @param {string} [pseudoSelector] CSS to XPath extension pseudo: https://www.npmjs.com/package/csstoxpath?activeTab=explore#extension-pseudos
    * @returns {string}
    */
-  toXPath() {
+  toXPath(pseudoSelector = '') {
     if (this.isXPath()) return this.value;
-    if (this.isCSS()) return cssToXPath.convert(this.value);
+    if (this.isCSS()) return cssToXPath(`${this.value}${pseudoSelector}`);
 
     throw new Error('Can\'t be converted to XPath');
   }
@@ -243,12 +244,24 @@ class Locator {
   }
 
   /**
+   * Find an element containing a text
    * @param {string} text
    * @returns {Locator}
    */
   withText(text) {
     text = xpathLocator.literal(text);
-    const xpath = sprintf('%s[%s]', this.toXPath(), `contains(., ${text})`);
+    const xpath = this.toXPath(`:text-contains-case(${text})`);
+    return new Locator({ xpath });
+  }
+
+  /**
+   * Find an element with exact text
+   * @param {string} text
+   * @returns {Locator}
+   */
+  withTextEquals(text) {
+    text = xpathLocator.literal(text);
+    const xpath = this.toXPath(`:text-case(${text})`);
     return new Locator({ xpath });
   }