expect-webdriverio 3.4.0 → 3.5.1

package/lib/matchers/element/toBeClickable.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeClickable = void 0;
 const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
-function toBeClickableFn(received, options = {}) {
+async function toBeClickableFn(received, options = {}) {
     this.expectation = this.expectation || 'clickable';
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, async (el) => {
             try {

package/lib/matchers/element/toBeDisabled.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeDisabled = void 0;
 const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
-function toBeDisabledFn(received, options = {}) {
+async function toBeDisabledFn(received, options = {}) {
     this.expectation = this.expectation || 'disabled';
+    received = await received;
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, async (el) => !await el.isEnabled(), options);
         return result;

package/lib/matchers/element/toBeDisplayed.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeDisplayed = void 0;
 const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
-function toBeDisplayedFn(received, options = {}) {
+async function toBeDisplayedFn(received, options = {}) {
     this.expectation = this.expectation || 'displayed';
+    received = await received;
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, async (el) => {
             try {

package/lib/matchers/element/toBeDisplayedInViewport.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeDisplayedInViewport = void 0;
 const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
-function toBeDisplayedInViewportFn(received, options = {}) {
+async function toBeDisplayedInViewportFn(received, options = {}) {
     this.expectation = this.expectation || 'displayed in viewport';
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, async (el) => {
             try {

package/lib/matchers/element/toBeEnabled.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeEnabled = void 0;
 const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
-function toBeEnabledFn(received, options = {}) {
+async function toBeEnabledFn(received, options = {}) {
     this.expectation = this.expectation || 'enabled';
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, el => el.isEnabled(), options);
         return result;

package/lib/matchers/element/toBeExisting.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBePresent = exports.toBeExisting = exports.toExist = void 0;
 const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
-function toExistFn(received, options = {}) {
+async function toExistFn(received, options = {}) {
     this.expectation = this.expectation || 'exist';
     this.verb = this.verb || '';
+    received = await received;
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, async (el) => {
             try {

package/lib/matchers/element/toBeFocused.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeFocused = void 0;
 const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
-function toBeFocusedFn(received, options = {}) {
+async function toBeFocusedFn(received, options = {}) {
     this.expectation = this.expectation || 'focused';
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, el => el.isFocused(), options);
         return result;

package/lib/matchers/element/toBeSelected.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeChecked = exports.toBeSelected = void 0;
 const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
-function toBeSelectedFn(received, options = {}) {
+async function toBeSelectedFn(received, options = {}) {
     this.expectation = this.expectation || 'selected';
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, el => el.isSelected(), options);
         return result;

package/lib/matchers/element/toHaveAttribute.js

@@ -19,9 +19,10 @@ async function conditionAttrAndValue(el, attribute, value, options) {
     }
     return (0, utils_1.compareText)(attr, value, options);
 }
-function toHaveAttributeAndValueFn(received, attribute, value, options = {}) {
+async function toHaveAttributeAndValueFn(received, attribute, value, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'attribute', verb = 'have' } = this;
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         let el = await received;
         let attr;
@@ -41,9 +42,10 @@ function toHaveAttributeAndValueFn(received, attribute, value, options = {}) {
     });
 }
 exports.toHaveAttributeAndValueFn = toHaveAttributeAndValueFn;
-function toHaveAttributeFn(received, attribute) {
+async function toHaveAttributeFn(received, attribute) {
     const isNot = this.isNot;
     const { expectation = 'attribute', verb = 'have' } = this;
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         let el = await received;
         const pass = await (0, utils_1.waitUntil)(async () => {

package/lib/matchers/element/toHaveChildren.js

@@ -18,7 +18,7 @@ async function condition(el, options) {
         value: children === null || children === void 0 ? void 0 : children.length
     };
 }
-function toHaveChildrenFn(received, expected, options = {}) {
+async function toHaveChildrenFn(received, expected, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'children', verb = 'have' } = this;
     let numberOptions;
@@ -28,6 +28,7 @@ function toHaveChildrenFn(received, expected, options = {}) {
     else if (typeof expected === 'object') {
         numberOptions = expected;
     }
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         let el = await received;
         let children;

package/lib/matchers/element/toHaveElementClass.js

@@ -27,10 +27,11 @@ async function condition(el, attribute, value, options) {
         result: valueInClasses
     };
 }
-function toHaveElementClassFn(received, className, options = {}) {
+async function toHaveElementClassFn(received, className, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'class', verb = 'have' } = this;
     const attribute = 'class';
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         let el = await received;
         let attr;

package/lib/matchers/element/toHaveElementProperty.js

@@ -18,9 +18,10 @@ async function condition(el, property, value, options = {}) {
     prop = prop.toString();
     return (0, utils_1.compareText)(prop, value, options);
 }
-function toHaveElementPropertyFn(received, property, value, options = {}) {
+async function toHaveElementPropertyFn(received, property, value, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'property', verb = 'have' } = this;
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         let el = await received;
         let prop;

package/lib/matchers/element/toHaveStyle.js

@@ -6,9 +6,10 @@ const expectAdapter_1 = require("../../util/expectAdapter");
 async function condition(el, style, options) {
     return (0, utils_1.compareStyle)(el, style, options);
 }
-function toHaveStyleFn(received, style, options = {}) {
+async function toHaveStyleFn(received, style, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'style', verb = 'have' } = this;
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         let el = await received;
         let actualStyle;

package/lib/matchers/element/toHaveText.js

@@ -10,9 +10,10 @@ async function condition(el, text, options) {
     }
     return (0, utils_1.compareText)(actualText, text, options);
 }
-function toHaveTextFn(received, text, options = {}) {
+async function toHaveTextFn(received, text, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'text', verb = 'have' } = this;
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         let el = await received;
         let actualText;

package/lib/matchers/elements/toBeElementsArrayOfSize.js

@@ -4,7 +4,7 @@ exports.toBeElementsArrayOfSize = void 0;
 const utils_1 = require("../../utils");
 const refetchElements_1 = require("../../util/refetchElements");
 const expectAdapter_1 = require("../../util/expectAdapter");
-function toBeElementsArrayOfSizeFn(received, expected, options = {}) {
+async function toBeElementsArrayOfSizeFn(received, expected, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'elements array of size', verb = 'be' } = this;
     let numberOptions;
@@ -17,6 +17,7 @@ function toBeElementsArrayOfSizeFn(received, expected, options = {}) {
     else {
         numberOptions = expected;
     }
+    const browser = (0, utils_1.getBrowserObject)(received);
     return browser.call(async () => {
         let elements = await received;
         const arrLength = elements.length;

package/lib/matchers/mock/toBeRequestedTimes.js

@@ -14,7 +14,7 @@ function toBeRequestedTimesFn(received, expected = {}, options = {}) {
     else if (typeof expected === 'object') {
         numberOptions = expected;
     }
-    return browser.call(async () => {
+    return received.browser.call(async () => {
         let actual;
         const pass = await (0, utils_1.waitUntil)(async () => {
             actual = received.calls.length;

package/lib/matchers/mock/toBeRequestedWith.js

@@ -9,7 +9,7 @@ const KEY_LIMIT = 12;
 function toBeRequestedWithFn(received, requestedWith = {}, options = {}) {
     const isNot = this.isNot || false;
     const { expectation = 'called with', verb = 'be' } = this;
-    return browser.call(async () => {
+    return received.browser.call(async () => {
         let actual;
         const pass = await (0, utils_1.waitUntil)(async () => {
             for (const call of received.calls) {

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aliasFn = exports.compareNumbers = exports.waitUntil = exports.executeCommandBe = exports.executeCommand = exports.numberError = exports.enhanceError = exports.wrapExpectedWithArray = exports.updateElementsArray = exports.compareStyle = exports.compareTextWithArray = exports.compareText = void 0;
+exports.getBrowserObject = exports.aliasFn = exports.compareNumbers = exports.waitUntil = exports.executeCommandBe = exports.executeCommand = exports.numberError = exports.enhanceError = exports.wrapExpectedWithArray = exports.updateElementsArray = exports.compareStyle = exports.compareTextWithArray = exports.compareText = void 0;
 const options_1 = require("./options");
 const executeCommand_1 = require("./util/executeCommand");
 Object.defineProperty(exports, "executeCommand", { enumerable: true, get: function () { return executeCommand_1.executeCommand; } });
@@ -13,25 +13,31 @@ Object.defineProperty(exports, "numberError", { enumerable: true, get: function
 const expectAdapter_1 = require("./util/expectAdapter");
 const config = (0, options_1.getConfig)();
 const { options: DEFAULT_OPTIONS } = config;
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 const waitUntil = async (condition, isNot = false, { wait = DEFAULT_OPTIONS.wait, interval = DEFAULT_OPTIONS.interval } = {}) => {
     if (wait === 0) {
         return await condition();
     }
     try {
         let error;
-        await browser.waitUntil(async () => {
+        const start = Date.now();
+        while (true) {
+            if ((Date.now() - start) > wait) {
+                throw new Error('timeout');
+            }
             error = undefined;
             try {
-                return isNot !== await condition();
+                const result = isNot !== await condition();
+                if (result) {
+                    break;
+                }
+                await sleep(interval);
             }
             catch (err) {
                 error = err;
-                return false;
+                await sleep(interval);
             }
-        }, {
-            timeout: wait,
-            interval
-        });
+        }
         if (error) {
             throw error;
         }
@@ -163,3 +169,8 @@ function aliasFn(fn, { verb, expectation } = {}, ...args) {
     return fn.apply(context, args);
 }
 exports.aliasFn = aliasFn;
+function getBrowserObject(elem) {
+    const elemObject = elem;
+    return elemObject.parent ? getBrowserObject(elemObject.parent) : elem;
+}
+exports.getBrowserObject = getBrowserObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect-webdriverio",
-  "version": "3.4.0",
+  "version": "3.5.1",
   "description": "",
   "main": "lib/index.js",
   "scripts": {