mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-16 11:42:04 +08:00
Merge branch 'master' into myankov/merge-release-master
This commit is contained in:
22
e2e/nested-frame-navigation/.vscode/launch.json
vendored
22
e2e/nested-frame-navigation/.vscode/launch.json
vendored
@ -4,6 +4,28 @@
|
||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"name": "debug tests",
|
||||
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
|
||||
"args": [
|
||||
"-u",
|
||||
"tdd",
|
||||
"--timeout",
|
||||
"999999",
|
||||
"--colors",
|
||||
"${workspaceFolder}/e2e",
|
||||
"--opts",
|
||||
"../config/mocha.opts",
|
||||
"-p",
|
||||
"4723",
|
||||
"-a",
|
||||
"--grep",
|
||||
"layout-root"
|
||||
],
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
},
|
||||
{
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
|
@ -1,25 +1,20 @@
|
||||
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;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
height: 30px;
|
||||
color: blue;
|
||||
}
|
||||
|
||||
TextView {
|
||||
font-size: 10;
|
||||
font-size: 8;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
color: green;
|
||||
}
|
||||
|
||||
Label {
|
||||
font-size: 10;
|
||||
font-size: 8;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
@ -30,6 +25,6 @@ GridLayout {
|
||||
}
|
||||
|
||||
ActionBar {
|
||||
height: 30;
|
||||
height: 20;
|
||||
margin: 0;
|
||||
}
|
@ -1,7 +1,22 @@
|
||||
Button{
|
||||
color: blue;
|
||||
font-size: 10;
|
||||
height: 35px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
TextView{
|
||||
color: green;
|
||||
font-size: 10;
|
||||
}
|
||||
|
||||
Label{
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-size: 10;
|
||||
}
|
||||
|
||||
ActionBar {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
@ -1,8 +1,8 @@
|
||||
<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
|
||||
|
||||
<ActionBar class="action-bar">
|
||||
<ActionBar>
|
||||
<NavigationButton text="frameHomeBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
|
||||
<Label class="action-bar-title" text="multi frame home page" horizontalAlignment="center" />
|
||||
<Label text="multi frame home page" horizontalAlignment="center" />
|
||||
</ActionBar>
|
||||
|
||||
<GridLayout rows="auto, *, *">
|
||||
|
@ -1,7 +1,7 @@
|
||||
<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
|
||||
|
||||
<ActionBar class="action-bar">
|
||||
<Label class="action-bar-title" text="layout home page" horizontalAlignment="center" />
|
||||
<ActionBar>
|
||||
<Label text="layout home page" horizontalAlignment="center" />
|
||||
</ActionBar>
|
||||
|
||||
<GridLayout rows="auto, *">
|
||||
|
@ -1,7 +1,7 @@
|
||||
<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
|
||||
|
||||
<ActionBar class="action-bar">
|
||||
<Label class="action-bar-title" text="layout home secondary page" horizontalAlignment="center" />
|
||||
<ActionBar >
|
||||
<Label text="layout home secondary page" horizontalAlignment="center" />
|
||||
</ActionBar>
|
||||
|
||||
<GridLayout rows="auto, *">
|
||||
|
@ -1,12 +1,12 @@
|
||||
<Page class="page" navigatingTo="onNavigatingTo" xmlns="http://schemas.nativescript.org/tns.xsd">
|
||||
|
||||
<ActionBar class="action-bar">
|
||||
<ActionBar>
|
||||
<NavigationButton text="playerBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back"/>
|
||||
<Label class="action-bar-title" text="{{ name }}"></Label>
|
||||
<Label text="{{ name }}"></Label>
|
||||
</ActionBar>
|
||||
|
||||
<GridLayout>
|
||||
<Label class="m-10 h3" verticalAlignment="top" text="{{ description }}"></Label>
|
||||
<Label verticalAlignment="top" text="{{ description }}"></Label>
|
||||
</GridLayout>
|
||||
|
||||
</Page>
|
@ -1,7 +1,7 @@
|
||||
<Page class="page" navigatingTo="onNavigatingTo" xmlns="http://schemas.nativescript.org/tns.xsd">
|
||||
|
||||
<ActionBar class="action-bar">
|
||||
<Label class="action-bar-title" text="Players"></Label>
|
||||
<ActionBar >
|
||||
<Label text="Players"></Label>
|
||||
</ActionBar>
|
||||
|
||||
<ListView items="{{ items }}" itemTap="onItemTap" class="list-group">
|
||||
|
@ -1,5 +1,4 @@
|
||||
export const suspendTime = 1;
|
||||
export const appSuspendResume = true;
|
||||
export const dontKeepActivities = true;
|
||||
// TODO: restore "slide" when https://github.com/NativeScript/NativeScript/issues/6728 is fixed
|
||||
export const transitions = ["Default", "None", /*"Slide", */"Flip"];
|
||||
export const transitions = ["Default", "None", "Slide", "Flip"];
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { AppiumDriver, createDriver } from "nativescript-dev-appium";
|
||||
import { AppiumDriver, createDriver, logWarn } from "nativescript-dev-appium";
|
||||
|
||||
import { Screen, playersData, home, somePage, teamsData, driverDefaultWaitTime } from "./screen";
|
||||
import { Screen, playersData, home, somePage, teamsData, driverDefaultWaitTime, Item } from "./screen";
|
||||
import * as shared from "./shared.e2e-spec";
|
||||
import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
|
||||
|
||||
@ -32,53 +32,66 @@ describe("frame-root:", () => {
|
||||
}
|
||||
});
|
||||
|
||||
transitions.forEach(transition => {
|
||||
const playerOne = playersData[`playerOne${transition}`];
|
||||
const playerTwo = playersData[`playerTwo${transition}`];
|
||||
const teamOne = teamsData[`teamOne${transition}`];
|
||||
const teamTwo = teamsData[`teamTwo${transition}`];
|
||||
for (let index = 0; index < transitions.length; index++) {
|
||||
const transition = transitions[index];
|
||||
|
||||
const playerOne: Item = playersData[`playerOne${transition}`];
|
||||
const playerTwo: Item = playersData[`playerTwo${transition}`];
|
||||
const teamOne: Item = teamsData[`teamOne${transition}`];
|
||||
const teamTwo: Item = teamsData[`teamTwo${transition}`];
|
||||
|
||||
describe(`transition: ${transition} scenarios:`, () => {
|
||||
before(async function () {
|
||||
logWarn(`==== Transition ${transition}`);
|
||||
|
||||
if (transition === "Flip" &&
|
||||
driver.isAndroid && parseInt(driver.platformVersion) === 19) {
|
||||
// TODO: known issue https://github.com/NativeScript/NativeScript/issues/6798
|
||||
console.log("skipping flip transition tests on api level 19");
|
||||
this.skip();
|
||||
}
|
||||
});
|
||||
|
||||
it("loaded home page", async () => {
|
||||
await screen.loadedHome();
|
||||
});
|
||||
|
||||
|
||||
it("loaded frame root with nested frame", async () => {
|
||||
await screen.navigateToPageWithFrame();
|
||||
await screen.loadedPageWithFrame();
|
||||
});
|
||||
|
||||
|
||||
it("loaded players list", async () => {
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
|
||||
|
||||
it("loaded player details and go back twice", async () => {
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name) // wait for player
|
||||
await screen.loadedElement(playerTwo.name);
|
||||
}
|
||||
|
||||
|
||||
await shared.testPlayerNavigatedBack(screen, driver);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerOne.name) // wait for players list
|
||||
await screen.loadedElement(playerOne.name);
|
||||
}
|
||||
|
||||
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
await shared.testPlayerNavigatedBack(screen, driver);
|
||||
});
|
||||
|
||||
|
||||
it("navigate parent frame and go back", async () => {
|
||||
await shared[`testSomePageNavigated${transition}`](screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(somePage); // wait for some page
|
||||
await screen.loadedSomePage() // wait for some page
|
||||
}
|
||||
|
||||
|
||||
if (driver.isAndroid) {
|
||||
await driver.navBack(); // some page back navigation
|
||||
} else {
|
||||
@ -87,22 +100,22 @@ describe("frame-root:", () => {
|
||||
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
|
||||
|
||||
it("loaded player details and navigate parent frame and go back", async () => {
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name); // wait for player
|
||||
await screen.loadedElement(playerTwo.name);
|
||||
}
|
||||
|
||||
await shared[`testSomePageNavigated${transition}`](screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(somePage); // wait for some page
|
||||
await screen.loadedSomePage() // wait for some page
|
||||
}
|
||||
|
||||
|
||||
if (driver.isAndroid) {
|
||||
await driver.navBack(); // some page back navigation
|
||||
} else {
|
||||
@ -110,125 +123,125 @@ describe("frame-root:", () => {
|
||||
}
|
||||
|
||||
await screen.loadedPlayerDetails(playerTwo);
|
||||
|
||||
|
||||
await screen.goBackToPlayersList();
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
|
||||
|
||||
it("loaded home page again", async () => {
|
||||
await screen.goBackFromFrameHome();
|
||||
await screen.loadedHome();
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(home); // wait for home page
|
||||
await screen.loadedHome();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
it("loaded frame root with multi nested frames", async () => {
|
||||
await screen.navigateToPageWithMultiFrame();
|
||||
await screen.loadedPageWithMultiFrame();
|
||||
});
|
||||
|
||||
|
||||
it("loaded players list", async () => {
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
|
||||
|
||||
it("loaded teams list", async () => {
|
||||
await screen.loadedTeamsList();
|
||||
});
|
||||
|
||||
|
||||
it("loaded player details and go back twice", async () => {
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name) // wait for player
|
||||
await screen.loadedElement(playerTwo.description);
|
||||
}
|
||||
|
||||
await shared.testPlayerNavigatedBack(screen, driver);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerOne.name) // wait for players list
|
||||
await screen.loadedElement(playerOne.name) // wait for players list
|
||||
}
|
||||
|
||||
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
await shared.testPlayerNavigatedBack(screen, driver);
|
||||
});
|
||||
|
||||
|
||||
it("navigate players parent frame and go back", async () => {
|
||||
await shared[`testSomePageNavigated${transition}`](screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(somePage); // wait for some page
|
||||
await screen.loadedSomePage();
|
||||
}
|
||||
|
||||
|
||||
if (driver.isAndroid) {
|
||||
await driver.navBack(); // some page back navigation
|
||||
} else {
|
||||
await screen.goBackFromSomePage();
|
||||
}
|
||||
|
||||
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
|
||||
|
||||
it("loaded players details and navigate parent frame and go back", async () => {
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name); // wait for player
|
||||
await screen.loadedElement(playerTwo.description);
|
||||
}
|
||||
|
||||
await shared[`testSomePageNavigated${transition}`](screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(somePage); // wait for some page
|
||||
await screen.loadedSomePage();
|
||||
}
|
||||
|
||||
|
||||
if (driver.isAndroid) {
|
||||
await driver.navBack(); // some page back navigation
|
||||
} else {
|
||||
await screen.goBackFromSomePage();
|
||||
await screen.goBackFromSomePage();
|
||||
}
|
||||
|
||||
await screen.loadedPlayerDetails(playerTwo);
|
||||
await screen.loadedTeamsList(); // assert visible & no changes
|
||||
|
||||
|
||||
await screen.goBackToPlayersList();
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
|
||||
|
||||
it("loaded frame root with multi nested frames again", async () => {
|
||||
await screen.loadedPageWithMultiFrame();
|
||||
});
|
||||
|
||||
|
||||
it("loaded players list", async () => {
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
|
||||
|
||||
it("loaded teams list", async () => {
|
||||
await screen.loadedTeamsList();
|
||||
});
|
||||
|
||||
it ("mix player and team list actions and go back", async () => {
|
||||
|
||||
it("mix player and team list actions and go back", async () => {
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name); // wait for player
|
||||
await screen.loadedElement(playerTwo.name);
|
||||
}
|
||||
|
||||
|
||||
await shared[`testSomePageNavigated${transition}`](screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(somePage); // wait for some page
|
||||
await screen.loadedSomePage();
|
||||
}
|
||||
|
||||
|
||||
if (driver.isAndroid) {
|
||||
await driver.navBack(); // some page back navigation
|
||||
} else {
|
||||
@ -237,26 +250,26 @@ describe("frame-root:", () => {
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(teamOne.name); // wait for teams list
|
||||
await screen.loadedElement(teamOne.name);
|
||||
}
|
||||
|
||||
await screen.loadedPlayerDetails(playerTwo); // assert no changes after back navigation
|
||||
await screen.loadedTeamsList(); // assert no changes after back navigation
|
||||
|
||||
|
||||
await shared.testTeamNavigated(teamTwo, screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(teamTwo.name); // wait for team
|
||||
await screen.loadedElement(teamTwo.name);
|
||||
}
|
||||
|
||||
await shared[`testSomePageNavigated${transition}`](screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(somePage); // wait for some page
|
||||
await screen.loadedSomePage();
|
||||
}
|
||||
|
||||
|
||||
if (driver.isAndroid) {
|
||||
await driver.navBack(); // some page back navigation
|
||||
} else {
|
||||
@ -265,15 +278,15 @@ describe("frame-root:", () => {
|
||||
|
||||
await screen.loadedPlayerDetails(playerTwo); // assert no changes after back navigation
|
||||
await screen.loadedTeamDetails(teamTwo);
|
||||
|
||||
|
||||
await screen.goBackToPlayersList();
|
||||
await screen.loadedPlayersList();
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerOne.name); // wait for players list
|
||||
await screen.loadedElement(playerOne.name); // wait for players list
|
||||
}
|
||||
|
||||
|
||||
await screen.goBackToTeamsList();
|
||||
await screen.loadedTeamsList();
|
||||
});
|
||||
@ -283,5 +296,5 @@ describe("frame-root:", () => {
|
||||
await screen.loadedHome();
|
||||
});
|
||||
});
|
||||
});
|
||||
};
|
||||
});
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { AppiumDriver, createDriver } from "nativescript-dev-appium";
|
||||
import { AppiumDriver, createDriver, logWarn } from "nativescript-dev-appium";
|
||||
|
||||
import { Screen, playersData, somePage, teamsData, driverDefaultWaitTime } from "./screen";
|
||||
import { Screen, playersData, somePage, teamsData, driverDefaultWaitTime, Item } from "./screen";
|
||||
import * as shared from "./shared.e2e-spec";
|
||||
import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
|
||||
|
||||
@ -16,6 +16,7 @@ describe("frame-tab-root:", () => {
|
||||
let screen: Screen;
|
||||
|
||||
before(async () => {
|
||||
logWarn("====== frame-tab-root ========")
|
||||
driver = await createDriver();
|
||||
screen = new Screen(driver);
|
||||
if (dontKeepActivities) {
|
||||
@ -39,19 +40,32 @@ describe("frame-tab-root:", () => {
|
||||
}
|
||||
});
|
||||
|
||||
roots.forEach(root => {
|
||||
for (let index = 0; index < roots.length; index++) {
|
||||
const root = roots[index];
|
||||
const rootWithHyphen = hyphenate(root);
|
||||
|
||||
describe(`${rootWithHyphen} scenarios:`, () => {
|
||||
logWarn(`===== Root: ${root}`);
|
||||
for (let trIndex = 0; trIndex < transitions.length; trIndex++) {
|
||||
const transition = transitions[trIndex];
|
||||
const playerOne: Item = playersData[`playerOne${transition}`];
|
||||
const playerTwo: Item = playersData[`playerTwo${transition}`];
|
||||
const teamOne: Item = teamsData[`teamOne${transition}`];
|
||||
const teamTwo: Item = teamsData[`teamTwo${transition}`];
|
||||
|
||||
transitions.forEach(transition => {
|
||||
const playerOne = playersData[`playerOne${transition}`];
|
||||
const playerTwo = playersData[`playerTwo${transition}`];
|
||||
const teamOne = teamsData[`teamOne${transition}`];
|
||||
const teamTwo = teamsData[`teamTwo${transition}`];
|
||||
|
||||
describe(`transition: ${transition} scenarios:`, () => {
|
||||
|
||||
before(async function () {
|
||||
logWarn(`========= ${root}-${transition} =========`);
|
||||
|
||||
if (transition === "Flip" &&
|
||||
driver.isAndroid && parseInt(driver.platformVersion) === 19) {
|
||||
// TODO: known issue https://github.com/NativeScript/NativeScript/issues/6798
|
||||
console.log("skipping flip transition tests on api level 19");
|
||||
this.skip();
|
||||
}
|
||||
});
|
||||
|
||||
it("loaded home page", async () => {
|
||||
await screen.loadedHome();
|
||||
});
|
||||
@ -64,13 +78,13 @@ describe("frame-tab-root:", () => {
|
||||
it("loaded players list", async () => {
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
|
||||
|
||||
it("loaded player details and go back twice", async () => {
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name) // wait for player
|
||||
await screen.loadedElement(playerTwo.name) // wait for player
|
||||
}
|
||||
|
||||
await shared.testPlayerNavigatedBack(screen, driver);
|
||||
@ -79,19 +93,19 @@ describe("frame-tab-root:", () => {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerOne.name) // wait for players list
|
||||
}
|
||||
|
||||
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
await shared.testPlayerNavigatedBack(screen, driver);
|
||||
});
|
||||
|
||||
|
||||
it("navigate parent frame and go back", async () => {
|
||||
await shared[`testSomePageNavigated${transition}`](screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(somePage) // wait for some page
|
||||
await screen.loadedElement(somePage) // wait for some page
|
||||
}
|
||||
|
||||
|
||||
if (driver.isAndroid) {
|
||||
await driver.navBack();
|
||||
} else {
|
||||
@ -100,22 +114,22 @@ describe("frame-tab-root:", () => {
|
||||
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
|
||||
|
||||
it("loaded player details and navigate parent frame and go back", async () => {
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name); // wait for player
|
||||
await screen.loadedElement(playerTwo.name); // wait for player
|
||||
}
|
||||
|
||||
await shared[`testSomePageNavigated${transition}`](screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(somePage); // wait for some page
|
||||
await screen.loadedElement(somePage); // wait for some page
|
||||
}
|
||||
|
||||
|
||||
if (driver.isAndroid) {
|
||||
await driver.navBack();
|
||||
} else {
|
||||
@ -123,7 +137,7 @@ describe("frame-tab-root:", () => {
|
||||
}
|
||||
|
||||
await screen.loadedPlayerDetails(playerTwo);
|
||||
|
||||
|
||||
await screen.goBackToPlayersList();
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
@ -133,7 +147,7 @@ describe("frame-tab-root:", () => {
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(teamOne.name); // wait for team
|
||||
await screen.loadedElement(teamOne.name); // wait for team
|
||||
}
|
||||
});
|
||||
|
||||
@ -146,7 +160,7 @@ describe("frame-tab-root:", () => {
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerOne.name); // wait for players list
|
||||
await screen.loadedElement(playerOne.name); // wait for players list
|
||||
}
|
||||
|
||||
await screen.loadedPlayersList();
|
||||
@ -155,14 +169,16 @@ describe("frame-tab-root:", () => {
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name); // wait for player
|
||||
await screen.loadedElement(playerTwo.name); // wait for player
|
||||
}
|
||||
|
||||
await screen.loadedPlayerDetails(playerTwo);
|
||||
|
||||
await shared[`testSomePageNavigated${transition}`](screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(somePage); // wait for some page
|
||||
await screen.loadedElement(somePage); // wait for some page
|
||||
}
|
||||
|
||||
if (driver.isAndroid) {
|
||||
@ -172,8 +188,10 @@ describe("frame-tab-root:", () => {
|
||||
}
|
||||
|
||||
if (appSuspendResume) {
|
||||
// This sleeps prevent test to fail
|
||||
await driver.sleep(1000);
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name); // wait for player
|
||||
await screen.loadedElement(playerTwo.name); // wait for player
|
||||
}
|
||||
|
||||
await screen.loadedPlayerDetails(playerTwo);
|
||||
@ -182,7 +200,7 @@ describe("frame-tab-root:", () => {
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(teamOne.name); // wait for teams list
|
||||
await screen.loadedElement(teamOne.name); // wait for teams list
|
||||
}
|
||||
|
||||
await screen.loadedTeamsList();
|
||||
@ -190,15 +208,18 @@ describe("frame-tab-root:", () => {
|
||||
await shared.testTeamNavigated(teamTwo, screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await screen.loadedElement(teamTwo.name); // wait for team
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(teamTwo.name); // wait for team
|
||||
await screen.loadedElement(teamTwo.name); // wait for team
|
||||
}
|
||||
|
||||
await screen.loadedTeamDetails(teamTwo);
|
||||
|
||||
await shared[`testSomePageNavigated${transition}`](screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(somePage); // wait for some page
|
||||
await screen.loadedElement(somePage); // wait for some page
|
||||
}
|
||||
|
||||
if (driver.isAndroid) {
|
||||
@ -208,8 +229,9 @@ describe("frame-tab-root:", () => {
|
||||
}
|
||||
|
||||
if (appSuspendResume) {
|
||||
await screen.loadedElement(teamTwo.name); // wait for team
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(teamTwo.name); // wait for team
|
||||
await screen.loadedElement(teamTwo.name); // wait for team
|
||||
}
|
||||
|
||||
await screen.loadedTeamDetails(teamTwo);
|
||||
@ -218,7 +240,7 @@ describe("frame-tab-root:", () => {
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name); // wait for player
|
||||
await screen.loadedElement(playerTwo.name); // wait for player
|
||||
}
|
||||
|
||||
await screen.loadedPlayerDetails(playerTwo);
|
||||
@ -229,7 +251,7 @@ describe("frame-tab-root:", () => {
|
||||
await screen.loadedTeamsList();
|
||||
|
||||
await screen.togglePlayersTab();
|
||||
|
||||
|
||||
await screen.goBackToPlayersList();
|
||||
await screen.loadedPlayersList();
|
||||
});
|
||||
@ -239,7 +261,7 @@ describe("frame-tab-root:", () => {
|
||||
await screen.loadedHome();
|
||||
});
|
||||
});
|
||||
});
|
||||
};
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
@ -39,6 +39,15 @@ describe("layout-root:", () => {
|
||||
|
||||
describe(`transition: ${transition} scenarios:`, () => {
|
||||
|
||||
before(async function () {
|
||||
if (transition === "Flip" &&
|
||||
driver.isAndroid && parseInt(driver.platformVersion) === 19) {
|
||||
// TODO: known issue https://github.com/NativeScript/NativeScript/issues/6798
|
||||
console.log("skipping flip transition tests on api level 19");
|
||||
this.skip();
|
||||
}
|
||||
});
|
||||
|
||||
it("loaded home page", async () => {
|
||||
await screen.loadedHome();
|
||||
});
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { AppiumDriver } from "nativescript-dev-appium";
|
||||
import { AppiumDriver, logInfo } from "nativescript-dev-appium";
|
||||
import { assert } from "chai";
|
||||
|
||||
const layoutWithFrame = "Layout w/ frame";
|
||||
@ -215,6 +215,8 @@ export class Screen {
|
||||
|
||||
resetToHome = async () => {
|
||||
const btnReset = await this._driver.waitForElement(resetApp);
|
||||
|
||||
console.info(`====== Reset home "${resetApp}"`)
|
||||
await btnReset.tap();
|
||||
};
|
||||
|
||||
@ -248,11 +250,13 @@ export class Screen {
|
||||
|
||||
togglePlayersTab = async () => {
|
||||
const lblPlayers = await this._driver.waitForElement(players);
|
||||
logInfo(`====== Navigate to "${players}"`);
|
||||
await lblPlayers.tap();
|
||||
}
|
||||
|
||||
toggleTeamsTab = async () => {
|
||||
const lblTeams = await this._driver.waitForElement(teams);
|
||||
logInfo(`====== Navigate to "${teams}"`);
|
||||
await lblTeams.tap();
|
||||
}
|
||||
|
||||
@ -293,7 +297,7 @@ export class Screen {
|
||||
|
||||
loadedTabBottomRootWithFrames = async () => {
|
||||
await this.loadedPage(tabRootBottomHome);
|
||||
}
|
||||
}
|
||||
|
||||
loadedSomePage = async () => {
|
||||
await this.loadedPage(somePage);
|
||||
@ -323,8 +327,15 @@ export class Screen {
|
||||
await this.loadedItem(team);
|
||||
}
|
||||
|
||||
loadedElement = async (element: string) => {
|
||||
const el = await this._driver.waitForElement(element);
|
||||
assert.isNotNull(el);
|
||||
console.log(`${element} loaded!`);
|
||||
};
|
||||
|
||||
private navigateToPage = async (page: string) => {
|
||||
const btnPage = await this._driver.waitForElement(page);
|
||||
logInfo(`====== Navigate to "${page}"`);
|
||||
await btnPage.tap();
|
||||
};
|
||||
|
||||
@ -336,6 +347,7 @@ export class Screen {
|
||||
|
||||
private navigateToItem = async (item: Item) => {
|
||||
const lblItem = await this._driver.waitForElement(item.name);
|
||||
logInfo(`====== Navigate to "${item.name}"`);
|
||||
await lblItem.tap();
|
||||
}
|
||||
|
||||
@ -351,6 +363,7 @@ export class Screen {
|
||||
|
||||
private goBack = async (accessibilityId: string) => {
|
||||
const btnBack = await this._driver.waitForElement(accessibilityId);
|
||||
logInfo(`====== Go back with "${accessibilityId}"`);
|
||||
await btnBack.tap();
|
||||
}
|
||||
}
|
@ -52,6 +52,15 @@ describe("tab-root:", () => {
|
||||
|
||||
describe(`transition: ${transition} scenarios:`, () => {
|
||||
|
||||
before(async function () {
|
||||
if (transition === "Flip" &&
|
||||
driver.isAndroid && parseInt(driver.platformVersion) === 19) {
|
||||
// TODO: known issue https://github.com/NativeScript/NativeScript/issues/6798
|
||||
console.log("skipping flip transition tests on api level 19");
|
||||
this.skip();
|
||||
}
|
||||
});
|
||||
|
||||
it("loaded home page", async () => {
|
||||
await screen.loadedHome();
|
||||
});
|
||||
@ -109,16 +118,21 @@ describe("tab-root:", () => {
|
||||
|
||||
await shared.testPlayerNavigated(playerTwo, screen);
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name) // wait for player
|
||||
if (driver.isIOS) {
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(playerTwo.name) // wait for player
|
||||
}
|
||||
}
|
||||
|
||||
await screen.toggleTeamsTab();
|
||||
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(teamOne.name) // wait for teams list
|
||||
if (driver.isIOS) {
|
||||
// TODO: run in background from appium breaks the test. Investigate the issue, once with the app and with appium
|
||||
if (appSuspendResume) {
|
||||
await driver.backgroundApp(suspendTime);
|
||||
await driver.waitForElement(teamOne.name) // wait for teams list
|
||||
}
|
||||
}
|
||||
|
||||
await screen.loadedTeamsList();
|
||||
|
Reference in New Issue
Block a user