expect-webdriverio 4.15.0 → 4.15.2

package/lib/matchers/element/toHaveText.js

@@ -2,20 +2,21 @@ import { DEFAULT_OPTIONS } from '../../constants.js';
 import { compareText, compareTextWithArray, enhanceError, executeCommand, waitUntil, wrapExpectedWithArray } from '../../utils.js';
 async function condition(el, text, options) {
     const actualTextArray = [];
-    let actualText, checkAllValuesMatchCondition;
+    const resultArray = [];
+    let checkAllValuesMatchCondition;
     if (Array.isArray(el)) {
-        const checkPromises = el.map(async (value) => {
-            actualText = await value.getText();
+        for (const element of el) {
+            const actualText = await element.getText();
             actualTextArray.push(actualText);
-            return Array.isArray(text)
+            const result = Array.isArray(text)
                 ? compareTextWithArray(actualText, text, options).result
                 : compareText(actualText, text, options).result;
-        });
-        const results = await Promise.all(checkPromises);
-        checkAllValuesMatchCondition = results.every(result => result);
+            resultArray.push(result);
+        }
+        checkAllValuesMatchCondition = resultArray.every(result => result);
     }
     else {
-        actualText = await el.getText();
+        const actualText = await el.getText();
         actualTextArray.push(actualText);
         checkAllValuesMatchCondition = Array.isArray(text)
             ? compareTextWithArray(actualText, text, options).result

package/lib/utils.js

@@ -1,4 +1,5 @@
 import isEqual from 'lodash.isequal';
+import expect from 'expect';
 import { DEFAULT_OPTIONS } from './constants.js';
 import { wrapExpectedWithArray } from './util/elementsUtil.js';
 import { executeCommand } from './util/executeCommand.js';
@@ -10,6 +11,9 @@ const asymmetricMatcher = typeof Symbol === 'function' && Symbol.for
 export function isAsymmeyricMatcher(expected) {
     return typeof expected === 'object' && '$$typeof' in expected && expected.$$typeof === asymmetricMatcher && expected.asymmetricMatch;
 }
+function isStringContainingMatcher(expected) {
+    return isAsymmeyricMatcher(expected) && ['StringContaining', 'StringNotContaining'].includes(expected.toString());
+}
 const waitUntil = async (condition, isNot = false, { wait = DEFAULT_OPTIONS.wait, interval = DEFAULT_OPTIONS.interval } = {}) => {
     if (wait === 0) {
         return await condition();
@@ -95,6 +99,11 @@ export const compareText = (actual, expected, { ignoreCase = false, trim = true,
         if (typeof expected === 'string') {
             expected = expected.toLowerCase();
         }
+        else if (isStringContainingMatcher(expected)) {
+            expected = (expected.toString() === 'StringContaining'
+                ? expect.stringContaining(expected.sample?.toString().toLowerCase())
+                : expect.not.stringContaining(expected.sample?.toString().toLowerCase()));
+        }
     }
     if (isAsymmeyricMatcher(expected)) {
         const result = expected.asymmetricMatch(actual);
@@ -154,12 +163,15 @@ export const compareTextWithArray = (actual, expectedArray, { ignoreCase = false
     }
     if (ignoreCase) {
         actual = actual.toLowerCase();
-        expectedArray = expectedArray.map((item) => (item instanceof RegExp ? item : item.toLowerCase()));
+        expectedArray = expectedArray.map((item) => (typeof item !== 'string' ? item : item.toLowerCase()));
     }
     const textInArray = expectedArray.some((expected) => {
         if (expected instanceof RegExp) {
             return !!actual.match(expected);
         }
+        if (isAsymmeyricMatcher(expected)) {
+            return expected.asymmetricMatch(actual);
+        }
         if (containing) {
             return actual.includes(expected);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect-webdriverio",
-  "version": "4.15.0",
+  "version": "4.15.2",
   "author": "Mykola Grybyk <mykola.grybyk@gmail.com>",
   "description": "WebdriverIO Assertion Library",
   "license": "MIT",
@@ -61,14 +61,14 @@
     "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.11",
     "@types/lodash.isequal": "^4.5.8",
-    "@types/node": "^20.11.14",
+    "@types/node": "^22.0.0",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.1",
     "@vitest/coverage-v8": "^1.2.2",
-    "c8": "^9.1.0",
+    "c8": "^10.1.2",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-unicorn": "^53.0.0",
+    "eslint-plugin-unicorn": "^55.0.0",
     "husky": "^9.0.7",
     "npm-run-all2": "^6.1.2",
     "release-it": "^17.0.3",
@@ -76,7 +76,7 @@
     "shelljs": "^0.8.5",
     "typescript": "^5.3.3",
     "vitest": "1.6.0",
-    "webdriverio": "8.38.2"
+    "webdriverio": "8.40.2"
   },
   "optionalDependencies": {
     "@wdio/globals": "^8.29.3",
@@ -84,7 +84,7 @@
     "webdriverio": "^8.29.3"
   },
   "dependencies": {
-    "@vitest/snapshot": "^1.2.2",
+    "@vitest/snapshot": "^2.0.3",
     "expect": "^29.7.0",
     "jest-matcher-utils": "^29.7.0",
     "lodash.isequal": "^4.5.0"

package/types/expect-webdriverio.d.ts

@@ -560,6 +560,7 @@ declare namespace ExpectWebdriverIO {
         sample?: any
         $$typeof: symbol
         asymmetricMatch(...args: any[]): boolean
+        toString(): string
     }
 }