expect-webdriverio 3.2.0 → 3.3.1

package/lib/matchers/element/toHaveElementClass.js

@@ -14,18 +14,17 @@ async function condition(el, attribute, value, options) {
     }
     if (ignoreCase) {
         attr = attr.toLowerCase();
-        value = value.toLowerCase();
-    }
-    if (containing) {
-        return {
-            result: attr.includes(value),
-            value: attr
-        };
+        if (!(value instanceof RegExp)) {
+            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 {
-        result: classes.includes(value),
-        value: attr
+        value: attr,
+        result: valueInClasses
     };
 }
 function toHaveElementClassFn(received, className, options = {}) {

package/lib/matchers/element/toHaveElementProperty.js

@@ -12,7 +12,7 @@ async function condition(el, property, value, options = {}) {
     if (value === null) {
         return { result: true, value: prop };
     }
-    if (typeof value !== 'string' || (typeof prop !== 'string' && !asString)) {
+    if (!(value instanceof RegExp) && (typeof value !== 'string' || (typeof prop !== 'string' && !asString))) {
         return { result: prop === value, value: prop };
     }
     prop = prop.toString();

package/lib/utils.js

@@ -87,7 +87,15 @@ const compareText = (actual, expected, { ignoreCase = false, trim = true, contai
     }
     if (ignoreCase) {
         actual = actual.toLowerCase();
-        expected = expected.toLowerCase();
+        if (!(expected instanceof RegExp)) {
+            expected = expected.toLowerCase();
+        }
+    }
+    if (expected instanceof RegExp) {
+        return {
+            value: actual,
+            result: !!actual.match(expected)
+        };
     }
     if (containing) {
         return {
@@ -113,18 +121,14 @@ const compareTextWithArray = (actual, expectedArray, { ignoreCase = false, trim
     }
     if (ignoreCase) {
         actual = actual.toLowerCase();
-        expectedArray = expectedArray.map(item => item.toLowerCase());
-    }
-    if (containing) {
-        const textInArray = expectedArray.some((t) => actual.includes(t));
-        return {
-            value: actual,
-            result: textInArray
-        };
+        expectedArray = expectedArray.map(item => (item instanceof RegExp) ? item : item.toLowerCase());
     }
+    const textInArray = expectedArray.some((expected) => {
+        return expected instanceof RegExp ? !!actual.match(expected) : containing ? actual.includes(expected) : actual === expected;
+    });
     return {
         value: actual,
-        result: expectedArray.includes(actual)
+        result: textInArray
     };
 };
 exports.compareTextWithArray = compareTextWithArray;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect-webdriverio",
-  "version": "3.2.0",
+  "version": "3.3.1",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -42,7 +42,7 @@
   },
   "homepage": "https://github.com/webdriverio/expect-webdriverio#readme",
   "devDependencies": {
-    "@types/jasmine": "^3.10.1",
+    "@types/jasmine": "^4.0.0",
     "@types/jest": "^27.0.2",
     "@types/node": "^15.14.0",
     "@typescript-eslint/eslint-plugin": "^5.1.0",

package/types/expect-webdriverio.d.ts

@@ -83,11 +83,11 @@ declare namespace ExpectWebdriverIO {
         /**
          * `WebdriverIO.Element` -> `getAttribute`
          */
-        toHaveAttribute(attribute: string, value?: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveAttribute(attribute: string, value?: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
         /**
          * `WebdriverIO.Element` -> `getAttribute`
          */
-        toHaveAttr(attribute: string, value?: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveAttr(attribute: string, value?: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getAttribute`
@@ -95,7 +95,7 @@ declare namespace ExpectWebdriverIO {
          */
         toHaveAttributeContaining(
             attribute: string,
-            contains: string,
+            contains: string | RegExp,
             options?: ExpectWebdriverIO.StringOptions
         ): R
         /**
@@ -104,7 +104,7 @@ declare namespace ExpectWebdriverIO {
          */
         toHaveAttrContaining(
             attribute: string,
-            contains: string,
+            contains: string | RegExp,
             options?: ExpectWebdriverIO.StringOptions
         ): R
 
@@ -112,40 +112,40 @@ declare namespace ExpectWebdriverIO {
          * `WebdriverIO.Element` -> `getAttribute` class
          * @deprecated since v1.3.1 - use `toHaveElementClass` instead.
          */
-        toHaveClass(className: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveClass(className: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getAttribute` class
          */
-        toHaveElementClass(className: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveElementClass(className: string | RegExp, 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, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveClassContaining(className: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getAttribute` class
          * Element's class includes the className.
          */
-        toHaveElementClassContaining(className: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveElementClassContaining(className: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getProperty`
          */
-        toHaveElementProperty(property: string, value?: any, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveElementProperty(property: string | RegExp, value?: any, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getProperty` value
          */
-        toHaveValue(value: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveValue(value: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
         /**
          * `WebdriverIO.Element` -> `getProperty` value
          * Element's value includes the value.
          */
-        toHaveValueContaining(value: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveValueContaining(value: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `isClickable`
@@ -194,37 +194,37 @@ declare namespace ExpectWebdriverIO {
         /**
          * `WebdriverIO.Element` -> `getAttribute` href
          */
-        toHaveHref(href: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveHref(href: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
         /**
          * `WebdriverIO.Element` -> `getAttribute` href
          */
-        toHaveLink(href: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveLink(href: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getAttribute` href
          * Element's href includes the value provided
          */
-        toHaveHrefContaining(href: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveHrefContaining(href: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
         /**
          * `WebdriverIO.Element` -> `getAttribute` href
          * Element's href includes the value provided
          */
-        toHaveLinkContaining(href: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveLinkContaining(href: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getProperty` value
          */
-        toHaveId(id: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveId(id: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getText`
          */
-        toHaveText(text: string | string[], options?: ExpectWebdriverIO.StringOptions): R
+        toHaveText(text: string | RegExp | Array<string | RegExp>, options?: ExpectWebdriverIO.StringOptions): R
         /**
          * `WebdriverIO.Element` -> `getText`
          * Element's text includes the text provided
          */
-        toHaveTextContaining(text: string | string[], options?: ExpectWebdriverIO.StringOptions): R
+        toHaveTextContaining(text: string | RegExp | Array<string | RegExp>, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
         * `WebdriverIO.Element` -> `getAttribute("style")`
@@ -235,26 +235,26 @@ declare namespace ExpectWebdriverIO {
         /**
          * `WebdriverIO.Browser` -> `getUrl`
          */
-        toHaveUrl(url: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveUrl(url: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         // ===== browser only =====
         /**
          * `WebdriverIO.Browser` -> `getUrl`
          * Browser's url includes the provided text
          */
-        toHaveUrlContaining(url: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveUrlContaining(url: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Browser` -> `getTitle`
          */
-        toHaveTitle(title: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveTitle(title: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         // ===== browser only =====
         /**
          * `WebdriverIO.Browser` -> `getTitle`
          * Browser's title includes the provided text
          */
-        toHaveTitleContaining(title: string, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveTitleContaining(title: string | RegExp, options?: ExpectWebdriverIO.StringOptions): R
 
         // ===== $$ only =====
         /**