Skip to content
This repository was archived by the owner on Jul 14, 2022. It is now read-only.

Commit 4b5e6e6

Browse files
SvetoslavTsenovSvetoslavTsenov
authored
tests: fix-nested-frame-tests (NativeScript#7696)
1 parent 9877b20 commit 4b5e6e6

13 files changed

+100
-58
lines changed

‎e2e/nested-frame-navigation/e2e/bottom-navigation-root.e2e-spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { AppiumDriver, createDriver, logWarn, nsCapabilities } from "nativescrip
33
import { Screen, playersData, teamsData } from "./screen";
44
import * as shared from "./shared.e2e-spec";
55
import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
6+
import { TabNavigationScreen } from "./tab-navigation-screen";
67

78
const roots = ["BottomNavigation"];
89

@@ -15,7 +16,7 @@ describe(rootType, async function () {
1516
nsCapabilities.testReporter.context = this;
1617
logWarn(`====== ${rootType} ========`);
1718
driver = await createDriver();
18-
screen = new Screen(driver);
19+
screen = new TabNavigationScreen(driver);
1920
if (dontKeepActivities) {
2021
await driver.setDontKeepActivities(true);
2122
}

‎e2e/nested-frame-navigation/e2e/frame-bottom-navigation-root.e2e-spec.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { AppiumDriver, createDriver, logWarn, nsCapabilities } from "nativescrip
33
import { Screen, playersData, somePage, teamsData, driverDefaultWaitTime, Item } from "./screen";
44
import * as shared from "./shared.e2e-spec";
55
import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
6+
import { TabNavigationScreen } from "./tab-navigation-screen";
67

78
const roots = ["BottomNavigation"];
89

@@ -11,19 +12,19 @@ describe(rootType, async function () {
1112
let driver: AppiumDriver;
1213
let screen: Screen;
1314

14-
before(async () => {
15+
before(async function () {
1516
nsCapabilities.testReporter.context = this;
1617
logWarn(`====== ${rootType} ========`);
1718
driver = await createDriver();
18-
screen = new Screen(driver);
19+
screen = new TabNavigationScreen(driver);
1920
if (dontKeepActivities) {
2021
await driver.setDontKeepActivities(true);
2122
}
2223

2324
driver.defaultWaitTime = driverDefaultWaitTime;
2425
});
2526

26-
after(async () => {
27+
after(async function () {
2728
if (dontKeepActivities) {
2829
await driver.setDontKeepActivities(false);
2930
}
@@ -63,20 +64,20 @@ describe(rootType, async function () {
6364
}
6465
});
6566

66-
it("loaded home page", async () => {
67+
it("loaded home page", async function () {
6768
await screen.loadedHome();
6869
});
6970

70-
it(`loaded frame ${root} root with nested frames`, async () => {
71+
it(`loaded frame ${root} root with nested frames`, async function () {
7172
await screen[`navigateToPage${root}WithFrames`]();
7273
await screen[`loadedPage${root}WithFrames`]();
7374
});
7475

75-
it("loaded players list", async () => {
76+
it("loaded players list", async function () {
7677
await screen.loadedPlayersList();
7778
});
7879

79-
it("loaded player details and go back twice", async () => {
80+
it("loaded player details and go back twice", async function () {
8081
await shared.testPlayerNavigated(playerTwo, screen);
8182

8283
if (appSuspendResume) {
@@ -95,7 +96,7 @@ describe(rootType, async function () {
9596
await shared.testPlayerNavigatedBack(screen, driver);
9697
});
9798

98-
it("navigate parent frame and go back", async () => {
99+
it("navigate parent frame and go back", async function () {
99100
await shared[`testSomePageNavigated${transition}`](screen);
100101

101102
if (appSuspendResume) {
@@ -112,7 +113,7 @@ describe(rootType, async function () {
112113
await screen.loadedPlayersList();
113114
});
114115

115-
it("loaded player details and navigate parent frame and go back", async () => {
116+
it("loaded player details and navigate parent frame and go back", async function () {
116117
await shared.testPlayerNavigated(playerTwo, screen);
117118

118119
if (appSuspendResume) {
@@ -139,7 +140,7 @@ describe(rootType, async function () {
139140
await screen.loadedPlayersList();
140141
});
141142

142-
it("toggle teams tab", async () => {
143+
it("toggle teams tab", async function () {
143144
await screen.toggleTeamsTab();
144145

145146
if (appSuspendResume) {
@@ -148,11 +149,11 @@ describe(rootType, async function () {
148149
}
149150
});
150151

151-
it("loaded teams list", async () => {
152+
it("loaded teams list", async function () {
152153
await screen.loadedTeamsList();
153154
});
154155

155-
it("mix player and team list actions and go back", async () => {
156+
it("mix player and team list actions and go back", async function () {
156157
await screen.togglePlayersTab();
157158

158159
if (appSuspendResume) {
@@ -253,7 +254,7 @@ describe(rootType, async function () {
253254
await screen.loadedPlayersList();
254255
});
255256

256-
it("loaded home page again", async () => {
257+
it("loaded home page again", async function () {
257258
await screen[`goBackFrom${root}Page`]();
258259
await screen.loadedHome();
259260
});

‎e2e/nested-frame-navigation/e2e/frame-root.e2e-spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { AppiumDriver, createDriver, logWarn, nsCapabilities } from "nativescrip
33
import { Screen, playersData, somePage, teamsData, driverDefaultWaitTime, Item, stillOtherPage } from "./screen";
44
import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
55
import * as shared from "./shared.e2e-spec";
6+
import { TabNavigationScreen } from "./tab-navigation-screen";
67

78
const rootType = "frame-root";
89
describe(rootType, async function () {
@@ -12,7 +13,7 @@ describe(rootType, async function () {
1213
before(async function () {
1314
nsCapabilities.testReporter.context = this;
1415
driver = await createDriver();
15-
screen = new Screen(driver);
16+
screen = new TabNavigationScreen(driver);
1617
if (dontKeepActivities) {
1718
await driver.setDontKeepActivities(true);
1819
}

‎e2e/nested-frame-navigation/e2e/frame-tab-root.e2e-spec.ts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { AppiumDriver, createDriver, logWarn, nsCapabilities } from "nativescrip
33
import { Screen, playersData, somePage, teamsData, driverDefaultWaitTime, Item } from "./screen";
44
import * as shared from "./shared.e2e-spec";
55
import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
6+
import { TabViewNavigationScreen } from "./tabview-navigation-screen";
67

78
// NOTE: TabViewTop is Android only scenario (for iOS we will essentially execute 2x TabViewBottom)
89
const roots = ["TabViewTop", "TabViewBottom"];
@@ -12,19 +13,20 @@ describe(rootType, async function () {
1213
let driver: AppiumDriver;
1314
let screen: Screen;
1415

15-
before(async () => {
16+
before(async function () {
1617
nsCapabilities.testReporter.context = this;
1718
logWarn(`====== ${rootType} ========`);
1819
driver = await createDriver();
19-
screen = new Screen(driver);
20+
await driver.restartApp();
21+
screen = new TabViewNavigationScreen(driver);
2022
if (dontKeepActivities) {
2123
await driver.setDontKeepActivities(true);
2224
}
2325

2426
driver.defaultWaitTime = driverDefaultWaitTime;
2527
});
2628

27-
after(async () => {
29+
after(async function () {
2830
if (dontKeepActivities) {
2931
await driver.setDontKeepActivities(false);
3032
}
@@ -64,20 +66,20 @@ describe(rootType, async function () {
6466
}
6567
});
6668

67-
it("loaded home page", async () => {
69+
it("loaded home page", async function () {
6870
await screen.loadedHome();
6971
});
7072

71-
it(`loaded frame ${root} root with nested frames`, async () => {
73+
it(`loaded frame ${root} root with nested frames`, async function () {
7274
await screen[`navigateToPage${root}WithFrames`]();
7375
await screen[`loadedPage${root}WithFrames`]();
7476
});
7577

76-
it("loaded players list", async () => {
78+
it("loaded players list", async function () {
7779
await screen.loadedPlayersList();
7880
});
7981

80-
it("loaded player details and go back twice", async () => {
82+
it("loaded player details and go back twice", async function () {
8183
await shared.testPlayerNavigated(playerTwo, screen);
8284

8385
if (appSuspendResume) {
@@ -96,7 +98,7 @@ describe(rootType, async function () {
9698
await shared.testPlayerNavigatedBack(screen, driver);
9799
});
98100

99-
it("navigate parent frame and go back", async () => {
101+
it("navigate parent frame and go back", async function () {
100102
await shared[`testSomePageNavigated${transition}`](screen);
101103

102104
if (appSuspendResume) {
@@ -113,7 +115,7 @@ describe(rootType, async function () {
113115
await screen.loadedPlayersList();
114116
});
115117

116-
it("loaded player details and navigate parent frame and go back", async () => {
118+
it("loaded player details and navigate parent frame and go back", async function () {
117119
await shared.testPlayerNavigated(playerTwo, screen);
118120

119121
if (appSuspendResume) {
@@ -140,7 +142,7 @@ describe(rootType, async function () {
140142
await screen.loadedPlayersList();
141143
});
142144

143-
it("toggle teams tab", async () => {
145+
it("toggle teams tab", async function () {
144146
await screen.toggleTeamsTab();
145147

146148
if (appSuspendResume) {
@@ -149,11 +151,11 @@ describe(rootType, async function () {
149151
}
150152
});
151153

152-
it("loaded teams list", async () => {
154+
it("loaded teams list", async function () {
153155
await screen.loadedTeamsList();
154156
});
155157

156-
it("mix player and team list actions and go back", async () => {
158+
it("mix player and team list actions and go back", async function () {
157159
await screen.togglePlayersTab();
158160

159161
if (appSuspendResume) {
@@ -254,7 +256,7 @@ describe(rootType, async function () {
254256
await screen.loadedPlayersList();
255257
});
256258

257-
it("loaded home page again", async () => {
259+
it("loaded home page again", async function () {
258260
await screen[`goBackFrom${root}Page`]();
259261
await screen.loadedHome();
260262
});

‎e2e/nested-frame-navigation/e2e/frame-tabs-root.e2e-spec.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { AppiumDriver, createDriver, logWarn, nsCapabilities } from "nativescrip
33
import { Screen, playersData, somePage, teamsData, driverDefaultWaitTime, Item } from "./screen";
44
import * as shared from "./shared.e2e-spec";
55
import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
6+
import { TabNavigationScreen } from "./tab-navigation-screen";
67

78
const roots = ["TabsTop", "TabsBottom"];
89

@@ -11,19 +12,19 @@ describe(rootType, async function () {
1112
let driver: AppiumDriver;
1213
let screen: Screen;
1314

14-
before(async () => {
15+
before(async function () {
1516
nsCapabilities.testReporter.context = this;
1617
logWarn(`====== ${rootType} ========`);
1718
driver = await createDriver();
18-
screen = new Screen(driver);
19+
screen = new TabNavigationScreen(driver);
1920
if (dontKeepActivities) {
2021
await driver.setDontKeepActivities(true);
2122
}
2223

2324
driver.defaultWaitTime = driverDefaultWaitTime;
2425
});
2526

26-
after(async () => {
27+
after(async function () {
2728
if (dontKeepActivities) {
2829
await driver.setDontKeepActivities(false);
2930
}
@@ -63,20 +64,20 @@ describe(rootType, async function () {
6364
}
6465
});
6566

66-
it("loaded home page", async () => {
67+
it("loaded home page", async function () {
6768
await screen.loadedHome();
6869
});
6970

70-
it(`loaded frame ${root} root with nested frames`, async () => {
71+
it(`loaded frame ${root} root with nested frames`, async function () {
7172
await screen[`navigateToPage${root}WithFrames`]();
7273
await screen[`loadedPage${root}WithFrames`]();
7374
});
7475

75-
it("loaded players list", async () => {
76+
it("loaded players list", async function () {
7677
await screen.loadedPlayersList();
7778
});
7879

79-
it("loaded player details and go back twice", async () => {
80+
it("loaded player details and go back twice", async function () {
8081
await shared.testPlayerNavigated(playerTwo, screen);
8182

8283
if (appSuspendResume) {
@@ -95,7 +96,7 @@ describe(rootType, async function () {
9596
await shared.testPlayerNavigatedBack(screen, driver);
9697
});
9798

98-
it("navigate parent frame and go back", async () => {
99+
it("navigate parent frame and go back", async function () {
99100
await shared[`testSomePageNavigated${transition}`](screen);
100101

101102
if (appSuspendResume) {
@@ -112,7 +113,7 @@ describe(rootType, async function () {
112113
await screen.loadedPlayersList();
113114
});
114115

115-
it("loaded player details and navigate parent frame and go back", async () => {
116+
it("loaded player details and navigate parent frame and go back", async function () {
116117
await shared.testPlayerNavigated(playerTwo, screen);
117118

118119
if (appSuspendResume) {
@@ -139,7 +140,7 @@ describe(rootType, async function () {
139140
await screen.loadedPlayersList();
140141
});
141142

142-
it("toggle teams tab", async () => {
143+
it("toggle teams tab", async function () {
143144
await screen.toggleTeamsTab();
144145

145146
if (appSuspendResume) {
@@ -148,11 +149,11 @@ describe(rootType, async function () {
148149
}
149150
});
150151

151-
it("loaded teams list", async () => {
152+
it("loaded teams list", async function () {
152153
await screen.loadedTeamsList();
153154
});
154155

155-
it("mix player and team list actions and go back", async () => {
156+
it("mix player and team list actions and go back", async function () {
156157
await screen.togglePlayersTab();
157158

158159
if (appSuspendResume) {
@@ -253,7 +254,7 @@ describe(rootType, async function () {
253254
await screen.loadedPlayersList();
254255
});
255256

256-
it("loaded home page again", async () => {
257+
it("loaded home page again", async function () {
257258
await screen[`goBackFrom${root}Page`]();
258259
await screen.loadedHome();
259260
});

‎e2e/nested-frame-navigation/e2e/issues.e2e.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { AppiumDriver, createDriver, nsCapabilities } from "nativescript-dev-appium";
22
import { Screen } from "./screen";
33
import { suspendTime, dontKeepActivities } from "./config";
4+
import { TabViewNavigationScreen } from "./tabview-navigation-screen";
45

56
describe("issues", async function () {
67
let driver: AppiumDriver;
@@ -9,7 +10,7 @@ describe("issues", async function () {
910
before(async function () {
1011
nsCapabilities.testReporter.context = this;
1112
driver = await createDriver();
12-
screen = new Screen(driver);
13+
screen = new TabViewNavigationScreen(driver);
1314
if (dontKeepActivities) {
1415
await driver.setDontKeepActivities(true);
1516
}

‎e2e/nested-frame-navigation/e2e/layout-root.e2e-spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { AppiumDriver, createDriver, logWarn, nsCapabilities } from "nativescrip
33
import { Screen, playersData, home, somePage, otherPage, teamsData, driverDefaultWaitTime } from "./screen";
44
import * as shared from "./shared.e2e-spec";
55
import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
6+
import { TabNavigationScreen } from "./tab-navigation-screen";
67

78
const rootType = "layout-root";
89
describe(rootType, async function () {
@@ -12,7 +13,7 @@ describe(rootType, async function () {
1213
before(async function () {
1314
nsCapabilities.testReporter.context = this;
1415
driver = await createDriver();
15-
screen = new Screen(driver);
16+
screen = new TabNavigationScreen(driver);
1617
logWarn("====== layout-root ========");
1718
if (dontKeepActivities) {
1819
await driver.setDontKeepActivities(true);

0 commit comments

Comments
 (0)