Skip to content

Commit 7e18895

Browse files
SvetoslavTsenovSvetoslavTsenov
authored
Merge branch 'master' into myankov/action-bar-visibility
2 parents 9dfad8f + babe523 commit 7e18895

File tree

9 files changed

+117
-77
lines changed

9 files changed

+117
-77
lines changed

Diff for: ‎e2e/config/appium.capabilities.json

+39-1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,16 @@
9696
"noReset": true,
9797
"fullReset": false
9898
},
99+
"android28": {
100+
"platformName": "Android",
101+
"platformVersion": "28",
102+
"deviceName": "Emulator-Api28-Google",
103+
"avd": "Emulator-Api28-Google",
104+
"lt": 60000,
105+
"newCommandTimeout": 720,
106+
"noReset": true,
107+
"fullReset": false
108+
},
99109
"sim.iPhone7.iOS100": {
100110
"platformName": "iOS",
101111
"platformVersion": "10.0",
@@ -105,7 +115,7 @@
105115
},
106116
"sim.iPhone7.iOS110": {
107117
"platformName": "iOS",
108-
"platformVersion": "11.2",
118+
"platformVersion": "11.4",
109119
"deviceName": "iPhone 7 110",
110120
"noReset": true,
111121
"fullReset": false
@@ -117,11 +127,39 @@
117127
"noReset": true,
118128
"fullReset": false
119129
},
130+
"sim.iPhone8": {
131+
"platformName": "iOS",
132+
"platformVersion": "12",
133+
"deviceName": "iPhone 8",
134+
"noReset": true,
135+
"fullReset": false
136+
},
120137
"sim.iPhoneX.iOS110": {
121138
"platformName": "iOS",
122139
"platformVersion": "11.2",
123140
"deviceName": "iPhone X 110",
124141
"noReset": true,
125142
"fullReset": false
143+
},
144+
"sim.iPhoneX": {
145+
"platformName": "iOS",
146+
"platformVersion": "12.0",
147+
"deviceName": "iPhone X",
148+
"noReset": true,
149+
"fullReset": false
150+
},
151+
"sim.iPhoneXS": {
152+
"platformName": "iOS",
153+
"platformVersion": "12.0",
154+
"deviceName": "iPhone XS",
155+
"noReset": true,
156+
"fullReset": false
157+
},
158+
"sim.iPhoneXR": {
159+
"platformName": "iOS",
160+
"platformVersion": "12.0",
161+
"deviceName": "iPhone XR",
162+
"noReset": true,
163+
"fullReset": false
126164
}
127165
}

Diff for: ‎e2e/nested-router-tab-view/app/app.android.css

-35
This file was deleted.

Diff for: ‎e2e/nested-router-tab-view/app/app.css

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
Button{
2+
color: blue;
3+
}
4+
5+
TextView{
6+
color: green;
7+
}
8+
9+
Button{
10+
font-size: 8;
11+
padding-left: 5;
12+
padding-right: 5;
13+
padding-top: 0;
14+
padding-bottom: 0;
15+
margin-top: 0;
16+
margin-bottom: 0;
17+
margin-right: 0;
18+
height: 50px;
19+
color: blue;
20+
}
21+
22+
TextView{
23+
font-size: 10;
24+
margin: 0;
25+
padding: 0;
26+
color: green;
27+
}
28+
29+
Label{
30+
font-size: 10;
31+
margin: 0;
32+
padding: 0;
33+
}
34+
35+
GridLayout{
36+
margin: 0;
37+
padding: 0;
38+
}
39+
40+
ActionBar{
41+
height: 30;
42+
margin: 0;
43+
}

Diff for: ‎e2e/nested-router-tab-view/app/app.ios.css

-7
This file was deleted.

Diff for: ‎e2e/nested-router-tab-view/e2e/home-tabs.e2e-spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -97,26 +97,26 @@ describe("home-tabs:", () => {
9797
});
9898

9999
async function backActivatedRoute(driver: AppiumDriver) {
100-
const btnBack = await driver.findElementByText("Back(ActivatedRoute)");
100+
const btnBack = await driver.findElementByAutomationText("Back(ActivatedRoute)");
101101
await btnBack.tap();
102102
}
103103

104104
async function backPlayers(driver: AppiumDriver) {
105-
const btnBackPlayers = await driver.findElementByText("Back(Players)");
105+
const btnBackPlayers = await driver.findElementByAutomationText("Back(Players)");
106106
await btnBackPlayers.tap();
107107
}
108108

109109
async function backBoth(driver: AppiumDriver) {
110-
const btnBackBoth = await driver.findElementByText("Back(Both)");
110+
const btnBackBoth = await driver.findElementByAutomationText("Back(Both)");
111111
await btnBackBoth.tap();
112112
}
113113

114114
async function gotoPlayersTab(driver: AppiumDriver) {
115-
const btnTabPlayers = await driver.findElementByText("Players Tab");
115+
const btnTabPlayers = await driver.findElementByAutomationText("Players Tab");
116116
await btnTabPlayers.tap();
117117
}
118118

119119
async function gotoTeamsTab(driver: AppiumDriver) {
120-
const btnTabTeams = await driver.findElementByText("Teams Tab");
120+
const btnTabTeams = await driver.findElementByAutomationText("Teams Tab");
121121
await btnTabTeams.tap();
122122
}

Diff for: ‎e2e/nested-router-tab-view/e2e/screen.ts

+20-20
Original file line numberDiff line numberDiff line change
@@ -38,108 +38,108 @@ export class Screen {
3838
}
3939

4040
showDialogConfirm = async (title) => {
41-
const btnShowDialogConfirm = await this._driver.findElementByText(title);
41+
const btnShowDialogConfirm = await this._driver.findElementByAutomationText(title);
4242
await btnShowDialogConfirm.tap();
4343
}
4444

4545
loadedConfirmDialog = async (dialogMessage) => {
46-
const lblDialogMessage = await this._driver.findElementByText(dialogMessage);
46+
const lblDialogMessage = await this._driver.findElementByAutomationText(dialogMessage);
4747
assert.isTrue(await lblDialogMessage.isDisplayed());
4848
console.log(dialogMessage + " shown!");
4949
}
5050

5151
closeDialog = async () => {
52-
const btnYesDialog = await this._driver.findElementByText(confirmDialog);
52+
const btnYesDialog = await this._driver.findElementByAutomationText(confirmDialog);
5353
await btnYesDialog.click();
5454
}
5555

5656
loadedLogin = async () => {
57-
const lblLogin = await this._driver.findElementByText(login);
57+
const lblLogin = await this._driver.findElementByAutomationText(login);
5858
assert.isTrue(await lblLogin.isDisplayed());
5959
console.log(login + " loaded!");
6060
}
6161

6262
loadedHome = async () => {
63-
const lblHome = await this._driver.findElementByText(home);
63+
const lblHome = await this._driver.findElementByAutomationText(home);
6464
assert.isTrue(await lblHome.isDisplayed());
6565
console.log(home + " loaded!");
6666
}
6767

6868
loadedTabs = async () => {
69-
const lblTabs = await this._driver.findElementByText(tabs);
69+
const lblTabs = await this._driver.findElementByAutomationText(tabs);
7070
assert.isTrue(await lblTabs.isDisplayed());
7171
console.log(tabs + " loaded!");
7272
}
7373

7474
navigateToTabsPage = async () => {
75-
const btnNavToTabsPage = await this._driver.findElementByText(gotoTabsPage);
75+
const btnNavToTabsPage = await this._driver.findElementByAutomationText(gotoTabsPage);
7676
await btnNavToTabsPage.tap();
7777
}
7878

7979
loadedPlayersList = async () => {
80-
const lblPlayerList = await this._driver.findElementByText(playerList);
80+
const lblPlayerList = await this._driver.findElementByAutomationText(playerList);
8181
assert.isTrue(await lblPlayerList.isDisplayed());
8282
console.log(playerList + " loaded!");
8383
}
8484

8585
loadedPlayerDetails = async (player) => {
86-
const lblPlayerDetail = await this._driver.findElementByText(playerDetails);
86+
const lblPlayerDetail = await this._driver.findElementByAutomationText(playerDetails);
8787
assert.isTrue(await lblPlayerDetail.isDisplayed());
8888

89-
const lblPlayer = await this._driver.findElementByText(player + " Details");
89+
const lblPlayer = await this._driver.findElementByAutomationText(player + " Details");
9090
assert.isTrue(await lblPlayer.isDisplayed());
9191

9292
console.log(player + " Details" + " loaded!");
9393
}
9494

9595
loadedTeamList = async () => {
96-
const lblTeamList = await this._driver.findElementByText(teamList, 10);
96+
const lblTeamList = await this._driver.findElementByAutomationText(teamList, 10);
9797
assert.isTrue(await lblTeamList.isDisplayed());
9898
console.log(teamList + " loaded!");
9999
}
100100

101101
loadedTeamDetails = async (team) => {
102-
const lblTeamDetail = await this._driver.findElementByText(teamDetails);
102+
const lblTeamDetail = await this._driver.findElementByAutomationText(teamDetails);
103103
assert.isTrue(await lblTeamDetail.isDisplayed());
104104

105-
const lblTeam = await this._driver.findElementByText(team + " Details");
105+
const lblTeam = await this._driver.findElementByAutomationText(team + " Details");
106106
assert.isTrue(await lblTeam.isDisplayed());
107107

108108
console.log(team + " Details" + " loaded!");
109109
}
110110

111111
navigateToHomePage = async (homePageButton?) => {
112-
const btnNavToHomePage = await this._driver.findElementByText(homePageButton || gotoHomePage);
112+
const btnNavToHomePage = await this._driver.findElementByAutomationText(homePageButton || gotoHomePage);
113113
await btnNavToHomePage.tap();
114114
}
115115

116116
navigateToPlayer = async (player: string) => {
117-
const btnNavPlayerPage = await this._driver.findElementByText(player);
117+
const btnNavPlayerPage = await this._driver.findElementByAutomationText(player);
118118
await btnNavPlayerPage.tap();
119119
}
120120

121121
navigateToNextPlayer = async () => {
122-
const btnNavPlayerNextPage = await this._driver.findElementByText(gotoNextPlayer);
122+
const btnNavPlayerNextPage = await this._driver.findElementByAutomationText(gotoNextPlayer);
123123
await btnNavPlayerNextPage.tap();
124124
}
125125

126126
navigateToPlayers = async () => {
127-
const btnNavPlayersPage = await this._driver.findElementByText(gotoPlayers);
127+
const btnNavPlayersPage = await this._driver.findElementByAutomationText(gotoPlayers);
128128
await btnNavPlayersPage.tap();
129129
}
130130

131131
navigateToTeam = async (team: string) => {
132-
const btnNavTeamPage = await this._driver.findElementByText(team);
132+
const btnNavTeamPage = await this._driver.findElementByAutomationText(team);
133133
await btnNavTeamPage.tap();
134134
}
135135

136136
navigateToNextTeam = async () => {
137-
const btnNavTeamNextPage = await this._driver.findElementByText(gotoNextTeam);
137+
const btnNavTeamNextPage = await this._driver.findElementByAutomationText(gotoNextTeam);
138138
await btnNavTeamNextPage.tap();
139139
}
140140

141141
navigateToTeams = async () => {
142-
const btnNavTeamsPage = await this._driver.findElementByText(gotoTeams);
142+
const btnNavTeamsPage = await this._driver.findElementByAutomationText(gotoTeams);
143143
await btnNavTeamsPage.tap();
144144
}
145145
}

Diff for: ‎e2e/nested-router-tab-view/e2e/split-view.e2e-spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -152,26 +152,26 @@ describe("split-view:", () => {
152152
});
153153

154154
async function backActivatedRoute(driver: AppiumDriver) {
155-
const btnBack = await driver.findElementByText("Back(ActivatedRoute)");
155+
const btnBack = await driver.findElementByAutomationText("Back(ActivatedRoute)");
156156
await btnBack.tap();
157157
}
158158

159159
async function back(driver: AppiumDriver) {
160-
const btnBack = await driver.findElementByText("Back()");
160+
const btnBack = await driver.findElementByAutomationText("Back()");
161161
await btnBack.tap();
162162
}
163163

164164
async function backPlayers(driver: AppiumDriver) {
165-
const btnBackPlayers = await driver.findElementByText("Back(Players)");
165+
const btnBackPlayers = await driver.findElementByAutomationText("Back(Players)");
166166
await btnBackPlayers.tap();
167167
}
168168

169169
async function backTeams(driver: AppiumDriver) {
170-
const btnBackTeams = await driver.findElementByText("Back(Teams)");
170+
const btnBackTeams = await driver.findElementByAutomationText("Back(Teams)");
171171
await btnBackTeams.tap();
172172
}
173173

174174
async function backBoth(driver: AppiumDriver) {
175-
const btnBackBoth = await driver.findElementByText("Back(Both)");
175+
const btnBackBoth = await driver.findElementByAutomationText("Back(Both)");
176176
await btnBackBoth.tap();
177177
}

Diff for: ‎e2e/nested-router-tab-view/e2e/tab-view.e2e-spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,21 @@ describe("tab-view:", () => {
7676
});
7777

7878
async function gotoPlayersTab(driver: AppiumDriver) {
79-
const btnTabPlayers = await driver.findElementByText("Players Tab");
79+
const btnTabPlayers = await driver.findElementByAutomationText("Players Tab");
8080
await btnTabPlayers.tap();
8181
}
8282

8383
async function gotoTeamsTab(driver: AppiumDriver) {
84-
const btnTabTeams = await driver.findElementByText("Teams Tab");
84+
const btnTabTeams = await driver.findElementByAutomationText("Teams Tab");
8585
await btnTabTeams.tap();
8686
}
8787

8888
async function backTeams(driver: AppiumDriver) {
89-
const btnBackTeams = await driver.findElementByText("Back-Teams");
89+
const btnBackTeams = await driver.findElementByAutomationText("Back-Teams");
9090
await btnBackTeams.tap();
9191
}
9292

9393
async function backPlayers(driver: AppiumDriver) {
94-
const btnBackPlayers = await driver.findElementByText("Back-Players");
94+
const btnBackPlayers = await driver.findElementByAutomationText("Back-Players");
9595
await btnBackPlayers.tap();
9696
}

Diff for: ‎e2e/nested-router-tab-view/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"babel-traverse": "6.26.0",
3939
"babel-types": "6.26.0",
4040
"babylon": "6.18.0",
41+
"chai": "^4.2.0",
4142
"lazy": "1.0.11",
4243
"mocha": "^5.2.0",
4344
"mocha-junit-reporter": "^1.18.0",

0 commit comments

Comments
 (0)