@sap_oss/wdio-qmate-service 1.0.0 → 1.0.2

package/lib/reuse/modules/ui5/assertion.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Assertion = void 0;
 /**
@@ -28,43 +19,41 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectAttributeToBe(selector, "text", "Hello");
      */
-    expectAttributeToBe(selector, attribute, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let elem, value;
-            compareValue = String(compareValue);
-            this._throwAttributeError(attribute, "expectAttributeToBe");
-            try {
-                elem = yield ui5.element.getDisplayed(selector, index, timeout);
-            }
-            catch (error) {
-                throw new Error(`Function 'expectAttributeToBe' failed:${error}`);
-            }
-            let ui5PropertyValue, innerUI5PropertyValue;
-            try {
-                yield browser.waitUntil(() => __awaiter(this, void 0, void 0, function* () {
-                    ui5PropertyValue = String(yield this._getUI5Property(elem, attribute));
-                    innerUI5PropertyValue = String(yield this._getInnerUI5Property(elem, attribute));
-                    if (ui5PropertyValue === compareValue) {
-                        value = ui5PropertyValue;
-                        return true;
-                    }
-                    else if (innerUI5PropertyValue === compareValue) {
-                        value = innerUI5PropertyValue;
-                        return true;
-                    }
-                    else {
-                        return false;
-                    }
-                }), {
-                    timeout: 2000 + +loadPropertyTimeout,
-                    interval: 100,
-                });
-            }
-            catch (error) {
-                value = ui5PropertyValue ? ui5PropertyValue : innerUI5PropertyValue;
-            }
-            return expect(String(value)).toEqual(String(compareValue));
-        });
+    async expectAttributeToBe(selector, attribute, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        let elem, value;
+        compareValue = String(compareValue);
+        this._throwAttributeError(attribute, "expectAttributeToBe");
+        try {
+            elem = await ui5.element.getDisplayed(selector, index, timeout);
+        }
+        catch (error) {
+            throw new Error(`Function 'expectAttributeToBe' failed:${error}`);
+        }
+        let ui5PropertyValue, innerUI5PropertyValue;
+        try {
+            await browser.waitUntil(async () => {
+                ui5PropertyValue = String(await this._getUI5Property(elem, attribute));
+                innerUI5PropertyValue = String(await this._getInnerUI5Property(elem, attribute));
+                if (ui5PropertyValue === compareValue) {
+                    value = ui5PropertyValue;
+                    return true;
+                }
+                else if (innerUI5PropertyValue === compareValue) {
+                    value = innerUI5PropertyValue;
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }, {
+                timeout: 2000 + +loadPropertyTimeout,
+                interval: 100,
+            });
+        }
+        catch (error) {
+            value = ui5PropertyValue ? ui5PropertyValue : innerUI5PropertyValue;
+        }
+        return expect(String(value)).toEqual(String(compareValue));
     }
     ;
     /**
@@ -79,43 +68,41 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectAttributeToContain(selector, "text", "abc");
      */
-    expectAttributeToContain(selector, attribute, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let elem, value;
-            compareValue = String(compareValue);
-            this._throwAttributeError(attribute, "expectAttributeToContain");
-            try {
-                elem = yield ui5.element.getDisplayed(selector, index, timeout);
-            }
-            catch (error) {
-                throw new Error(`Function 'expectAttributeToContain' failed:${error}`);
-            }
-            let ui5PropertyValue, innerUI5PropertyValue;
-            try {
-                yield browser.waitUntil(() => __awaiter(this, void 0, void 0, function* () {
-                    ui5PropertyValue = String(yield this._getUI5Property(elem, attribute));
-                    innerUI5PropertyValue = String(yield this._getInnerUI5Property(elem, attribute));
-                    if (ui5PropertyValue.includes(compareValue)) {
-                        value = ui5PropertyValue;
-                        return true;
-                    }
-                    else if (innerUI5PropertyValue.includes(compareValue)) {
-                        value = innerUI5PropertyValue;
-                        return true;
-                    }
-                    else {
-                        return false;
-                    }
-                }), {
-                    timeout: 2000 + +loadPropertyTimeout,
-                    interval: 100
-                });
-            }
-            catch (error) {
-                value = ui5PropertyValue ? ui5PropertyValue : innerUI5PropertyValue;
-            }
-            return expect(value).toContain(compareValue);
-        });
+    async expectAttributeToContain(selector, attribute, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        let elem, value;
+        compareValue = String(compareValue);
+        this._throwAttributeError(attribute, "expectAttributeToContain");
+        try {
+            elem = await ui5.element.getDisplayed(selector, index, timeout);
+        }
+        catch (error) {
+            throw new Error(`Function 'expectAttributeToContain' failed:${error}`);
+        }
+        let ui5PropertyValue, innerUI5PropertyValue;
+        try {
+            await browser.waitUntil(async () => {
+                ui5PropertyValue = String(await this._getUI5Property(elem, attribute));
+                innerUI5PropertyValue = String(await this._getInnerUI5Property(elem, attribute));
+                if (ui5PropertyValue.includes(compareValue)) {
+                    value = ui5PropertyValue;
+                    return true;
+                }
+                else if (innerUI5PropertyValue.includes(compareValue)) {
+                    value = innerUI5PropertyValue;
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }, {
+                timeout: 2000 + +loadPropertyTimeout,
+                interval: 100
+            });
+        }
+        catch (error) {
+            value = ui5PropertyValue ? ui5PropertyValue : innerUI5PropertyValue;
+        }
+        return expect(value).toContain(compareValue);
     }
     ;
     /**
@@ -129,10 +116,8 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectTextToBe(selector, "Hello");
      */
-    expectTextToBe(selector, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.expectAttributeToBe(selector, "text", compareValue, index, timeout, loadPropertyTimeout);
-        });
+    async expectTextToBe(selector, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        return this.expectAttributeToBe(selector, "text", compareValue, index, timeout, loadPropertyTimeout);
     }
     ;
     /**
@@ -146,10 +131,8 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectValueToBe(selector, "123");
      */
-    expectValueToBe(selector, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.expectAttributeToBe(selector, "value", compareValue, index, timeout, loadPropertyTimeout);
-        });
+    async expectValueToBe(selector, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        return this.expectAttributeToBe(selector, "value", compareValue, index, timeout, loadPropertyTimeout);
     }
     ;
     /**
@@ -161,12 +144,10 @@ class Assertion {
      * @param {Number} [timeout=30000] - The timeout to wait (ms).
      * @example await ui5.assertion.expectValueToBeDefined(selector);
      */
-    expectValueToBeDefined(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const value = yield ui5.element.getValue(selector, index, timeout);
-            common.assertion.expectDefined(value);
-            common.assertion.expectUnequal(value, "");
-        });
+    async expectValueToBeDefined(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000) {
+        const value = await ui5.element.getValue(selector, index, timeout);
+        common.assertion.expectDefined(value);
+        common.assertion.expectUnequal(value, "");
     }
     ;
     /**
@@ -179,10 +160,8 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectToBeNotEnabled(selector);
      */
-    expectToBeNotEnabled(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.expectAttributeToBe(selector, "enabled", false, index, timeout, loadPropertyTimeout);
-        });
+    async expectToBeNotEnabled(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        await this.expectAttributeToBe(selector, "enabled", false, index, timeout, loadPropertyTimeout);
     }
     ;
     /**
@@ -195,10 +174,8 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectToBeEnabled(selector);
      */
-    expectToBeEnabled(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.expectAttributeToBe(selector, "enabled", true, index, timeout, loadPropertyTimeout);
-        });
+    async expectToBeEnabled(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        await this.expectAttributeToBe(selector, "enabled", true, index, timeout, loadPropertyTimeout);
     }
     ;
     /**
@@ -211,10 +188,8 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectValidationError(selector);
      */
-    expectValidationError(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.expectAttributeToBe(selector, "valueState", "Error", index, timeout, loadPropertyTimeout);
-        });
+    async expectValidationError(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        return this.expectAttributeToBe(selector, "valueState", "Error", index, timeout, loadPropertyTimeout);
     }
     ;
     /**
@@ -227,10 +202,8 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectValidationSuccess(selector);
      */
-    expectValidationSuccess(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.expectAttributeToBe(selector, "valueState", "None", index, timeout, loadPropertyTimeout);
-        });
+    async expectValidationSuccess(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        return this.expectAttributeToBe(selector, "valueState", "None", index, timeout, loadPropertyTimeout);
     }
     ;
     // =================================== BINDINGS ===================================
@@ -246,49 +219,45 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectBindingPathToBe(selector, "text", "Hello");
      */
-    expectBindingPathToBe(selector, attribute, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let elem;
-            try {
-                elem = yield ui5.element.getDisplayed(selector, index, timeout);
-            }
-            catch (error) {
-                throw new Error(`Function 'expectBindingPathToBe' failed:${error}`);
-            }
-            let values = null;
-            if (loadPropertyTimeout > 0) {
-                yield browser.waitUntil(function () {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        values = yield elem.getBindingProperty(attribute);
-                        return values !== null;
-                    });
-                }, {
-                    timeout: 2000 + +loadPropertyTimeout,
-                    timeoutMsg: "Property could not be loaded, timeout was reached."
-                });
-            }
-            else {
-                values = yield elem.getBindingProperty(attribute);
+    async expectBindingPathToBe(selector, attribute, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        let elem;
+        try {
+            elem = await ui5.element.getDisplayed(selector, index, timeout);
+        }
+        catch (error) {
+            throw new Error(`Function 'expectBindingPathToBe' failed:${error}`);
+        }
+        let values = null;
+        if (loadPropertyTimeout > 0) {
+            await browser.waitUntil(async function () {
+                values = await elem.getBindingProperty(attribute);
+                return values !== null;
+            }, {
+                timeout: 2000 + +loadPropertyTimeout,
+                timeoutMsg: "Property could not be loaded, timeout was reached."
+            });
+        }
+        else {
+            values = await elem.getBindingProperty(attribute);
+        }
+        // Note: looks like we should construct values[x|0].model + '>' +  values[x|0].path
+        if (Array.isArray(compareValue)) {
+            const mergedArrayOfValues = values.map((value) => mergeModelAndPath(value));
+            for (let x = 0; x < compareValue.length; x++) {
+                expect(mergedArrayOfValues).toContain(compareValue[x]);
             }
-            // Note: looks like we should construct values[x|0].model + '>' +  values[x|0].path
-            if (Array.isArray(compareValue)) {
-                const mergedArrayOfValues = values.map((value) => mergeModelAndPath(value));
-                for (let x = 0; x < compareValue.length; x++) {
-                    expect(mergedArrayOfValues).toContain(compareValue[x]);
-                }
+        }
+        else {
+            expect(mergeModelAndPath(values[0])).toContain(compareValue);
+        }
+        function mergeModelAndPath(value) {
+            if (value.model && value.model.length) {
+                return `${value.model}>${value.path}`;
             }
             else {
-                expect(mergeModelAndPath(values[0])).toContain(compareValue);
-            }
-            function mergeModelAndPath(value) {
-                if (value.model && value.model.length) {
-                    return `${value.model}>${value.path}`;
-                }
-                else {
-                    return value.path;
-                }
+                return value.path;
             }
-        });
+        }
     }
     ;
     /**
@@ -303,32 +272,28 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectBindingContextPathToBe(selector, "text", "Hello");
      */
-    expectBindingContextPathToBe(selector, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let elem;
-            try {
-                elem = yield ui5.element.getDisplayed(selector, index, timeout);
-            }
-            catch (error) {
-                throw new Error(`Function 'expectBindingContextPathToBe' failed:${error}`);
-            }
-            let value = null;
-            if (loadPropertyTimeout > 0) {
-                yield browser.waitUntil(function () {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        value = yield elem.getBindingContextPath();
-                        return value;
-                    });
-                }, {
-                    timeout: 2000 + +loadPropertyTimeout,
-                    timeoutMsg: "Property could not loaded, timeout was reached."
-                });
-            }
-            else {
-                value = yield elem.getBindingContextPath();
-            }
-            expect(value).toEqual(compareValue);
-        });
+    async expectBindingContextPathToBe(selector, compareValue, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        let elem;
+        try {
+            elem = await ui5.element.getDisplayed(selector, index, timeout);
+        }
+        catch (error) {
+            throw new Error(`Function 'expectBindingContextPathToBe' failed:${error}`);
+        }
+        let value = null;
+        if (loadPropertyTimeout > 0) {
+            await browser.waitUntil(async function () {
+                value = await elem.getBindingContextPath();
+                return value;
+            }, {
+                timeout: 2000 + +loadPropertyTimeout,
+                timeoutMsg: "Property could not loaded, timeout was reached."
+            });
+        }
+        else {
+            value = await elem.getBindingContextPath();
+        }
+        expect(value).toEqual(compareValue);
     }
     ;
     // =================================== VISIBILITY ===================================
@@ -342,41 +307,37 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectToBeVisible(selector);
      */
-    expectToBeVisible(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let elem;
-            try {
-                elem = yield ui5.element.getDisplayed(selector, index, timeout);
-            }
-            catch (error) {
-                throw new Error(`Function 'expectToBeVisible' failed:${error}`);
-            }
-            let value = null;
-            if (loadPropertyTimeout > 0) {
-                yield expect(elem).toBeDisplayed({
-                    wait: loadPropertyTimeout,
-                    interval: 100,
-                    message: "Timeout by waiting for element to be visible."
-                });
-                return browser.waitUntil(function () {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        const isUi5Visible = yield elem.getUI5Property("visible");
-                        const isDomVisible = yield elem.isDisplayed();
-                        return isUi5Visible !== null && isUi5Visible !== undefined ||
-                            isDomVisible !== null && isDomVisible !== undefined;
-                    });
-                }, {
-                    timeout: 2000 + +loadPropertyTimeout,
-                    timeoutMsg: "Property could not be loaded, timeout was reached."
-                });
-            }
-            else {
-                const isUi5Visible = yield elem.getUI5Property("visible");
-                const isDomVisible = yield elem.isDisplayed();
-                value = isUi5Visible || isDomVisible;
-                common.assertion.expectTrue(value);
-            }
-        });
+    async expectToBeVisible(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000, loadPropertyTimeout = process.env.LOAD_PROPERTY_TIMEOUT || 10000) {
+        let elem;
+        try {
+            elem = await ui5.element.getDisplayed(selector, index, timeout);
+        }
+        catch (error) {
+            throw new Error(`Function 'expectToBeVisible' failed:${error}`);
+        }
+        let value = null;
+        if (loadPropertyTimeout > 0) {
+            await expect(elem).toBeDisplayed({
+                wait: loadPropertyTimeout,
+                interval: 100,
+                message: "Timeout by waiting for element to be visible."
+            });
+            return browser.waitUntil(async function () {
+                const isUi5Visible = await elem.getUI5Property("visible");
+                const isDomVisible = await elem.isDisplayed();
+                return isUi5Visible !== null && isUi5Visible !== undefined ||
+                    isDomVisible !== null && isDomVisible !== undefined;
+            }, {
+                timeout: 2000 + +loadPropertyTimeout,
+                timeoutMsg: "Property could not be loaded, timeout was reached."
+            });
+        }
+        else {
+            const isUi5Visible = await elem.getUI5Property("visible");
+            const isDomVisible = await elem.isDisplayed();
+            value = isUi5Visible || isDomVisible;
+            common.assertion.expectTrue(value);
+        }
     }
     ;
     /**
@@ -389,27 +350,23 @@ class Assertion {
      * @param {Number} [loadPropertyTimeout = 10000] - The timeout to wait for a specific property to have the given compare value.
      * @example await ui5.assertion.expectToBeVisibleInViewport(selector);
      */
-    expectToBeVisibleInViewport(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let elem;
-            try {
-                elem = yield ui5.element.getDisplayed(selector, index, timeout);
-            }
-            catch (error) {
-                throw new Error(`Function 'expectToBeVisibleInViewport' failed:${error}`);
-            }
-            let value = null;
-            yield browser.waitUntil(function () {
-                return __awaiter(this, void 0, void 0, function* () {
-                    value = yield elem.isDisplayedInViewport();
-                    return value;
-                });
-            }, {
-                timeout: timeout,
-                timeoutMsg: `Function 'expectToBeVisibleInViewport' failed: Given Selector was not in the Viewport.`
-            });
-            common.assertion.expectTrue(value);
+    async expectToBeVisibleInViewport(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000) {
+        let elem;
+        try {
+            elem = await ui5.element.getDisplayed(selector, index, timeout);
+        }
+        catch (error) {
+            throw new Error(`Function 'expectToBeVisibleInViewport' failed:${error}`);
+        }
+        let value = null;
+        await browser.waitUntil(async function () {
+            value = await elem.isDisplayedInViewport();
+            return value;
+        }, {
+            timeout: timeout,
+            timeoutMsg: `Function 'expectToBeVisibleInViewport' failed: Given Selector was not in the Viewport.`
         });
+        common.assertion.expectTrue(value);
     }
     ;
     /**
@@ -421,16 +378,14 @@ class Assertion {
      * @param {Number} [timeout=30000] - The timeout to wait (ms). Recommendation is to lower the timeout since the element is not expected to show up.
      * @example await ui5.assertion.expectToBeNotVisible(selector, 0, 5000);
      */
-    expectToBeNotVisible(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const isVisible = yield ui5.element.isVisible(selector, index, timeout);
-                return common.assertion.expectFalse(isVisible);
-            }
-            catch (error) {
-                throw new Error(`Function 'expectToBeNotVisible' failed. Element with selector ${selector} is visible.`);
-            }
-        });
+    async expectToBeNotVisible(selector, index = 0, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000) {
+        try {
+            const isVisible = await ui5.element.isVisible(selector, index, timeout);
+            return common.assertion.expectFalse(isVisible);
+        }
+        catch (error) {
+            throw new Error(`Function 'expectToBeNotVisible' failed. Element with selector ${selector} is visible.`);
+        }
     }
     ;
     // =================================== APPLICATION ===================================
@@ -442,35 +397,29 @@ class Assertion {
      * @param {Number} [timeout=30000] - The timeout to wait (ms).
      * @example await ui5.assertion.expectMessageToastTextToBe(text);
      */
-    expectMessageToastTextToBe(text, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!text) {
-                throw new Error("Function 'expectMessageToast' failed. Please provide the expected text as argument.");
-            }
-            const xpath = "//div[contains(@class, 'sapMMessageToast') and contains(string(), '" + text + "')]";
-            const elem = yield nonUi5.element.getByXPath(xpath, 0, timeout);
-            return nonUi5.assertion.expectToBeVisible(elem);
-        });
+    async expectMessageToastTextToBe(text, timeout = process.env.QMATE_CUSTOM_TIMEOUT || 30000) {
+        if (!text) {
+            throw new Error("Function 'expectMessageToast' failed. Please provide the expected text as argument.");
+        }
+        const xpath = "//div[contains(@class, 'sapMMessageToast') and contains(string(), '" + text + "')]";
+        const elem = await nonUi5.element.getByXPath(xpath, 0, timeout);
+        return nonUi5.assertion.expectToBeVisible(elem);
     }
     ;
     // =================================== HELPER ===================================
-    _getUI5Property(elem, attribute) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let value = yield elem.getUI5Property(attribute);
-            if (typeof value === "string") {
-                value = this._trimText(value);
-            }
-            return value;
-        });
+    async _getUI5Property(elem, attribute) {
+        let value = await elem.getUI5Property(attribute);
+        if (typeof value === "string") {
+            value = this._trimText(value);
+        }
+        return value;
     }
-    _getInnerUI5Property(elem, attribute) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let innerValue = yield ui5.element.getInnerAttribute(elem, "data-" + attribute);
-            if (typeof innerValue === "string") {
-                innerValue = this._trimText(innerValue);
-            }
-            return innerValue;
-        });
+    async _getInnerUI5Property(elem, attribute) {
+        let innerValue = await ui5.element.getInnerAttribute(elem, "data-" + attribute);
+        if (typeof innerValue === "string") {
+            innerValue = this._trimText(innerValue);
+        }
+        return innerValue;
     }
     _trimText(text) {
         try {