tests: refactor base-page

Author: SvetoslavTsenov

e2e/pages/animate-child-page.ts

@@ -5,6 +5,7 @@ import { BasePage } from "./base-page";
 export class AnimateChildPage extends BasePage {
     private _parent: UIElement;
     private _child: UIElement;
+    
     constructor(_driver: AppiumDriver) {
         super(_driver)
     }
@@ -15,13 +16,13 @@ export class AnimateChildPage extends BasePage {
     }
 
     async waitParentToAppear() {
-        this._parent = await this.awaitItemToAppear("parent");
+        this._parent = (await this.awaitItemToAppear("parent")).element;
         const startTime = Date.now();
         while ((await this._parent.location()).x !== 0 && Date.now() - startTime < 3000) { }
     }
 
     async waitChildToAppear() {
-        this._child = await this.awaitItemToAppear("child");
+        this._child = (await this.awaitItemToAppear("child")).element;
         const startTime = Date.now();
         while ((await this._child.location()).y !== (await this._parent.location()).y && Date.now() - startTime < 3000) { }
     }
@@ -31,14 +32,9 @@ export class AnimateChildPage extends BasePage {
         assert.isTrue((await this._parent.location()).y === (await this._child.location()).y);
     }
 
-    private async awaitItemToAppear(item: string, wait: number = 3000): Promise<UIElement> {
-        const startTime = Date.now();
+    private async awaitItemToAppear(item: string, wait: number = 3000): Promise<{ isVisible: boolean, element: UIElement }> {
         const findBtn = async () => { return await this._driver.findElementByXPathIfExists(this._elementHelper.findByTextLocator("*", item, true)); };
-        let btn = await findBtn();
-        while (!btn || !(await btn.isDisplayed()) && Date.now() - startTime <= wait) {
-            btn = await findBtn();
-        }
 
-        return btn;
+        return await this.waitElementTo(findBtn, true, wait);;
     }
 }

e2e/pages/animation-builder-page.ts

@@ -1,10 +1,11 @@
 import { AppiumDriver, UIElement } from "nativescript-dev-appium";
 import { BasePage } from "./base-page";
 
-export class AnimationBuilderPage extends BasePage{
+export class AnimationBuilderPage extends BasePage {
     static tapToDisappear: string = "tapToDisappear";
-    private _btnTapToDisappear: UIElement;
-    constructor(driver: AppiumDriver) { 
+    private _btnTapToDisappear: Promise<UIElement>;
+    
+    constructor(driver: AppiumDriver) {
         super(driver);
     }
 
@@ -14,19 +15,12 @@ export class AnimationBuilderPage extends BasePage{
     }
 
     async executeAnimation() {
-        this._btnTapToDisappear = await this._driver.findElementByAccessibilityId(AnimationBuilderPage.tapToDisappear);
+        this._btnTapToDisappear = this._driver.findElementByAccessibilityId(AnimationBuilderPage.tapToDisappear);
         console.log("Btn tap to disappear should disappear");
-        await this._btnTapToDisappear.tap();
+        await (await this._btnTapToDisappear).click();
     }
 
     async waitElementToHide(wait: number) {
-        const start = Date.now();
-        while ((await this._btnTapToDisappear.isDisplayed()) && Date.now() - start <= wait) {
-            
-        }
-    }
-
-    async isBtnDisplayed() {
-        return await this._btnTapToDisappear.isDisplayed();
+        return this.waitElementTo(() => this._btnTapToDisappear, false, wait);
     }
 }

e2e/pages/animation-with-options-page.ts

@@ -2,11 +2,13 @@ import { AppiumDriver, Point, UIElement } from "nativescript-dev-appium";
 import { assert } from "chai";
 import { BasePage } from "./base-page";
 
-export class AnimationWithOptionsPage extends BasePage{
-    constructor(driver: AppiumDriver) { 
+export class AnimationWithOptionsPage extends BasePage {
+    private initialPositionOfAnimatedBtn: Point
+
+    constructor(driver: AppiumDriver) {
         super(driver);
     }
-    private initialPositionOfAnimatedBtn: Point
+
     async enterExample() {
         const exampleBtn = await this._driver.findElementByAccessibilityId("options");
         await exampleBtn.click();
@@ -18,27 +20,21 @@ export class AnimationWithOptionsPage extends BasePage{
     }
 
     get animatedBtn() {
+        this._driver.findElementsByAccessibilityId("animatedBtn", 10000);
         return this._driver.findElementByAccessibilityIdIfExists("animatedBtn");
     }
 
     async toggleAnimation() {
         const btnTapToDisappear = await this.btnToggleAnimation;
-        await btnTapToDisappear.tap();
-    }
-
-    async waitElementTo(wait: number) {
-        const start = Date.now();
-        while (await this.isBtnDisplayed() === false && Date.now() - start <= wait) {
-        }
+        await btnTapToDisappear.click();
     }
 
-    async isBtnDisplayed() {
-        let btn: UIElement = await this.animatedBtn;
-        const isBtnDisplayed = btn ? await btn.isDisplayed() : false;
-        return isBtnDisplayed;
+    async waitElementToHide() {
+        return this.waitElementTo(() => this.animatedBtn, false, 10000);
     }
 
-    async assertPositionOfToggleAnimationBtn(){
+    async assertPositionOfToggleAnimationBtn() {
+        this.waitElementTo(() => this.btnToggleAnimation, true, 5000);
         const point: Point = await (await this.btnToggleAnimation).location();
         assert.isTrue(point.y === this.initialPositionOfAnimatedBtn.y);
     }

e2e/pages/animations-with-default-options-page.ts

@@ -19,13 +19,13 @@ export class AnimationsWithDefaultOptionsPage extends BasePage {
     async addItem() {
         this._btnAddItem = await this._driver.findElementByAccessibilityId("add");
 
-        await this._btnAddItem.tap();
+        await this._btnAddItem.click();
     }
 
     async clickOnItem(item: string) {
         const btn = await this.getItem(item);
 
-        await btn.tap();
+        await btn.click();
     }
 
     private getItem(item) {

e2e/pages/base-page.ts

@@ -1,9 +1,25 @@
-import { AppiumDriver, ElementHelper } from "nativescript-dev-appium";
+import { AppiumDriver, ElementHelper, UIElement } from "nativescript-dev-appium";
 
 export class BasePage {
     protected _elementHelper: ElementHelper;
 
     constructor(protected _driver: AppiumDriver) {
         this._elementHelper = new ElementHelper(this._driver.nsCapabilities);
     }
+
+    async waitElementTo(element: () => Promise<UIElement>, shouldBeVissible: boolean, wait: number) {
+        const start = Date.now();
+        let btn = await element();
+        while ((await this.isBtnDisplayed(btn)) !== shouldBeVissible && Date.now() - start <= wait) {
+            btn = await element();
+        }
+
+        return { isVisible: await this.isBtnDisplayed(btn), element: btn };
+    }
+
+    async isBtnDisplayed(element: UIElement) {
+        let btn: UIElement = await element;
+        const isBtnDisplayed = btn ? await btn.isDisplayed() : false;
+        return isBtnDisplayed;
+    }
 }

e2e/pages/extarnal-animation-page.ts

@@ -1,10 +1,10 @@
 import { AppiumDriver, UIElement } from "nativescript-dev-appium";
 import { BasePage } from "./base-page";
 
-export class ExternalAnimationPage extends BasePage{
+export class ExternalAnimationPage extends BasePage {
     constructor(driver: AppiumDriver) {
         super(driver);
-     }
+    }
 
     async enterExample() {
         const exampleBtn = await this._driver.findElementByAccessibilityId("external");
@@ -13,22 +13,14 @@ export class ExternalAnimationPage extends BasePage{
 
     async toggleAnimation() {
         const btnTapToDisappear = await this._driver.findElementByAccessibilityId("toggleAnimation", 5);
-        await btnTapToDisappear.tap();
+        await btnTapToDisappear.click();
     }
 
     animatedBtn() {
         return this._driver.findElementByAccessibilityIdIfExists("animatedBtn", 5);
     }
 
-    async waitElementTo(wait: number, shouldBeVisible: boolean) {
-        const start = Date.now();
-        while ((await this.isBtnDisplayed() !== shouldBeVisible) && Date.now() - start <= wait) {
-        }
-    }
-
-    async isBtnDisplayed() {
-        let btn: UIElement = await this.animatedBtn();
-        const isBtnDisplayed = btn ? await btn.isDisplayed() : false;
-        return isBtnDisplayed;
+    async waitElementToToggleVisibilityTo(shouldBeVisible: boolean) {
+        return this.waitElementTo(() => this.animatedBtn(), shouldBeVisible, 10000);
     }
 }

e2e/pages/fade-in-out-page.ts

@@ -13,22 +13,14 @@ export class FadeInOutPage extends BasePage {
 
     async toggleAnimation() {
         const btnTapToDisappear = await this._driver.findElementByAccessibilityId("toggleAnimation");
-        await btnTapToDisappear.tap();
+        await btnTapToDisappear.click();
     }
 
     animatedBtn() {
         return this._driver.findElementByAccessibilityIdIfExists("animatedBtn");
     }
 
-    async waitElementTo(wait: number, shouldBeVisible: boolean) {
-        const start = Date.now();
-        while (await this.isBtnDisplayed() === shouldBeVisible && Date.now() - start <= wait) {
-        }
-    }
-
-    async isBtnDisplayed() {
-        let btn = await this.animatedBtn();
-        const isBtnDisplayed = btn ? await btn.isDisplayed() : false;
-        return isBtnDisplayed;
+    async waitElementToToggleVisibility(shouldBeVisible: boolean) {
+        return this.waitElementTo(() => this.animatedBtn(), shouldBeVisible, 10000);
     }
 }

e2e/pages/selector-page.ts

@@ -27,23 +27,11 @@ export class SelectorPage extends BasePage {
     async clickOnItem(item: string) {
         const btn = await this._driver.findElementByXPath(this.itemXpath(item));
 
-        await btn.tap();
+        await btn.click();
     }
 
-    async awaitItemToDissapear(item: string, wait: number = 3000) {
-        const startTime = Date.now();
-        let btn = await this._driver.findElementByXPathIfExists(this.itemXpath(item));
-        while (btn && await btn.isDisplayed() && Date.now() - startTime <= wait) {
-            btn = await this._driver.findElementByXPathIfExists(this.itemXpath(item));
-        }
-    }
-
-    async awaitItemToApear(item: string, wait: number = 3000) {
-        const startTime = Date.now();
-        let btn = await this._driver.findElementByXPathIfExists(this.itemXpath(item));
-        while ((!btn || await btn.isDisplayed()) && Date.now() - startTime <= wait) {
-            btn = await this._driver.findElementByXPathIfExists(this.itemXpath(item));
-        }
+    async waitItemToToggleVisibility(item: string, visibility: boolean) {
+        return this.waitElementTo(() => this._driver.findElementByXPathIfExists(this.itemXpath(item)), visibility, 5000);
     }
 
     async getChildren() {
@@ -58,7 +46,7 @@ export class SelectorPage extends BasePage {
         assert.isTrue(children.length === expctedElementsCount)
         for (let index = 0; index < children.length - 1; index++) {
             const element = children[index];
-            const el = await (<any>element.driver()).elementByXPathIfExists( this._elementHelper.getXPathByTextAtributes("//*", `Item No.${index}`, true));
+            const el = await (<any>element.driver()).elementByXPathIfExists(this._elementHelper.getXPathByTextAtributes("//*", `Item No.${index}`, true));
             console.log(await el.text());
             assert.isTrue(el && el !== null);
         }

e2e/smoke.e2e-spec.ts

@@ -37,31 +37,31 @@ describe("smoke-tests", () => {
         const animationBuilder = new AnimationBuilderPage(driver);
         await animationBuilder.enterExample();
         await animationBuilder.executeAnimation();
-        await animationBuilder.waitElementToHide(3000);
-        assert.isFalse(await animationBuilder.isBtnDisplayed(), "The btn should disappear");
+        const result = await animationBuilder.waitElementToHide(3000);
+        assert.isFalse(result.isVisible, "The btn should disappear");
     });
 
     it("external animation - visibility", async () => {
         const externalAnimationPage = new ExternalAnimationPage(driver);
         await externalAnimationPage.enterExample();
         await externalAnimationPage.toggleAnimation();
-        await externalAnimationPage.waitElementTo(10000, false);
-        assert.isFalse(await externalAnimationPage.isBtnDisplayed(), "The button should disappear!");
+        let result = await externalAnimationPage.waitElementToToggleVisibilityTo(false);
+        assert.isFalse(result.isVisible, "The button should disappear!");
 
         await externalAnimationPage.toggleAnimation();
-        await externalAnimationPage.waitElementTo(10000, true);
-        assert.isTrue(await externalAnimationPage.isBtnDisplayed(), "The button should appear!");
+        result = await externalAnimationPage.waitElementToToggleVisibilityTo(true);
+        assert.isTrue(result.isVisible, "The button should appear!");
     });
 
     it("selector", async () => {
         const selectorPage = new SelectorPage(driver);
         await selectorPage.enterExample();
         await selectorPage.addItem();
-        await selectorPage.awaitItemToApear("Item No.2");
+        await selectorPage.waitItemToToggleVisibility("Item No.2", true);
         await selectorPage.assertElementPossition(4);
 
         await selectorPage.clickOnItem("second");
-        await selectorPage.awaitItemToDissapear("second");
+        await selectorPage.waitItemToToggleVisibility("second", false);
         await selectorPage.assertElementPossition(3);
     });
 
@@ -76,20 +76,20 @@ describe("smoke-tests", () => {
         const fadeInOutPage = new FadeInOutPage(driver);
         await fadeInOutPage.enterExample();
         await fadeInOutPage.toggleAnimation();
-        await fadeInOutPage.waitElementTo(3000, false);
-        assert.isFalse(await fadeInOutPage.isBtnDisplayed(), "The button should disappear!");
+        let result = await fadeInOutPage.waitElementToToggleVisibility(false);
+        assert.isFalse(result.isVisible, "The button should disappear!");
 
         await fadeInOutPage.toggleAnimation();
-        await fadeInOutPage.waitElementTo(3000, false);
-        assert.isTrue(await fadeInOutPage.isBtnDisplayed(), "The button should appear!");
+        result = await fadeInOutPage.waitElementToToggleVisibility(true);
+        assert.isTrue(result.isVisible, "The button should appear!");
     });
 
     it("animation with options", async () => {
         const animationWithOptionsPage = new AnimationWithOptionsPage(driver);
         await animationWithOptionsPage.enterExample();
         await animationWithOptionsPage.toggleAnimation();
-        await animationWithOptionsPage.waitElementTo(3000);
-        assert.isFalse(await animationWithOptionsPage.isBtnDisplayed(), "The button should disappear!");
+        const result = await animationWithOptionsPage.waitElementToHide();
+        assert.isFalse(result.isVisible, "The button should disappear!");
 
         await animationWithOptionsPage.assertPositionOfToggleAnimationBtn();
     });