From 1255a3c9aea97b523bd933307c78e66aab829040 Mon Sep 17 00:00:00 2001 From: SvetoslavTsenov Date: Wed, 9 Jan 2019 16:26:15 +0200 Subject: [PATCH] tests: update driver default wait time --- .../e2e/android-back-button.e2e-spec.ts | 5 +- .../e2e/modal-frame.e2e-spec.ts | 3 +- .../e2e/modal-layout.e2e-spec.ts | 3 +- .../e2e/modal-page.e2e-spec.ts | 3 +- .../e2e/modal-tab.e2e-spec.ts | 3 +- e2e/modal-navigation/e2e/screen.ts | 59 ++++++++++--------- 6 files changed, 42 insertions(+), 34 deletions(-) diff --git a/e2e/modal-navigation/e2e/android-back-button.e2e-spec.ts b/e2e/modal-navigation/e2e/android-back-button.e2e-spec.ts index e40afbe37..979728a6d 100644 --- a/e2e/modal-navigation/e2e/android-back-button.e2e-spec.ts +++ b/e2e/modal-navigation/e2e/android-back-button.e2e-spec.ts @@ -1,5 +1,5 @@ import { AppiumDriver, createDriver, SearchOptions } from "nativescript-dev-appium"; -import { Screen } from "./screen" +import { Screen, driverDefaultWaitTime, elementDefaultWaitTimeInSeconds } from "./screen" import { assert } from "chai"; const exampleAndroidBackBtnEvents = "Android Back Btn Events"; @@ -10,6 +10,7 @@ describe("android-navigate-back", () => { before(async () => { driver = await createDriver(); + driver.defaultWaitTime = driverDefaultWaitTime; screen = new Screen(driver); const btnShowNestedModalFrame = await driver.findElementByText(exampleAndroidBackBtnEvents); await btnShowNestedModalFrame.click(); @@ -31,7 +32,7 @@ describe("android-navigate-back", () => { } await driver.navBack(); - const textElement = await driver.findElementsByText("will cancel next back press: false", SearchOptions.contains, 10); + const textElement = await driver.findElementsByText("will cancel next back press: false", SearchOptions.contains, elementDefaultWaitTimeInSeconds); assert.isTrue(textElement !== null); await driver.navBack(); await screen.loadedHome(); diff --git a/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts index 79010a093..e4438c8ba 100644 --- a/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts +++ b/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts @@ -1,5 +1,5 @@ import { AppiumDriver, createDriver } from "nativescript-dev-appium"; -import { Screen } from "./screen" +import { Screen, driverDefaultWaitTime } from "./screen" import { roots, modalFrameBackground, @@ -17,6 +17,7 @@ describe("modal-frame:", () => { before(async () => { driver = await createDriver(); + driver.defaultWaitTime = driverDefaultWaitTime; screen = new Screen(driver); }); diff --git a/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts index 189f94bd7..5222d0229 100644 --- a/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts +++ b/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts @@ -1,5 +1,5 @@ import { AppiumDriver, createDriver } from "nativescript-dev-appium"; -import { Screen } from "./screen" +import { Screen, driverDefaultWaitTime } from "./screen" import { roots, modalFrameBackground, @@ -17,6 +17,7 @@ describe("modal-layout:", () => { before(async () => { driver = await createDriver(); + driver.defaultWaitTime = driverDefaultWaitTime; screen = new Screen(driver); }); diff --git a/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts index 8d891a284..e2d0462ed 100644 --- a/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts +++ b/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts @@ -1,5 +1,5 @@ import { AppiumDriver, createDriver } from "nativescript-dev-appium"; -import { Screen } from "./screen" +import { Screen, driverDefaultWaitTime } from "./screen" import { roots, modalPageBackground, @@ -16,6 +16,7 @@ describe("modal-page:", () => { before(async () => { driver = await createDriver(); + driver.defaultWaitTime = driverDefaultWaitTime; screen = new Screen(driver); }); diff --git a/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts index 8726e35ac..8b784c1bb 100644 --- a/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts +++ b/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts @@ -1,5 +1,5 @@ import { AppiumDriver, createDriver } from "nativescript-dev-appium"; -import { Screen } from "./screen" +import { Screen, driverDefaultWaitTime } from "./screen" import { roots, modalFrameBackground, @@ -19,6 +19,7 @@ describe("modal-tab:", () => { before(async () => { driver = await createDriver(); + driver.defaultWaitTime = driverDefaultWaitTime; screen = new Screen(driver); }); diff --git a/e2e/modal-navigation/e2e/screen.ts b/e2e/modal-navigation/e2e/screen.ts index d2b4bb58a..8b28e6915 100644 --- a/e2e/modal-navigation/e2e/screen.ts +++ b/e2e/modal-navigation/e2e/screen.ts @@ -28,6 +28,9 @@ const closeModalNested = "Close Modal Nested"; const closeModal = "Close Modal"; const goBack = "Go Back"; +export const driverDefaultWaitTime = 10000; +export const elementDefaultWaitTimeInSeconds = 10; + export class Screen { private _driver: AppiumDriver @@ -37,30 +40,30 @@ export class Screen { } loadedHome = async () => { - const lblHome = await this._driver.findElementByText(home); + const lblHome = await this._driver.waitForElement(home); assert.isTrue(await lblHome.isDisplayed()); console.log(home + " loaded!"); } resetFrameRootView = async () => { console.log("Setting frame root ..."); - const btnResetFrameRootView = await this._driver.findElementByText(resetFrameRootView); + const btnResetFrameRootView = await this._driver.waitForElement(resetFrameRootView); await btnResetFrameRootView.tap(); } resetLayoutRootView = async () => { console.log("Setting layout root ..."); - const btnResetLayoutRootView = await this._driver.findElementByText(resetLayoutRootView); + const btnResetLayoutRootView = await this._driver.waitForElement(resetLayoutRootView); await btnResetLayoutRootView.tap(); } resetTabRootView = async () => { - const btnResetTabRootView = await this._driver.findElementByText(resetTabRootView); + const btnResetTabRootView = await this._driver.waitForElement(resetTabRootView); await btnResetTabRootView.tap(); } loadedTabRootView = async () => { - const tabFirst = await this._driver.findElementByText(first); + const tabFirst = await this._driver.waitForElement(first); assert.isTrue(await tabFirst.isDisplayed()); console.log("Tab root view loaded!"); } @@ -89,29 +92,29 @@ export class Screen { } showModalFrame = async () => { - const btnModalFrame = await this._driver.findElementByText(modalFrame); + const btnModalFrame = await this._driver.waitForElement(modalFrame); await btnModalFrame.tap(); } loadedModalFrame = async () => { - const lblModal = await this._driver.findElementByText(modal); + const lblModal = await this._driver.waitForElement(modal); assert.isTrue(await lblModal.isDisplayed()); console.log(modal + " loaded!"); } showModalPage = async () => { - const btnModalPage = await this._driver.findElementByText(modalPage); + const btnModalPage = await this._driver.waitForElement(modalPage); await btnModalPage.tap(); } loadedModalPage = async () => { - const btnShowNestedModalPage = await this._driver.findElementByText(showNestedModalPage); + const btnShowNestedModalPage = await this._driver.waitForElement(showNestedModalPage); assert.isTrue(await btnShowNestedModalPage.isDisplayed()); console.log("Modal Page loaded!"); } showModalLayout = async () => { - const btnModalLayout = await this._driver.findElementByText(modalLayout); + const btnModalLayout = await this._driver.waitForElement(modalLayout); await btnModalLayout.tap(); } @@ -120,99 +123,99 @@ export class Screen { } showModalTabView = async () => { - const btnModalTabView = await this._driver.findElementByText(modalTabView); + const btnModalTabView = await this._driver.waitForElement(modalTabView); await btnModalTabView.tap(); } loadedModalTabView = async () => { - const itemModalFirst = await this._driver.findElementByText(modalFirst); + const itemModalFirst = await this._driver.waitForElement(modalFirst); assert.isTrue(await itemModalFirst.isDisplayed()); console.log("Modal TabView loaded!"); } navigateToSecondPage = async () => { - const btnNavToSecondPage = await this._driver.findElementByText(navToSecondPage); + const btnNavToSecondPage = await this._driver.waitForElement(navToSecondPage); await btnNavToSecondPage.tap(); } showDialogConfirm = async () => { - const btnShowDialogConfirm = await this._driver.findElementByText(showDialog); + const btnShowDialogConfirm = await this._driver.waitForElement(showDialog); await btnShowDialogConfirm.tap(); } navigateToFirstItem = async () => { - const itemModalFirst = await this._driver.findElementByText(modalFirst); + const itemModalFirst = await this._driver.waitForElement(modalFirst); await itemModalFirst.tap(); } navigateToSecondItem = async () => { - const itemModalSecond = await this._driver.findElementByText(modalSecond); + const itemModalSecond = await this._driver.waitForElement(modalSecond); await itemModalSecond.tap(); } loadedConfirmDialog = async () => { - const lblDialogMessage = await this._driver.findElementByText(confirmDialogMessage); + const lblDialogMessage = await this._driver.waitForElement(confirmDialogMessage); assert.isTrue(await lblDialogMessage.isDisplayed()); console.log(dialogConfirm + " shown!"); } loadedSecondPage = async () => { - const lblModalSecond = await this._driver.findElementByText(modalSecond); + const lblModalSecond = await this._driver.waitForElement(modalSecond); assert.isTrue(await lblModalSecond.isDisplayed()); console.log(modalSecond + " loaded!"); } loadedFirstItem = async () => { - const lblModal = await this._driver.findElementByText(modal); + const lblModal = await this._driver.waitForElement(modal); assert.isTrue(await lblModal.isDisplayed()); console.log("First Item loaded!"); } loadedSecondItem = async () => { - const btnGoBack = await this._driver.findElementByText(goBack); + const btnGoBack = await this._driver.waitForElement(goBack); assert.isTrue(await btnGoBack.isDisplayed()); console.log("Second Item loaded!"); } closeDialog = async () => { - const btnYesDialog = await this._driver.findElementByText(confirmDialog); + const btnYesDialog = await this._driver.waitForElement(confirmDialog); await btnYesDialog.tap(); } goBackFromSecondPage = async () => { - const btnGoBackFromSecondPage = await this._driver.findElementByText(goBack); + const btnGoBackFromSecondPage = await this._driver.waitForElement(goBack); await btnGoBackFromSecondPage.tap(); } showNestedModalFrame = async () => { - const btnShowNestedModalFrame = await this._driver.findElementByText(showNestedModalFrame); + const btnShowNestedModalFrame = await this._driver.waitForElement(showNestedModalFrame); await btnShowNestedModalFrame.tap(); } loadedNestedModalFrame = async () => { - const lblModalNested = await this._driver.findElementByText(modalNested); + const lblModalNested = await this._driver.waitForElement(modalNested); assert.isTrue(await lblModalNested.isDisplayed()); console.log(modalNested + " loaded!"); } closeModalNested = async () => { - const btnCloseNestedModal = await this._driver.findElementByText(closeModalNested); + const btnCloseNestedModal = await this._driver.waitForElement(closeModalNested); await btnCloseNestedModal.tap(); } showNestedModalPage = async () => { - const btnShowNestedModalPage = await this._driver.findElementByText(showNestedModalPage); + const btnShowNestedModalPage = await this._driver.waitForElement(showNestedModalPage); await btnShowNestedModalPage.tap(); } loadedNestedModalPage = async () => { - const btnCloseModalNested = await this._driver.findElementByText(closeModalNested); + const btnCloseModalNested = await this._driver.waitForElement(closeModalNested); assert.isTrue(await btnCloseModalNested.isDisplayed()); console.log(closeModalNested + " loaded!"); } closeModal = async () => { - const btnCloseModal = await this._driver.findElementByText(closeModal); + const btnCloseModal = await this._driver.waitForElement(closeModal); await btnCloseModal.tap(); }