expect-webdriverio 3.1.4 → 3.3.0

package/README.md

@@ -22,21 +22,41 @@ NOTE: [WebdriverIO](https://github.com/webdriverio/webdriverio) `v5.16.11` or hi
 
 ## Usage
 
-In your `wdio.conf.js`
-```js
-before () { // not needed in WebdriverIO v6
-    require('expect-webdriverio')
-},
-```
+### Using WebdriverIO Testrunner
+
+If you run your tests through the [WDIO testrunner](https://webdriver.io/docs/clioptions) no additional setup is needed. WebdriverIO initialises `expect-webdriverio` and makes `expect` available in the global scope. So you can use it directly in your tests:
 
-In your test
 ```js
-const $button = $('button')
-expect($button).toBeDisplayed()
+const $button = await $('button')
+await expect($button).toBeDisplayed()
 ```
 
 See more [Examples](docs/Examples.md)
 
+### Using in a standalone script
+
+If you embed WebdriverIO in a standalone script, make sure you import `expect-webdriverio` before you use it anywhere.
+
+```js
+const { remote } = require('webdriverio');
+require('expect-webdriverio')
+
+;(async () => {
+    const browser = await remote({
+        capabilities: {
+            browserName: 'chrome'
+        }
+    })
+
+    await browser.url('https://webdriver.io')
+
+    const $button = await browser.$('button')
+    await expect($button).toBeDisplayed()
+    
+    await browser.deleteSession()
+})().catch(console.error)
+```
+
 ## API
 
 Please see [API doc](docs/API.md)

package/lib/addMatchers.js

@@ -17,7 +17,7 @@ const loadExpect = () => {
 exports.loadExpect = loadExpect;
 const addMatchers = () => {
     if (global.expect === undefined) {
-        if (!exports.loadExpect()) {
+        if (!(0, exports.loadExpect)()) {
             return;
         }
         global.expect = expectLib;
@@ -25,8 +25,8 @@ const addMatchers = () => {
     else {
         expectLib = global.expect;
     }
-    if (!global.expect.extend && !exports.isJasmine()) {
-        if (!exports.loadExpect()) {
+    if (!global.expect.extend && !(0, exports.isJasmine)()) {
+        if (!(0, exports.loadExpect)()) {
             return;
         }
         global.expectWdio = expectLib;

package/lib/index.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setOptions = void 0;
 const addMatchers_1 = require("./addMatchers");
-addMatchers_1.addMatchers();
+(0, addMatchers_1.addMatchers)();
 exports.setOptions = require('./options').setDefaultOptions;

package/lib/matchers/browser/toHaveTitle.js

@@ -8,11 +8,11 @@ function toHaveTitleFn(browser, title, options = {}) {
     const { expectation = 'title', verb = 'have' } = this;
     return browser.call(async () => {
         let actual;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             actual = await browser.getTitle();
-            return utils_1.compareText(actual, title, options).result;
+            return (0, utils_1.compareText)(actual, title, options).result;
         }, isNot, options);
-        const message = utils_1.enhanceError('window', title, actual, this, verb, expectation, '', options);
+        const message = (0, utils_1.enhanceError)('window', title, actual, this, verb, expectation, '', options);
         return {
             pass,
             message: () => message
@@ -21,6 +21,6 @@ function toHaveTitleFn(browser, title, options = {}) {
 }
 exports.toHaveTitleFn = toHaveTitleFn;
 function toHaveTitle(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveTitleFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveTitleFn, args);
 }
 exports.toHaveTitle = toHaveTitle;

package/lib/matchers/browser/toHaveTitleContaining.js

@@ -10,6 +10,6 @@ function toHaveTitleContainingFn(browser, title, options = {}) {
     });
 }
 function toHaveTitleContaining(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveTitleContainingFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveTitleContainingFn, args);
 }
 exports.toHaveTitleContaining = toHaveTitleContaining;

package/lib/matchers/browser/toHaveUrl.js

@@ -8,11 +8,11 @@ function toHaveUrlFn(browser, url, options = {}) {
     const { expectation = 'url', verb = 'have' } = this;
     return browser.call(async () => {
         let actual;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             actual = await browser.getUrl();
-            return utils_1.compareText(actual, url, options).result;
+            return (0, utils_1.compareText)(actual, url, options).result;
         }, isNot, options);
-        const message = utils_1.enhanceError('window', url, actual, this, verb, expectation, '', options);
+        const message = (0, utils_1.enhanceError)('window', url, actual, this, verb, expectation, '', options);
         return {
             pass,
             message: () => message
@@ -21,6 +21,6 @@ function toHaveUrlFn(browser, url, options = {}) {
 }
 exports.toHaveUrlFn = toHaveUrlFn;
 function toHaveUrl(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveUrlFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveUrlFn, args);
 }
 exports.toHaveUrl = toHaveUrl;

package/lib/matchers/browser/toHaveUrlContaining.js

@@ -10,6 +10,6 @@ function toHaveUrlContainingFn(browser, url, options = {}) {
     });
 }
 function toHaveUrlContaining(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveUrlContainingFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveUrlContainingFn, args);
 }
 exports.toHaveUrlContaining = toHaveUrlContaining;

package/lib/matchers/element/toBeClickable.js

@@ -18,6 +18,6 @@ function toBeClickableFn(received, options = {}) {
     });
 }
 function toBeClickable(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeClickableFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeClickableFn, args);
 }
 exports.toBeClickable = toBeClickable;

package/lib/matchers/element/toBeDisabled.js

@@ -11,6 +11,6 @@ function toBeDisabledFn(received, options = {}) {
     });
 }
 function toBeDisabled(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeDisabledFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeDisabledFn, args);
 }
 exports.toBeDisabled = toBeDisabled;

package/lib/matchers/element/toBeDisplayed.js

@@ -18,6 +18,6 @@ function toBeDisplayedFn(received, options = {}) {
     });
 }
 function toBeDisplayed(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeDisplayedFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeDisplayedFn, args);
 }
 exports.toBeDisplayed = toBeDisplayed;

package/lib/matchers/element/toBeDisplayedInViewport.js

@@ -18,6 +18,6 @@ function toBeDisplayedInViewportFn(received, options = {}) {
     });
 }
 function toBeDisplayedInViewport(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeDisplayedInViewportFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeDisplayedInViewportFn, args);
 }
 exports.toBeDisplayedInViewport = toBeDisplayedInViewport;

package/lib/matchers/element/toBeEnabled.js

@@ -11,6 +11,6 @@ function toBeEnabledFn(received, options = {}) {
     });
 }
 function toBeEnabled(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeEnabledFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeEnabledFn, args);
 }
 exports.toBeEnabled = toBeEnabled;

package/lib/matchers/element/toBeExisting.js

@@ -19,7 +19,7 @@ function toExistFn(received, options = {}) {
     });
 }
 function toExist(...args) {
-    return expectAdapter_1.runExpect.call(this, toExistFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toExistFn, args);
 }
 exports.toExist = toExist;
 function toBeExisting(el, options) {

package/lib/matchers/element/toBeFocused.js

@@ -11,6 +11,6 @@ function toBeFocusedFn(received, options = {}) {
     });
 }
 function toBeFocused(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeFocusedFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeFocusedFn, args);
 }
 exports.toBeFocused = toBeFocused;

package/lib/matchers/element/toBeSelected.js

@@ -11,11 +11,11 @@ function toBeSelectedFn(received, options = {}) {
     });
 }
 function toBeSelected(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeSelectedFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeSelectedFn, args);
 }
 exports.toBeSelected = toBeSelected;
 function toBeChecked(el, options) {
-    const context = expectAdapter_1.getContext(this);
+    const context = (0, expectAdapter_1.getContext)(this);
     context.expectation = 'checked';
     return toBeSelected.call(context, el, options);
 }

package/lib/matchers/element/toHaveAttribute.js

@@ -17,7 +17,7 @@ async function conditionAttrAndValue(el, attribute, value, options) {
     if (typeof attr !== 'string') {
         return { result: false, value: attr };
     }
-    return utils_1.compareText(attr, value, options);
+    return (0, utils_1.compareText)(attr, value, options);
 }
 function toHaveAttributeAndValueFn(received, attribute, value, options = {}) {
     const isNot = this.isNot;
@@ -25,15 +25,15 @@ function toHaveAttributeAndValueFn(received, attribute, value, options = {}) {
     return browser.call(async () => {
         let el = await received;
         let attr;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             const result = await utils_1.executeCommand.call(this, el, conditionAttrAndValue, options, [attribute, value, options]);
             el = result.el;
             attr = result.values;
             return result.success;
         }, isNot, options);
-        utils_1.updateElementsArray(pass, received, el);
-        const expected = utils_1.wrapExpectedWithArray(el, attr, value);
-        const message = utils_1.enhanceError(el, expected, attr, this, verb, expectation, attribute, options);
+        (0, utils_1.updateElementsArray)(pass, received, el);
+        const expected = (0, utils_1.wrapExpectedWithArray)(el, attr, value);
+        const message = (0, utils_1.enhanceError)(el, expected, attr, this, verb, expectation, attribute, options);
         return {
             pass,
             message: () => message
@@ -46,13 +46,13 @@ function toHaveAttributeFn(received, attribute) {
     const { expectation = 'attribute', verb = 'have' } = this;
     return browser.call(async () => {
         let el = await received;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             const result = await utils_1.executeCommand.call(this, el, conditionAttr, {}, [attribute]);
             el = result.el;
             return result.success;
         }, isNot, {});
-        utils_1.updateElementsArray(pass, received, el);
-        const message = utils_1.enhanceError(el, !isNot, pass, this, verb, expectation, attribute, {});
+        (0, utils_1.updateElementsArray)(pass, received, el);
+        const message = (0, utils_1.enhanceError)(el, !isNot, pass, this, verb, expectation, attribute, {});
         return {
             pass,
             message: () => message
@@ -62,10 +62,10 @@ function toHaveAttributeFn(received, attribute) {
 exports.toHaveAttributeFn = toHaveAttributeFn;
 function toHaveAttribute(...args) {
     if (args.length === 3 || args.length === 4) {
-        return expectAdapter_1.runExpect.call(this, toHaveAttributeAndValueFn, args);
+        return expectAdapter_1.runExpect.call(this || {}, toHaveAttributeAndValueFn, args);
     }
     else {
-        return expectAdapter_1.runExpect.call(this, toHaveAttributeFn, args);
+        return expectAdapter_1.runExpect.call(this || {}, toHaveAttributeFn, args);
     }
 }
 exports.toHaveAttribute = toHaveAttribute;

package/lib/matchers/element/toHaveAttributeContaining.js

@@ -10,7 +10,7 @@ function toHaveAttributeContainingFn(el, attribute, value, options = {}) {
     });
 }
 function toHaveAttributeContaining(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveAttributeContainingFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveAttributeContainingFn, args);
 }
 exports.toHaveAttributeContaining = toHaveAttributeContaining;
 exports.toHaveAttrContaining = toHaveAttributeContaining;

package/lib/matchers/element/toHaveChildren.js

@@ -5,14 +5,16 @@ const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
 async function condition(el, options) {
     const children = await el.$$('./*');
-    if (!options.lte && !options.gte && !options.eq) {
+    if (typeof options.lte !== 'number' &&
+        typeof options.gte !== 'number' &&
+        typeof options.eq !== 'number') {
         return {
             result: children.length > 0,
             value: children === null || children === void 0 ? void 0 : children.length
         };
     }
     return {
-        result: utils_1.compareNumbers(children === null || children === void 0 ? void 0 : children.length, options),
+        result: (0, utils_1.compareNumbers)(children === null || children === void 0 ? void 0 : children.length, options),
         value: children === null || children === void 0 ? void 0 : children.length
     };
 }
@@ -29,16 +31,16 @@ function toHaveChildrenFn(received, expected, options = {}) {
     return browser.call(async () => {
         let el = await received;
         let children;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             const result = await utils_1.executeCommand.call(this, el, condition, numberOptions, [numberOptions]);
             el = result.el;
             children = result.values;
             return result.success;
         }, isNot, { ...numberOptions, ...options });
-        utils_1.updateElementsArray(pass, received, el);
-        const error = utils_1.numberError(numberOptions);
-        const expected = utils_1.wrapExpectedWithArray(el, children, error);
-        const message = utils_1.enhanceError(el, expected, children, this, verb, expectation, '', numberOptions);
+        (0, utils_1.updateElementsArray)(pass, received, el);
+        const error = (0, utils_1.numberError)(numberOptions);
+        const expected = (0, utils_1.wrapExpectedWithArray)(el, children, error);
+        const message = (0, utils_1.enhanceError)(el, expected, children, this, verb, expectation, '', numberOptions);
         return {
             pass,
             message: () => message
@@ -46,6 +48,6 @@ function toHaveChildrenFn(received, expected, options = {}) {
     });
 }
 function toHaveChildren(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveChildrenFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveChildrenFn, args);
 }
 exports.toHaveChildren = toHaveChildren;

package/lib/matchers/element/toHaveElementClass.js

@@ -35,14 +35,14 @@ function toHaveElementClassFn(received, className, options = {}) {
     return browser.call(async () => {
         let el = await received;
         let attr;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             const result = await utils_1.executeCommand.call(this, el, condition, options, [attribute, className, options]);
             el = result.el;
             attr = result.values;
             return result.success;
         }, isNot, options);
-        utils_1.updateElementsArray(pass, received, el);
-        const message = utils_1.enhanceError(el, utils_1.wrapExpectedWithArray(el, attr, className), attr, this, verb, expectation, '', options);
+        (0, utils_1.updateElementsArray)(pass, received, el);
+        const message = (0, utils_1.enhanceError)(el, (0, utils_1.wrapExpectedWithArray)(el, attr, className), attr, this, verb, expectation, '', options);
         return {
             pass,
             message: () => message
@@ -50,11 +50,11 @@ function toHaveElementClassFn(received, className, options = {}) {
     });
 }
 function toHaveElementClass(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveElementClassFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveElementClassFn, args);
 }
 exports.toHaveElementClass = toHaveElementClass;
 function toHaveClass(...args) {
     console.warn('expect(...).toHaveClass is deprecated and will be removed in next release. Use toHaveElementClass instead.');
-    return expectAdapter_1.runExpect.call(this, toHaveElementClassFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveElementClassFn, args);
 }
 exports.toHaveClass = toHaveClass;

package/lib/matchers/element/toHaveElementClassContaining.js

@@ -10,11 +10,11 @@ function toHaveElementClassContainingFn(el, className, options = {}) {
     });
 }
 function toHaveElementClassContaining(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveElementClassContainingFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveElementClassContainingFn, args);
 }
 exports.toHaveElementClassContaining = toHaveElementClassContaining;
 function toHaveClassContaining(...args) {
     console.warn('expect(...).toHaveClassContaining is deprecated and will be removed in next release. Use toHaveElementClassContaining instead.');
-    return expectAdapter_1.runExpect.call(this, toHaveElementClassContainingFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveElementClassContainingFn, args);
 }
 exports.toHaveClassContaining = toHaveClassContaining;

package/lib/matchers/element/toHaveElementProperty.js

@@ -16,7 +16,7 @@ async function condition(el, property, value, options = {}) {
         return { result: prop === value, value: prop };
     }
     prop = prop.toString();
-    return utils_1.compareText(prop, value, options);
+    return (0, utils_1.compareText)(prop, value, options);
 }
 function toHaveElementPropertyFn(received, property, value, options = {}) {
     const isNot = this.isNot;
@@ -24,20 +24,20 @@ function toHaveElementPropertyFn(received, property, value, options = {}) {
     return browser.call(async () => {
         let el = await received;
         let prop;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             const result = await utils_1.executeCommand.call(this, el, condition, options, [property, value]);
             el = result.el;
             prop = result.values;
             return result.success;
         }, isNot, options);
-        utils_1.updateElementsArray(pass, received, el);
+        (0, utils_1.updateElementsArray)(pass, received, el);
         let message;
         if (value === undefined) {
-            message = utils_1.enhanceError(el, !isNot, pass, this, verb, expectation, property, options);
+            message = (0, utils_1.enhanceError)(el, !isNot, pass, this, verb, expectation, property, options);
         }
         else {
-            const expected = utils_1.wrapExpectedWithArray(el, prop, value);
-            message = utils_1.enhanceError(el, expected, prop, this, verb, expectation, property, options);
+            const expected = (0, utils_1.wrapExpectedWithArray)(el, prop, value);
+            message = (0, utils_1.enhanceError)(el, expected, prop, this, verb, expectation, property, options);
         }
         return {
             pass,
@@ -47,6 +47,6 @@ function toHaveElementPropertyFn(received, property, value, options = {}) {
 }
 exports.toHaveElementPropertyFn = toHaveElementPropertyFn;
 function toHaveElementProperty(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveElementPropertyFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveElementPropertyFn, args);
 }
 exports.toHaveElementProperty = toHaveElementProperty;

package/lib/matchers/element/toHaveHref.js

@@ -8,7 +8,7 @@ function toHaveHrefFn(el, href, options = {}) {
 }
 exports.toHaveHrefFn = toHaveHrefFn;
 function toHaveHref(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveHrefFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveHrefFn, args);
 }
 exports.toHaveHref = toHaveHref;
 exports.toHaveLink = toHaveHref;

package/lib/matchers/element/toHaveHrefContaining.js

@@ -10,7 +10,7 @@ function toHaveHrefContainingFn(el, href, options = {}) {
     });
 }
 function toHaveHrefContaining(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveHrefContainingFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveHrefContainingFn, args);
 }
 exports.toHaveHrefContaining = toHaveHrefContaining;
 exports.toHaveLinkContaining = toHaveHrefContaining;

package/lib/matchers/element/toHaveId.js

@@ -8,6 +8,6 @@ function toHaveIdFn(el, id, options = {}) {
 }
 exports.toHaveIdFn = toHaveIdFn;
 function toHaveId(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveIdFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveIdFn, args);
 }
 exports.toHaveId = toHaveId;

package/lib/matchers/element/toHaveStyle.js

@@ -4,7 +4,7 @@ exports.toHaveStyle = exports.toHaveStyleFn = void 0;
 const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
 async function condition(el, style, options) {
-    return utils_1.compareStyle(el, style, options);
+    return (0, utils_1.compareStyle)(el, style, options);
 }
 function toHaveStyleFn(received, style, options = {}) {
     const isNot = this.isNot;
@@ -12,14 +12,14 @@ function toHaveStyleFn(received, style, options = {}) {
     return browser.call(async () => {
         let el = await received;
         let actualStyle;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             const result = await utils_1.executeCommand.call(this, el, condition, options, [style, options]);
             el = result.el;
             actualStyle = result.values;
             return result.success;
         }, isNot, options);
-        utils_1.updateElementsArray(pass, received, el);
-        const message = utils_1.enhanceError(el, utils_1.wrapExpectedWithArray(el, actualStyle, style), actualStyle, this, verb, expectation, '', options);
+        (0, utils_1.updateElementsArray)(pass, received, el);
+        const message = (0, utils_1.enhanceError)(el, (0, utils_1.wrapExpectedWithArray)(el, actualStyle, style), actualStyle, this, verb, expectation, '', options);
         return {
             pass,
             message: () => message
@@ -28,6 +28,6 @@ function toHaveStyleFn(received, style, options = {}) {
 }
 exports.toHaveStyleFn = toHaveStyleFn;
 function toHaveStyle(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveStyleFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveStyleFn, args);
 }
 exports.toHaveStyle = toHaveStyle;

package/lib/matchers/element/toHaveText.js

@@ -6,9 +6,9 @@ const expectAdapter_1 = require("../../util/expectAdapter");
 async function condition(el, text, options) {
     const actualText = await el.getText();
     if (Array.isArray(text)) {
-        return utils_1.compareTextWithArray(actualText, text, options);
+        return (0, utils_1.compareTextWithArray)(actualText, text, options);
     }
-    return utils_1.compareText(actualText, text, options);
+    return (0, utils_1.compareText)(actualText, text, options);
 }
 function toHaveTextFn(received, text, options = {}) {
     const isNot = this.isNot;
@@ -16,14 +16,14 @@ function toHaveTextFn(received, text, options = {}) {
     return browser.call(async () => {
         let el = await received;
         let actualText;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             const result = await utils_1.executeCommand.call(this, el, condition, options, [text, options]);
             el = result.el;
             actualText = result.values;
             return result.success;
         }, isNot, options);
-        utils_1.updateElementsArray(pass, received, el);
-        const message = utils_1.enhanceError(el, utils_1.wrapExpectedWithArray(el, actualText, text), actualText, this, verb, expectation, '', options);
+        (0, utils_1.updateElementsArray)(pass, received, el);
+        const message = (0, utils_1.enhanceError)(el, (0, utils_1.wrapExpectedWithArray)(el, actualText, text), actualText, this, verb, expectation, '', options);
         return {
             pass,
             message: () => message
@@ -32,6 +32,6 @@ function toHaveTextFn(received, text, options = {}) {
 }
 exports.toHaveTextFn = toHaveTextFn;
 function toHaveText(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveTextFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveTextFn, args);
 }
 exports.toHaveText = toHaveText;

package/lib/matchers/element/toHaveTextContaining.js

@@ -10,6 +10,6 @@ function toHaveTextContainingFn(el, text, options = {}) {
     });
 }
 function toHaveTextContaining(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveTextContainingFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveTextContainingFn, args);
 }
 exports.toHaveTextContaining = toHaveTextContaining;

package/lib/matchers/element/toHaveValue.js

@@ -8,6 +8,6 @@ function toHaveValueFn(el, value, options = {}) {
 }
 exports.toHaveValueFn = toHaveValueFn;
 function toHaveValue(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveValueFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveValueFn, args);
 }
 exports.toHaveValue = toHaveValue;

package/lib/matchers/element/toHaveValueContaining.js

@@ -10,6 +10,6 @@ function toHaveValueContainingFn(el, value, options = {}) {
     });
 }
 function toHaveValueContaining(...args) {
-    return expectAdapter_1.runExpect.call(this, toHaveValueContainingFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toHaveValueContainingFn, args);
 }
 exports.toHaveValueContaining = toHaveValueContaining;

package/lib/matchers/elements/toBeElementsArrayOfSize.js

@@ -20,13 +20,13 @@ function toBeElementsArrayOfSizeFn(received, expected, options = {}) {
     return browser.call(async () => {
         let elements = await received;
         const arrLength = elements.length;
-        const pass = await utils_1.waitUntil(async () => {
-            elements = await refetchElements_1.refetchElements(elements, numberOptions.wait, true);
-            return utils_1.compareNumbers(elements.length, numberOptions);
+        const pass = await (0, utils_1.waitUntil)(async () => {
+            elements = await (0, refetchElements_1.refetchElements)(elements, numberOptions.wait, true);
+            return (0, utils_1.compareNumbers)(elements.length, numberOptions);
         }, isNot, { ...numberOptions, ...options });
-        utils_1.updateElementsArray(pass, received, elements, true);
-        const error = utils_1.numberError(numberOptions);
-        const message = utils_1.enhanceError(elements, error, arrLength, this, verb, expectation, '', numberOptions);
+        (0, utils_1.updateElementsArray)(pass, received, elements, true);
+        const error = (0, utils_1.numberError)(numberOptions);
+        const message = (0, utils_1.enhanceError)(elements, error, arrLength, this, verb, expectation, '', numberOptions);
         return {
             pass,
             message: () => message
@@ -34,6 +34,6 @@ function toBeElementsArrayOfSizeFn(received, expected, options = {}) {
     });
 }
 function toBeElementsArrayOfSize(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeElementsArrayOfSizeFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeElementsArrayOfSizeFn, args);
 }
 exports.toBeElementsArrayOfSize = toBeElementsArrayOfSize;

package/lib/matchers/mock/toBeRequested.js

@@ -7,6 +7,6 @@ function toBeRequestedFn(received, options = {}) {
     return toBeRequestedTimes_1.toBeRequestedTimes.call({ ...(this || {}), expectation: 'called' }, received, { ...options, gte: 1 });
 }
 function toBeRequested(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeRequestedFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeRequestedFn, args);
 }
 exports.toBeRequested = toBeRequested;

package/lib/matchers/mock/toBeRequestedTimes.js

@@ -16,12 +16,12 @@ function toBeRequestedTimesFn(received, expected = {}, options = {}) {
     }
     return browser.call(async () => {
         let actual;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             actual = received.calls.length;
-            return utils_1.compareNumbers(actual, numberOptions);
+            return (0, utils_1.compareNumbers)(actual, numberOptions);
         }, isNot, { ...numberOptions, ...options });
-        const error = formatMessage_1.numberError(numberOptions);
-        const message = utils_1.enhanceError('mock', error, actual, this, verb, expectation, '', numberOptions);
+        const error = (0, formatMessage_1.numberError)(numberOptions);
+        const message = (0, utils_1.enhanceError)('mock', error, actual, this, verb, expectation, '', numberOptions);
         return {
             pass,
             message: () => message
@@ -30,6 +30,6 @@ function toBeRequestedTimesFn(received, expected = {}, options = {}) {
 }
 exports.toBeRequestedTimesFn = toBeRequestedTimesFn;
 function toBeRequestedTimes(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeRequestedTimesFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeRequestedTimesFn, args);
 }
 exports.toBeRequestedTimes = toBeRequestedTimes;

package/lib/matchers/mock/toBeRequestedWith.js

@@ -11,7 +11,7 @@ function toBeRequestedWithFn(received, requestedWith = {}, options = {}) {
     const { expectation = 'called with', verb = 'be' } = this;
     return browser.call(async () => {
         let actual;
-        const pass = await utils_1.waitUntil(async () => {
+        const pass = await (0, utils_1.waitUntil)(async () => {
             for (const call of received.calls) {
                 actual = call;
                 if (methodMatcher(call.method, requestedWith.method) &&
@@ -26,7 +26,7 @@ function toBeRequestedWithFn(received, requestedWith = {}, options = {}) {
             }
             return false;
         }, isNot, { ...options, wait: isNot ? 0 : options.wait });
-        const message = utils_1.enhanceError('mock', minifyRequestedWith(requestedWith), minifyRequestMock(actual, requestedWith) || 'was not called', this, verb, expectation, '', options);
+        const message = (0, utils_1.enhanceError)('mock', minifyRequestedWith(requestedWith), minifyRequestMock(actual, requestedWith) || 'was not called', this, verb, expectation, '', options);
         return {
             pass,
             message: () => message,
@@ -66,7 +66,7 @@ const urlMatcher = (url, expected) => {
     if (typeof expected === 'function') {
         return expected(url);
     }
-    return jasmineUtils_1.equals(url, expected);
+    return (0, jasmineUtils_1.equals)(url, expected);
 };
 const headersMatcher = (headers, expected) => {
     if (typeof expected === 'undefined') {
@@ -75,7 +75,7 @@ const headersMatcher = (headers, expected) => {
     if (typeof expected === 'function') {
         return expected(headers);
     }
-    return jasmineUtils_1.equals(headers, expected);
+    return (0, jasmineUtils_1.equals)(headers, expected);
 };
 const bodyMatcher = (body, expected) => {
     if (typeof expected === 'undefined') {
@@ -97,7 +97,7 @@ const bodyMatcher = (body, expected) => {
             return false;
         }
     }
-    return jasmineUtils_1.equals(parsedBody, expected);
+    return (0, jasmineUtils_1.equals)(parsedBody, expected);
 };
 const isExpectedJsonLike = (expected) => {
     if (typeof expected === 'undefined') {
@@ -213,6 +213,6 @@ const deleteUndefinedValues = (obj, baseline = obj) => {
     });
 };
 function toBeRequestedWith(...args) {
-    return expectAdapter_1.runExpect.call(this, toBeRequestedWithFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeRequestedWithFn, args);
 }
 exports.toBeRequestedWith = toBeRequestedWith;

package/lib/matchers/mock/toBeRequestedWithResponse.js

@@ -8,6 +8,6 @@ function toBeRequestedWithResponseFn(received, response, options = {}) {
 }
 function toBeRequestedWithResponse(...args) {
     console.warn('expect(...).toBeRequestedWithResponse is deprecated and will be removed in next release. Use toBeRequestedWith instead.');
-    return expectAdapter_1.runExpect.call(this, toBeRequestedWithResponseFn, args);
+    return expectAdapter_1.runExpect.call(this || {}, toBeRequestedWithResponseFn, args);
 }
 exports.toBeRequestedWithResponse = toBeRequestedWithResponse;

package/lib/util/executeCommand.js

@@ -6,7 +6,7 @@ async function executeCommand(el, condition, options = {}, params = [], fullRefe
     const { isNot = false } = this;
     let elements;
     if (Array.isArray(el)) {
-        elements = await refetchElements_1.refetchElements(el, options.wait, fullRefetch);
+        elements = await (0, refetchElements_1.refetchElements)(el, options.wait, fullRefetch);
     }
     else {
         elements = [el];

package/lib/util/expectAdapter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runExpect = exports.runJasmineExpect = exports.jestResultToJasmine = exports.buildJasmineFromJestResult = exports.runJestExpect = exports.getContext = void 0;
 const options_1 = require("../options");
-const config = options_1.getConfig();
+const config = (0, options_1.getConfig)();
 const { mode: MODE } = config;
 const getContext = (context) => global === context ? {} : context || {};
 exports.getContext = getContext;
@@ -19,21 +19,21 @@ const buildJasmineFromJestResult = (result, isNot) => {
 exports.buildJasmineFromJestResult = buildJasmineFromJestResult;
 const jestResultToJasmine = (result, isNot) => {
     if (result instanceof Promise) {
-        return result.then(jestStyleResult => exports.buildJasmineFromJestResult(jestStyleResult, isNot));
+        return result.then(jestStyleResult => (0, exports.buildJasmineFromJestResult)(jestStyleResult, isNot));
     }
-    return exports.buildJasmineFromJestResult(result, isNot);
+    return (0, exports.buildJasmineFromJestResult)(result, isNot);
 };
 exports.jestResultToJasmine = jestResultToJasmine;
 function runJasmineExpect(fn) {
-    const context = exports.getContext(this);
+    const context = (0, exports.getContext)(this);
     return {
         compare(...args) {
             const result = fn.apply({ ...context, isNot: false }, args);
-            return exports.jestResultToJasmine(result, false);
+            return (0, exports.jestResultToJasmine)(result, false);
         },
         negativeCompare(...args) {
             const result = fn.apply({ ...context, isNot: true }, args);
-            return exports.jestResultToJasmine(result, true);
+            return (0, exports.jestResultToJasmine)(result, true);
         }
     };
 }

package/lib/util/formatMessage.js

@@ -19,14 +19,14 @@ const getSelectors = (el) => {
     const selectors = [];
     let parent;
     if (Array.isArray(el)) {
-        selectors.push(`${el.foundWith}(\`${exports.getSelector(el)}\`)`);
+        selectors.push(`${el.foundWith}(\`${(0, exports.getSelector)(el)}\`)`);
         parent = el.parent;
     }
     else {
         parent = el;
     }
     while (parent && 'selector' in parent) {
-        const selector = exports.getSelector(parent);
+        const selector = (0, exports.getSelector)(parent);
         const index = parent.index ? `[${parent.index}]` : '';
         selectors.push(`${parent.index ? '$' : ''}$(\`${selector}\`)${index}`);
         parent = parent.parent;
@@ -40,7 +40,7 @@ const not = (isNot) => {
 exports.not = not;
 const enhanceError = (subject, expected, actual, context, verb, expectation, arg2 = '', { message = '', containing = false }) => {
     const { isNot = false } = context;
-    subject = typeof subject === 'string' ? subject : exports.getSelectors(subject);
+    subject = typeof subject === 'string' ? subject : (0, exports.getSelectors)(subject);
     let contain = '';
     if (containing) {
         contain = ' containing';
@@ -49,12 +49,12 @@ const enhanceError = (subject, expected, actual, context, verb, expectation, arg
         verb += ' ';
     }
     let diffString;
-    if (isNot && jasmineUtils_1.equals(actual, expected)) {
-        diffString = `${EXPECTED_LABEL}: ${jest_matcher_utils_1.printExpected(expected)}\n` +
-            `${RECEIVED_LABEL}: ${jest_matcher_utils_1.printReceived(actual)}`;
+    if (isNot && (0, jasmineUtils_1.equals)(actual, expected)) {
+        diffString = `${EXPECTED_LABEL}: ${(0, jest_matcher_utils_1.printExpected)(expected)}\n` +
+            `${RECEIVED_LABEL}: ${(0, jest_matcher_utils_1.printReceived)(actual)}`;
     }
     else {
-        diffString = jest_matcher_utils_1.printDiffOrStringify(expected, actual, EXPECTED_LABEL, RECEIVED_LABEL, true);
+        diffString = (0, jest_matcher_utils_1.printDiffOrStringify)(expected, actual, EXPECTED_LABEL, RECEIVED_LABEL, true);
     }
     if (isNot) {
         diffString = diffString
@@ -67,12 +67,12 @@ const enhanceError = (subject, expected, actual, context, verb, expectation, arg
     if (arg2) {
         arg2 = ` ${arg2}`;
     }
-    const msg = `${message}Expect ${subject} ${exports.not(isNot)}to ${verb}${expectation}${arg2}${contain}\n\n${diffString}`;
+    const msg = `${message}Expect ${subject} ${(0, exports.not)(isNot)}to ${verb}${expectation}${arg2}${contain}\n\n${diffString}`;
     return msg;
 };
 exports.enhanceError = enhanceError;
 const enhanceErrorBe = (subject, pass, context, verb, expectation, options) => {
-    return exports.enhanceError(subject, exports.not(context.isNot) + expectation, exports.not(!pass) + expectation, context, verb, expectation, '', options);
+    return (0, exports.enhanceError)(subject, (0, exports.not)(context.isNot) + expectation, (0, exports.not)(!pass) + expectation, context, verb, expectation, '', options);
 };
 exports.enhanceErrorBe = enhanceErrorBe;
 const numberError = (options = {}) => {

package/lib/util/refetchElements.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refetchElements = void 0;
 const options_1 = require("../options");
-const config = options_1.getConfig();
+const config = (0, options_1.getConfig)();
 const { options: DEFAULT_OPTIONS } = config;
 const refetchElements = async (elements, wait = DEFAULT_OPTIONS.wait, full = false) => {
     if (elements) {

package/lib/utils.js

@@ -11,7 +11,7 @@ const formatMessage_1 = require("./util/formatMessage");
 Object.defineProperty(exports, "enhanceError", { enumerable: true, get: function () { return formatMessage_1.enhanceError; } });
 Object.defineProperty(exports, "numberError", { enumerable: true, get: function () { return formatMessage_1.numberError; } });
 const expectAdapter_1 = require("./util/expectAdapter");
-const config = options_1.getConfig();
+const config = (0, options_1.getConfig)();
 const { options: DEFAULT_OPTIONS } = config;
 const waitUntil = async (condition, isNot = false, { wait = DEFAULT_OPTIONS.wait, interval = DEFAULT_OPTIONS.interval } = {}) => {
     if (wait === 0) {
@@ -51,8 +51,8 @@ async function executeCommandBe(received, command, options) {
         el = result.el;
         return result.success;
     }, isNot, options);
-    elementsUtil_1.updateElementsArray(pass, received, el);
-    const message = formatMessage_1.enhanceErrorBe(el, pass, this, verb, expectation, options);
+    (0, elementsUtil_1.updateElementsArray)(pass, received, el);
+    const message = (0, formatMessage_1.enhanceErrorBe)(el, pass, this, verb, expectation, options);
     return {
         pass,
         message: () => message
@@ -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;
@@ -153,7 +157,7 @@ const compareStyle = async (actualEl, style, { ignoreCase = true, trim = false }
 };
 exports.compareStyle = compareStyle;
 function aliasFn(fn, { verb, expectation } = {}, ...args) {
-    const context = expectAdapter_1.getContext(this);
+    const context = (0, expectAdapter_1.getContext)(this);
     context.verb = verb;
     context.expectation = expectation;
     return fn.apply(context, args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect-webdriverio",
-  "version": "3.1.4",
+  "version": "3.3.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -42,22 +42,22 @@
   },
   "homepage": "https://github.com/webdriverio/expect-webdriverio#readme",
   "devDependencies": {
-    "@types/jasmine": "^3.6.6",
-    "@types/jest": "^27.0.1",
-    "@types/node": "^15.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.17.0",
-    "@typescript-eslint/parser": "^4.17.0",
-    "eslint": "^7.21.0",
-    "husky": "^7.0.0",
-    "jest": "^26.6.3",
+    "@types/jasmine": "^4.0.0",
+    "@types/jest": "^27.0.2",
+    "@types/node": "^15.14.0",
+    "@typescript-eslint/eslint-plugin": "^5.1.0",
+    "@typescript-eslint/parser": "^5.1.0",
+    "eslint": "^8.1.0",
+    "husky": "^7.0.4",
+    "jest": "^27.3.1",
     "npm-run-all": "^4.1.5",
-    "release-it": "^14.4.1",
+    "release-it": "^14.11.6",
     "rimraf": "^3.0.2",
     "shelljs": "^0.8.4",
-    "ts-jest": "^26.5.3",
-    "ts-node": "^10.0.0",
-    "typescript": "^4.2.3",
-    "webdriverio": "^7.1.1"
+    "ts-jest": "^27.0.7",
+    "ts-node": "^10.4.0",
+    "typescript": "^4.4.4",
+    "webdriverio": "^7.16.2"
   },
   "types": "types/jest-global.d.ts",
   "typeScriptVersion": "3.8.3",

package/types/standalone-global.d.ts

@@ -1,5 +1,8 @@
 /// <reference types="expect-webdriverio/types/standalone"/>
 
+/**
+ * to use as an additional expectation lib (not recommended)
+ */
 declare const expectWdio: ExpectWebdriverIO.Expect
 
 declare namespace NodeJS {