expect-webdriverio 4.5.0 → 4.5.1

package/lib/matchers/element/toHaveClass.js

@@ -1,4 +1,4 @@
-import { waitUntil, enhanceError, executeCommand, wrapExpectedWithArray, updateElementsArray } from '../../utils.js';
+import { waitUntil, enhanceError, executeCommand, wrapExpectedWithArray, updateElementsArray, compareText } from '../../utils.js';
 async function condition(el, attribute, value, options) {
     const { ignoreCase = false, trim = false, containing = false } = options;
     let attr = await el.getAttribute(attribute);
@@ -10,13 +10,17 @@ async function condition(el, attribute, value, options) {
     }
     if (ignoreCase) {
         attr = attr.toLowerCase();
-        if (!(value instanceof RegExp)) {
+        if (typeof value === 'string') {
             value = value.toLowerCase();
         }
     }
     const classes = attr.split(' ');
     const valueInClasses = classes.some((t) => {
-        return value instanceof RegExp ? !!t.match(value) : containing ? t.includes(value) : t === value;
+        return value instanceof RegExp
+            ? !!t.match(value)
+            : containing && typeof value === 'string'
+                ? t.includes(value)
+                : compareText(t, value, options);
     });
     return {
         value: attr,

package/lib/utils.js

@@ -78,14 +78,6 @@ export const compareText = (actual, expected, { ignoreCase = false, trim = true,
             result: false,
         };
     }
-    if (typeof expected === 'object' && '$$typeof' in expected && expected.$$typeof === asymmetricMatcher) {
-        const result = expected.asymmetricMatch(actual);
-        return {
-            value: actual,
-            result
-        };
-    }
-    expected = expected;
     if (trim) {
         actual = actual.trim();
     }
@@ -94,10 +86,18 @@ export const compareText = (actual, expected, { ignoreCase = false, trim = true,
     }
     if (ignoreCase) {
         actual = actual.toLowerCase();
-        if (!(expected instanceof RegExp)) {
+        if (typeof expected === 'string') {
             expected = expected.toLowerCase();
         }
     }
+    if (typeof expected === 'object' && '$$typeof' in expected && expected.$$typeof === asymmetricMatcher && expected.asymmetricMatch) {
+        const result = expected.asymmetricMatch(actual);
+        return {
+            value: actual,
+            result
+        };
+    }
+    expected = expected;
     if (expected instanceof RegExp) {
         return {
             value: actual,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect-webdriverio",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "author": "Mykola Grybyk <mykola.grybyk@gmail.com>",
   "description": "WebdriverIO Assertion Library",
   "license": "MIT",

package/types/expect-webdriverio.d.ts

@@ -130,13 +130,13 @@ declare namespace ExpectWebdriverIO {
          */
         toHaveAttribute(
             attribute: string,
-            value?: string | RegExp,
+            value?: string | RegExp | ExpectWebdriverIO.PartialMatcher,
             options?: ExpectWebdriverIO.StringOptions
         ): R
         /**
          * `WebdriverIO.Element` -> `getAttribute`
          */
-        toHaveAttr(attribute: string, value?: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveAttr(attribute: string, value?: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getAttribute`
@@ -144,7 +144,7 @@ declare namespace ExpectWebdriverIO {
          */
         toHaveAttributeContaining(
             attribute: string,
-            contains: string | RegExp,
+            contains: string | RegExp | ExpectWebdriverIO.PartialMatcher,
             options?: ExpectWebdriverIO.StringOptions
         ): R
         /**
@@ -153,7 +153,7 @@ declare namespace ExpectWebdriverIO {
          */
         toHaveAttrContaining(
             attribute: string,
-            contains: string | RegExp,
+            contains: string | RegExp | ExpectWebdriverIO.PartialMatcher,
             options?: ExpectWebdriverIO.StringOptions
         ): R
 
@@ -161,31 +161,31 @@ declare namespace ExpectWebdriverIO {
          * `WebdriverIO.Element` -> `getAttribute` class
          * @deprecated since v1.3.1 - use `toHaveElementClass` instead.
          */
-        toHaveClass(className: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveClass(className: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getAttribute` class
          */
-        toHaveElementClass(className: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveElementClass(className: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getAttribute` class
          * @deprecated since v1.3.1 - use `toHaveElementClassContaining` instead.
          * Element's class includes the className.
          */
-        toHaveClassContaining(className: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveClassContaining(className: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getAttribute` class
          * Element's class includes the className.
          */
-        toHaveElementClassContaining(className: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveElementClassContaining(className: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getProperty`
          */
         toHaveElementProperty(
-            property: string | RegExp,
+            property: string | RegExp | ExpectWebdriverIO.PartialMatcher,
             value?: any,
             options?: ExpectWebdriverIO.StringOptions
         ): R
@@ -193,12 +193,12 @@ declare namespace ExpectWebdriverIO {
         /**
          * `WebdriverIO.Element` -> `getProperty` value
          */
-        toHaveValue(value: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveValue(value: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
         /**
          * `WebdriverIO.Element` -> `getProperty` value
          * Element's value includes the value.
          */
-        toHaveValueContaining(value: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveValueContaining(value: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `isClickable`
@@ -247,34 +247,34 @@ declare namespace ExpectWebdriverIO {
         /**
          * `WebdriverIO.Element` -> `getAttribute` href
          */
-        toHaveHref(href: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveHref(href: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
         /**
          * `WebdriverIO.Element` -> `getAttribute` href
          */
-        toHaveLink(href: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveLink(href: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getAttribute` href
          * Element's href includes the value provided
          */
-        toHaveHrefContaining(href: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveHrefContaining(href: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
         /**
          * `WebdriverIO.Element` -> `getAttribute` href
          * Element's href includes the value provided
          */
-        toHaveLinkContaining(href: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveLinkContaining(href: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getProperty` value
          */
-        toHaveId(id: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveId(id: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getText`
          * Element's text equals the text provided
          */
         toHaveText(
-            text: string | RegExp | Array<string | RegExp>,
+            text: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
             options?: ExpectWebdriverIO.StringOptions
         ): R
         /**
@@ -282,7 +282,7 @@ declare namespace ExpectWebdriverIO {
          * Element's text includes the text provided
          */
         toHaveTextContaining(
-            text: string | RegExp | Array<string | RegExp>,
+            text: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
             options?: ExpectWebdriverIO.StringOptions
         ): R
 
@@ -290,13 +290,13 @@ declare namespace ExpectWebdriverIO {
          * `WebdriverIO.Element` -> `getHTML`
          * Element's html equals the html provided
          */
-        toHaveHTML(html: string | RegExp | Array<string | RegExp>, options?: ExpectWebdriverIO.HTMLOptions): R
+        toHaveHTML(html: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>, options?: ExpectWebdriverIO.HTMLOptions): R
         /**
          * `WebdriverIO.Element` -> `getHTML`
          * Element's html includes the html provided
          */
         toHaveHTMLContaining(
-            html: string | RegExp | Array<string | RegExp>,
+            html: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
             options?: ExpectWebdriverIO.HTMLOptions
         ): R
 
@@ -305,7 +305,7 @@ declare namespace ExpectWebdriverIO {
          * Element's computed label equals the computed label provided
          */
         toHaveComputedLabel(
-            computedLabel: string | RegExp | Array<string | RegExp>,
+            computedLabel: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
             options?: ExpectWebdriverIO.StringOptions
         ): R
         /**
@@ -313,7 +313,7 @@ declare namespace ExpectWebdriverIO {
          * Element's computed label includes the computed label provided
          */
         toHaveComputedLabelContaining(
-            computedLabel: string | RegExp | Array<string | RegExp>,
+            computedLabel: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
             options?: ExpectWebdriverIO.StringOptions
         ): R
 
@@ -322,7 +322,7 @@ declare namespace ExpectWebdriverIO {
          * Element's computed role equals the computed role provided
          */
         toHaveComputedRole(
-            computedRole: string | RegExp | Array<string | RegExp>,
+            computedRole: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
             options?: ExpectWebdriverIO.StringOptions
         ): R
         /**
@@ -330,7 +330,7 @@ declare namespace ExpectWebdriverIO {
          * Element's computed role includes the computed role provided
          */
         toHaveComputedRoleContaining(
-            computedRole: string | RegExp | Array<string | RegExp>,
+            computedRole: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
             options?: ExpectWebdriverIO.StringOptions
         ): R
 
@@ -361,26 +361,26 @@ declare namespace ExpectWebdriverIO {
         /**
          * `WebdriverIO.Browser` -> `getUrl`
          */
-        toHaveUrl(url: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveUrl(url: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         // ===== browser only =====
         /**
          * `WebdriverIO.Browser` -> `getUrl`
          * Browser's url includes the provided text
          */
-        toHaveUrlContaining(url: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveUrlContaining(url: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Browser` -> `getTitle`
          */
-        toHaveTitle(title: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveTitle(title: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         // ===== browser only =====
         /**
          * `WebdriverIO.Browser` -> `getTitle`
          * Browser's title includes the provided text
          */
-        toHaveTitleContaining(title: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveTitleContaining(title: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         // ===== $$ only =====
         /**
@@ -444,7 +444,8 @@ declare namespace ExpectWebdriverIO {
 
     interface PartialMatcher {
         sample?: any
-        asymmetricMatch?(...args: any[]): boolean
+        $$typeof: symbol
+        asymmetricMatch(...args: any[]): boolean
     }
 }
 

package/types/standalone.d.ts

@@ -21,7 +21,7 @@ declare namespace ExpectWebdriverIO {
         arrayContaining(sample: Array<unknown>): PartialMatcher
         objectContaining(sample: Record<string, unknown>): PartialMatcher
         stringContaining(expected: string): PartialMatcher
-        stringMatching(expected: string | RegExp): PartialMatcher
+        stringMatching(expected: string | RegExp | ExpectWebdriverIO.PartialMatcher): PartialMatcher
         not: AsymmetricMatchers
     }
 }