expect-webdriverio 5.0.0-alpha.2 → 5.0.1

package/lib/matchers/element/toBeDisplayedInViewport.js

@@ -6,7 +6,7 @@ export async function toBeDisplayedInViewport(received, options = DEFAULT_OPTION
         matcherName: 'toBeDisplayedInViewport',
         options,
     });
-    const result = await executeCommandBe.call(this, received, el => el?.isDisplayedInViewport(), options);
+    const result = await executeCommandBe.call(this, received, el => el?.isDisplayed({ withinViewport: true }), options);
     await options.afterAssertion?.({
         matcherName: 'toBeDisplayedInViewport',
         options,

package/lib/matchers/element/toHaveAttribute.js

@@ -19,7 +19,7 @@ async function conditionAttrAndValue(el, attribute, value, options) {
 export async function toHaveAttributeAndValue(received, attribute, value, options = DEFAULT_OPTIONS) {
     const isNot = this.isNot;
     const { expectation = 'attribute', verb = 'have' } = this;
-    let el = await received.getElement();
+    let el = await received?.getElement();
     let attr;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, conditionAttrAndValue, options, [attribute, value, options]);

package/lib/matchers/element/toHaveChildren.js

@@ -26,7 +26,7 @@ export async function toHaveChildren(received, expectedValue, options = DEFAULT_
     const numberOptions = typeof expectedValue === 'number'
         ? { eq: expectedValue }
         : expectedValue || {};
-    let el = await received.getElement();
+    let el = await received?.getElement();
     let children;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, numberOptions, [numberOptions]);

package/lib/matchers/element/toHaveClass.js

@@ -32,7 +32,7 @@ export async function toHaveElementClass(received, expectedValue, options = DEFA
         options,
     });
     const attribute = 'class';
-    let el = await received.getElement();
+    let el = await received?.getElement();
     let attr;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [attribute, expectedValue, options]);

package/lib/matchers/element/toHaveComputedLabel.js

@@ -15,7 +15,7 @@ export async function toHaveComputedLabel(received, expectedValue, options = DEF
         expectedValue,
         options,
     });
-    let el = await received.getElement();
+    let el = await received?.getElement();
     let actualLabel;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);

package/lib/matchers/element/toHaveComputedRole.js

@@ -15,7 +15,7 @@ export async function toHaveComputedRole(received, expectedValue, options = DEFA
         expectedValue,
         options,
     });
-    let el = await received.getElement();
+    let el = await received?.getElement();
     let actualRole;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);

package/lib/matchers/element/toHaveElementProperty.js

@@ -23,7 +23,7 @@ export async function toHaveElementProperty(received, property, value, options =
         expectedValue: [property, value],
         options,
     });
-    let el = await received.getElement();
+    let el = await received?.getElement();
     let prop;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [property, value]);

package/lib/matchers/element/toHaveHTML.js

@@ -16,9 +16,9 @@ export async function toHaveHTML(received, expectedValue, options = DEFAULT_OPTI
         options,
     });
     let el = 'getElement' in received
-        ? await received.getElement()
+        ? await received?.getElement()
         : 'getElements' in received
-            ? await received.getElements()
+            ? await received?.getElements()
             : received;
     let actualHTML;
     const pass = await waitUntil(async () => {

package/lib/matchers/element/toHaveHeight.js

@@ -15,7 +15,7 @@ export async function toHaveHeight(received, expectedValue, options = DEFAULT_OP
         expectedValue,
         options,
     });
-    let el = await received.getElement();
+    let el = await received?.getElement();
     let actualHeight;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);

package/lib/matchers/element/toHaveSize.js

@@ -12,7 +12,7 @@ export async function toHaveSize(received, expectedValue, options = DEFAULT_OPTI
         expectedValue,
         options,
     });
-    let el = await received.getElement();
+    let el = await received?.getElement();
     let actualSize;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);

package/lib/matchers/element/toHaveStyle.js

@@ -11,7 +11,7 @@ export async function toHaveStyle(received, expectedValue, options = DEFAULT_OPT
         expectedValue,
         options,
     });
-    let el = await received.getElement();
+    let el = await received?.getElement();
     let actualStyle;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);

package/lib/matchers/element/toHaveText.js

@@ -36,9 +36,9 @@ export async function toHaveText(received, expectedValue, options = DEFAULT_OPTI
         options,
     });
     let el = 'getElement' in received
-        ? await received.getElement()
+        ? await received?.getElement()
         : 'getElements' in received
-            ? await received.getElements()
+            ? await received?.getElements()
             : received;
     let actualText;
     const pass = await waitUntil(async () => {

package/lib/matchers/element/toHaveWidth.js

@@ -15,7 +15,7 @@ export async function toHaveWidth(received, expectedValue, options = DEFAULT_OPT
         expectedValue,
         options,
     });
-    let el = await received.getElement();
+    let el = await received?.getElement();
     let actualWidth;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);

package/lib/utils.js

@@ -1,4 +1,5 @@
 import isEqual from 'lodash.isequal';
+import { expect } from './index.js';
 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();
@@ -40,7 +44,7 @@ const waitUntil = async (condition, isNot = false, { wait = DEFAULT_OPTIONS.wait
         }
         return !isNot;
     }
-    catch (err) {
+    catch {
         if (error) {
             throw error;
         }
@@ -49,7 +53,7 @@ const waitUntil = async (condition, isNot = false, { wait = DEFAULT_OPTIONS.wait
 };
 async function executeCommandBe(received, command, options) {
     const { isNot, expectation, verb = 'be' } = this;
-    let el = await received.getElement();
+    let el = await received?.getElement();
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, async (element) => ({ result: await command(element) }), options);
         el = result.el;
@@ -94,6 +98,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);
@@ -153,12 +162,25 @@ 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) => {
+            if (typeof item === 'string') {
+                return item.toLowerCase();
+            }
+            if (isStringContainingMatcher(item)) {
+                return (item.toString() === 'StringContaining'
+                    ? expect.stringContaining(item.sample?.toString().toLowerCase())
+                    : expect.not.stringContaining(item.sample?.toString().toLowerCase()));
+            }
+            return item;
+        });
     }
     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": "5.0.0-alpha.2",
+  "version": "5.0.1",
   "author": "Mykola Grybyk <mykola.grybyk@gmail.com>",
   "description": "WebdriverIO Assertion Library",
   "license": "MIT",
@@ -58,7 +58,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@vitest/snapshot": "^1.6.0",
+    "@vitest/snapshot": "^2.0.5",
     "expect": "^29.7.0",
     "jest-matcher-utils": "^29.7.0",
     "lodash.isequal": "^4.5.0"
@@ -67,22 +67,22 @@
     "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.12",
     "@types/lodash.isequal": "^4.5.8",
-    "@types/node": "^20.14.9",
-    "@typescript-eslint/eslint-plugin": "^7.15.0",
-    "@typescript-eslint/parser": "^7.15.0",
-    "@vitest/coverage-v8": "^1.6.0",
+    "@types/node": "^22.4.1",
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
+    "@typescript-eslint/parser": "^8.1.0",
+    "@vitest/coverage-v8": "^2.0.5",
     "c8": "^10.1.2",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-unicorn": "^54.0.0",
-    "husky": "^9.0.11",
-    "npm-run-all2": "^6.2.0",
-    "release-it": "^17.4.1",
-    "rimraf": "^5.0.7",
+    "eslint-plugin-unicorn": "^55.0.0",
+    "husky": "^9.1.4",
+    "npm-run-all2": "^6.2.2",
+    "release-it": "^17.6.0",
+    "rimraf": "^6.0.1",
     "shelljs": "^0.8.5",
-    "typescript": "^5.5.3",
-    "vitest": "1.6.0",
-    "webdriverio": "9.0.0-alpha.350"
+    "typescript": "^5.5.4",
+    "vitest": "2.0.5",
+    "webdriverio": "9.0.4"
   },
   "peerDependencies": {
     "@wdio/globals": "^9.0.0-alpha.350",

package/types/expect-webdriverio.d.ts

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