From bfe7bfcaa5023efb4548d8c32fd1fa6effc5e577 Mon Sep 17 00:00:00 2001 From: SvetoslavTsenov Date: Mon, 29 Oct 2018 15:11:12 +0200 Subject: [PATCH] test: relpace findElementByText with findElementByAutomationText --- e2e/config/appium.capabilities.json | 40 ++++++++++++++++- .../app/app.android.css | 35 --------------- e2e/nested-router-tab-view/app/app.css | 43 +++++++++++++++++++ e2e/nested-router-tab-view/app/app.ios.css | 7 --- .../e2e/home-tabs.e2e-spec.ts | 10 ++--- e2e/nested-router-tab-view/e2e/screen.ts | 40 ++++++++--------- .../e2e/split-view.e2e-spec.ts | 10 ++--- .../e2e/tab-view.e2e-spec.ts | 8 ++-- e2e/nested-router-tab-view/package.json | 1 + 9 files changed, 117 insertions(+), 77 deletions(-) delete mode 100644 e2e/nested-router-tab-view/app/app.android.css delete mode 100644 e2e/nested-router-tab-view/app/app.ios.css diff --git a/e2e/config/appium.capabilities.json b/e2e/config/appium.capabilities.json index 4b002b8bc..f33ede526 100644 --- a/e2e/config/appium.capabilities.json +++ b/e2e/config/appium.capabilities.json @@ -96,6 +96,16 @@ "noReset": true, "fullReset": false }, + "android28": { + "platformName": "Android", + "platformVersion": "28", + "deviceName": "Emulator-Api28-Google", + "avd": "Emulator-Api28-Google", + "lt": 60000, + "newCommandTimeout": 720, + "noReset": true, + "fullReset": false + }, "sim.iPhone7.iOS100": { "platformName": "iOS", "platformVersion": "10.0", @@ -105,7 +115,7 @@ }, "sim.iPhone7.iOS110": { "platformName": "iOS", - "platformVersion": "11.2", + "platformVersion": "11.4", "deviceName": "iPhone 7 110", "noReset": true, "fullReset": false @@ -117,11 +127,39 @@ "noReset": true, "fullReset": false }, + "sim.iPhone8": { + "platformName": "iOS", + "platformVersion": "12", + "deviceName": "iPhone 8", + "noReset": true, + "fullReset": false + }, "sim.iPhoneX.iOS110": { "platformName": "iOS", "platformVersion": "11.2", "deviceName": "iPhone X 110", "noReset": true, "fullReset": false + }, + "sim.iPhoneX": { + "platformName": "iOS", + "platformVersion": "12.0", + "deviceName": "iPhone X", + "noReset": true, + "fullReset": false + }, + "sim.iPhoneXS": { + "platformName": "iOS", + "platformVersion": "12.0", + "deviceName": "iPhone XS", + "noReset": true, + "fullReset": false + }, + "sim.iPhoneXR": { + "platformName": "iOS", + "platformVersion": "12.0", + "deviceName": "iPhone XR", + "noReset": true, + "fullReset": false } } \ No newline at end of file diff --git a/e2e/nested-router-tab-view/app/app.android.css b/e2e/nested-router-tab-view/app/app.android.css deleted file mode 100644 index d69fe22a0..000000000 --- a/e2e/nested-router-tab-view/app/app.android.css +++ /dev/null @@ -1,35 +0,0 @@ -Button{ - font-size: 8; - padding-left: 5; - padding-right: 5; - padding-top: 0; - padding-bottom: 0; - margin-top: 0; - margin-bottom: 0; - margin-right: 0; - height: 50px; - color: blue; -} - -TextView{ - font-size: 10; - margin: 0; - padding: 0; - color: green; -} - -Label{ - font-size: 10; - margin: 0; - padding: 0; -} - -GridLayout{ - margin: 0; - padding: 0; -} - -ActionBar{ - height: 30; - margin: 0; -} \ No newline at end of file diff --git a/e2e/nested-router-tab-view/app/app.css b/e2e/nested-router-tab-view/app/app.css index e69de29bb..57ce8e6d5 100644 --- a/e2e/nested-router-tab-view/app/app.css +++ b/e2e/nested-router-tab-view/app/app.css @@ -0,0 +1,43 @@ +Button{ + color: blue; +} + +TextView{ + color: green; +} + +Button{ + font-size: 8; + padding-left: 5; + padding-right: 5; + padding-top: 0; + padding-bottom: 0; + margin-top: 0; + margin-bottom: 0; + margin-right: 0; + height: 50px; + color: blue; +} + +TextView{ + font-size: 10; + margin: 0; + padding: 0; + color: green; +} + +Label{ + font-size: 10; + margin: 0; + padding: 0; +} + +GridLayout{ + margin: 0; + padding: 0; +} + +ActionBar{ + height: 30; + margin: 0; +} \ No newline at end of file diff --git a/e2e/nested-router-tab-view/app/app.ios.css b/e2e/nested-router-tab-view/app/app.ios.css deleted file mode 100644 index 38a30b36a..000000000 --- a/e2e/nested-router-tab-view/app/app.ios.css +++ /dev/null @@ -1,7 +0,0 @@ -Button{ - color: blue; -} - -TextView{ - color: green; -} \ No newline at end of file diff --git a/e2e/nested-router-tab-view/e2e/home-tabs.e2e-spec.ts b/e2e/nested-router-tab-view/e2e/home-tabs.e2e-spec.ts index 5e8e88e74..b2a7b9613 100644 --- a/e2e/nested-router-tab-view/e2e/home-tabs.e2e-spec.ts +++ b/e2e/nested-router-tab-view/e2e/home-tabs.e2e-spec.ts @@ -97,26 +97,26 @@ describe("home-tabs:", () => { }); async function backActivatedRoute(driver: AppiumDriver) { - const btnBack = await driver.findElementByText("Back(ActivatedRoute)"); + const btnBack = await driver.findElementByAutomationText("Back(ActivatedRoute)"); await btnBack.tap(); } async function backPlayers(driver: AppiumDriver) { - const btnBackPlayers = await driver.findElementByText("Back(Players)"); + const btnBackPlayers = await driver.findElementByAutomationText("Back(Players)"); await btnBackPlayers.tap(); } async function backBoth(driver: AppiumDriver) { - const btnBackBoth = await driver.findElementByText("Back(Both)"); + const btnBackBoth = await driver.findElementByAutomationText("Back(Both)"); await btnBackBoth.tap(); } async function gotoPlayersTab(driver: AppiumDriver) { - const btnTabPlayers = await driver.findElementByText("Players Tab"); + const btnTabPlayers = await driver.findElementByAutomationText("Players Tab"); await btnTabPlayers.tap(); } async function gotoTeamsTab(driver: AppiumDriver) { - const btnTabTeams = await driver.findElementByText("Teams Tab"); + const btnTabTeams = await driver.findElementByAutomationText("Teams Tab"); await btnTabTeams.tap(); } diff --git a/e2e/nested-router-tab-view/e2e/screen.ts b/e2e/nested-router-tab-view/e2e/screen.ts index 0c9126fd8..9aa2e8971 100644 --- a/e2e/nested-router-tab-view/e2e/screen.ts +++ b/e2e/nested-router-tab-view/e2e/screen.ts @@ -38,108 +38,108 @@ export class Screen { } showDialogConfirm = async (title) => { - const btnShowDialogConfirm = await this._driver.findElementByText(title); + const btnShowDialogConfirm = await this._driver.findElementByAutomationText(title); await btnShowDialogConfirm.tap(); } loadedConfirmDialog = async (dialogMessage) => { - const lblDialogMessage = await this._driver.findElementByText(dialogMessage); + const lblDialogMessage = await this._driver.findElementByAutomationText(dialogMessage); assert.isTrue(await lblDialogMessage.isDisplayed()); console.log(dialogMessage + " shown!"); } closeDialog = async () => { - const btnYesDialog = await this._driver.findElementByText(confirmDialog); + const btnYesDialog = await this._driver.findElementByAutomationText(confirmDialog); await btnYesDialog.click(); } loadedLogin = async () => { - const lblLogin = await this._driver.findElementByText(login); + const lblLogin = await this._driver.findElementByAutomationText(login); assert.isTrue(await lblLogin.isDisplayed()); console.log(login + " loaded!"); } loadedHome = async () => { - const lblHome = await this._driver.findElementByText(home); + const lblHome = await this._driver.findElementByAutomationText(home); assert.isTrue(await lblHome.isDisplayed()); console.log(home + " loaded!"); } loadedTabs = async () => { - const lblTabs = await this._driver.findElementByText(tabs); + const lblTabs = await this._driver.findElementByAutomationText(tabs); assert.isTrue(await lblTabs.isDisplayed()); console.log(tabs + " loaded!"); } navigateToTabsPage = async () => { - const btnNavToTabsPage = await this._driver.findElementByText(gotoTabsPage); + const btnNavToTabsPage = await this._driver.findElementByAutomationText(gotoTabsPage); await btnNavToTabsPage.tap(); } loadedPlayersList = async () => { - const lblPlayerList = await this._driver.findElementByText(playerList); + const lblPlayerList = await this._driver.findElementByAutomationText(playerList); assert.isTrue(await lblPlayerList.isDisplayed()); console.log(playerList + " loaded!"); } loadedPlayerDetails = async (player) => { - const lblPlayerDetail = await this._driver.findElementByText(playerDetails); + const lblPlayerDetail = await this._driver.findElementByAutomationText(playerDetails); assert.isTrue(await lblPlayerDetail.isDisplayed()); - const lblPlayer = await this._driver.findElementByText(player + " Details"); + const lblPlayer = await this._driver.findElementByAutomationText(player + " Details"); assert.isTrue(await lblPlayer.isDisplayed()); console.log(player + " Details" + " loaded!"); } loadedTeamList = async () => { - const lblTeamList = await this._driver.findElementByText(teamList, 10); + const lblTeamList = await this._driver.findElementByAutomationText(teamList, 10); assert.isTrue(await lblTeamList.isDisplayed()); console.log(teamList + " loaded!"); } loadedTeamDetails = async (team) => { - const lblTeamDetail = await this._driver.findElementByText(teamDetails); + const lblTeamDetail = await this._driver.findElementByAutomationText(teamDetails); assert.isTrue(await lblTeamDetail.isDisplayed()); - const lblTeam = await this._driver.findElementByText(team + " Details"); + const lblTeam = await this._driver.findElementByAutomationText(team + " Details"); assert.isTrue(await lblTeam.isDisplayed()); console.log(team + " Details" + " loaded!"); } navigateToHomePage = async (homePageButton?) => { - const btnNavToHomePage = await this._driver.findElementByText(homePageButton || gotoHomePage); + const btnNavToHomePage = await this._driver.findElementByAutomationText(homePageButton || gotoHomePage); await btnNavToHomePage.tap(); } navigateToPlayer = async (player: string) => { - const btnNavPlayerPage = await this._driver.findElementByText(player); + const btnNavPlayerPage = await this._driver.findElementByAutomationText(player); await btnNavPlayerPage.tap(); } navigateToNextPlayer = async () => { - const btnNavPlayerNextPage = await this._driver.findElementByText(gotoNextPlayer); + const btnNavPlayerNextPage = await this._driver.findElementByAutomationText(gotoNextPlayer); await btnNavPlayerNextPage.tap(); } navigateToPlayers = async () => { - const btnNavPlayersPage = await this._driver.findElementByText(gotoPlayers); + const btnNavPlayersPage = await this._driver.findElementByAutomationText(gotoPlayers); await btnNavPlayersPage.tap(); } navigateToTeam = async (team: string) => { - const btnNavTeamPage = await this._driver.findElementByText(team); + const btnNavTeamPage = await this._driver.findElementByAutomationText(team); await btnNavTeamPage.tap(); } navigateToNextTeam = async () => { - const btnNavTeamNextPage = await this._driver.findElementByText(gotoNextTeam); + const btnNavTeamNextPage = await this._driver.findElementByAutomationText(gotoNextTeam); await btnNavTeamNextPage.tap(); } navigateToTeams = async () => { - const btnNavTeamsPage = await this._driver.findElementByText(gotoTeams); + const btnNavTeamsPage = await this._driver.findElementByAutomationText(gotoTeams); await btnNavTeamsPage.tap(); } } \ No newline at end of file diff --git a/e2e/nested-router-tab-view/e2e/split-view.e2e-spec.ts b/e2e/nested-router-tab-view/e2e/split-view.e2e-spec.ts index 5fe6eacac..abf6ce955 100644 --- a/e2e/nested-router-tab-view/e2e/split-view.e2e-spec.ts +++ b/e2e/nested-router-tab-view/e2e/split-view.e2e-spec.ts @@ -152,26 +152,26 @@ describe("split-view:", () => { }); async function backActivatedRoute(driver: AppiumDriver) { - const btnBack = await driver.findElementByText("Back(ActivatedRoute)"); + const btnBack = await driver.findElementByAutomationText("Back(ActivatedRoute)"); await btnBack.tap(); } async function back(driver: AppiumDriver) { - const btnBack = await driver.findElementByText("Back()"); + const btnBack = await driver.findElementByAutomationText("Back()"); await btnBack.tap(); } async function backPlayers(driver: AppiumDriver) { - const btnBackPlayers = await driver.findElementByText("Back(Players)"); + const btnBackPlayers = await driver.findElementByAutomationText("Back(Players)"); await btnBackPlayers.tap(); } async function backTeams(driver: AppiumDriver) { - const btnBackTeams = await driver.findElementByText("Back(Teams)"); + const btnBackTeams = await driver.findElementByAutomationText("Back(Teams)"); await btnBackTeams.tap(); } async function backBoth(driver: AppiumDriver) { - const btnBackBoth = await driver.findElementByText("Back(Both)"); + const btnBackBoth = await driver.findElementByAutomationText("Back(Both)"); await btnBackBoth.tap(); } \ No newline at end of file diff --git a/e2e/nested-router-tab-view/e2e/tab-view.e2e-spec.ts b/e2e/nested-router-tab-view/e2e/tab-view.e2e-spec.ts index 47b7fb0bb..3fa7b35e0 100644 --- a/e2e/nested-router-tab-view/e2e/tab-view.e2e-spec.ts +++ b/e2e/nested-router-tab-view/e2e/tab-view.e2e-spec.ts @@ -76,21 +76,21 @@ describe("tab-view:", () => { }); async function gotoPlayersTab(driver: AppiumDriver) { - const btnTabPlayers = await driver.findElementByText("Players Tab"); + const btnTabPlayers = await driver.findElementByAutomationText("Players Tab"); await btnTabPlayers.tap(); } async function gotoTeamsTab(driver: AppiumDriver) { - const btnTabTeams = await driver.findElementByText("Teams Tab"); + const btnTabTeams = await driver.findElementByAutomationText("Teams Tab"); await btnTabTeams.tap(); } async function backTeams(driver: AppiumDriver) { - const btnBackTeams = await driver.findElementByText("Back-Teams"); + const btnBackTeams = await driver.findElementByAutomationText("Back-Teams"); await btnBackTeams.tap(); } async function backPlayers(driver: AppiumDriver) { - const btnBackPlayers = await driver.findElementByText("Back-Players"); + const btnBackPlayers = await driver.findElementByAutomationText("Back-Players"); await btnBackPlayers.tap(); } diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json index 0c75b2cdb..293f4e5f5 100644 --- a/e2e/nested-router-tab-view/package.json +++ b/e2e/nested-router-tab-view/package.json @@ -38,6 +38,7 @@ "babel-traverse": "6.26.0", "babel-types": "6.26.0", "babylon": "6.18.0", + "chai": "^4.2.0", "lazy": "1.0.11", "mocha": "^5.2.0", "mocha-junit-reporter": "^1.18.0",