diff --git a/e2e/nested-frame-navigation/e2e/frame-root.e2e-spec.ts b/e2e/nested-frame-navigation/e2e/frame-root.e2e-spec.ts index 62190e934..8d400e30a 100644 --- a/e2e/nested-frame-navigation/e2e/frame-root.e2e-spec.ts +++ b/e2e/nested-frame-navigation/e2e/frame-root.e2e-spec.ts @@ -1,10 +1,11 @@ import { AppiumDriver, createDriver, logWarn } from "nativescript-dev-appium"; -import { Screen, playersData, home, somePage, teamsData, driverDefaultWaitTime, Item } from "./screen"; -import * as shared from "./shared.e2e-spec"; +import { Screen, playersData, teamsData, driverDefaultWaitTime, Item } from "./screen"; import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config"; +import * as shared from "./shared.e2e-spec"; -describe("frame-root:", () => { +const rootType = "frame-root"; +describe(rootType, () => { let driver: AppiumDriver; let screen: Screen; @@ -40,7 +41,7 @@ describe("frame-root:", () => { const teamOne: Item = teamsData[`teamOne${transition}`]; const teamTwo: Item = teamsData[`teamTwo${transition}`]; - describe(`transition: ${transition} scenarios:`, () => { + describe(`${rootType}-transition-${transition}-scenarios:`, () => { before(async function () { logWarn(`==== Transition ${transition}`); diff --git a/e2e/nested-frame-navigation/e2e/frame-tab-root.e2e-spec.ts b/e2e/nested-frame-navigation/e2e/frame-tab-root.e2e-spec.ts index 33b9efcfa..a2ab21dbe 100644 --- a/e2e/nested-frame-navigation/e2e/frame-tab-root.e2e-spec.ts +++ b/e2e/nested-frame-navigation/e2e/frame-tab-root.e2e-spec.ts @@ -7,16 +7,13 @@ import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from " // NOTE: TabTop is Android only scenario (for iOS we will essentially execute 2x TabBottom) const roots = ["TabTop", "TabBottom"]; -function hyphenate(s: string) { - return s.replace(/([a-zA-Z])(?=[A-Z])/g, "$1-").toLowerCase(); -} - -describe("frame-tab-root:", () => { +const rootType = "frame-tab-root"; +describe(rootType, () => { let driver: AppiumDriver; let screen: Screen; before(async () => { - logWarn("====== frame-tab-root ========") + logWarn(`====== ${rootType} ========`); driver = await createDriver(); screen = new Screen(driver); if (dontKeepActivities) { @@ -42,9 +39,8 @@ describe("frame-tab-root:", () => { for (let index = 0; index < roots.length; index++) { const root = roots[index]; - const rootWithHyphen = hyphenate(root); - describe(`${rootWithHyphen} scenarios:`, () => { + describe(`${rootType}-${root} scenarios:`, () => { logWarn(`===== Root: ${root}`); for (let trIndex = 0; trIndex < transitions.length; trIndex++) { const transition = transitions[trIndex]; @@ -53,7 +49,7 @@ describe("frame-tab-root:", () => { const teamOne: Item = teamsData[`teamOne${transition}`]; const teamTwo: Item = teamsData[`teamTwo${transition}`]; - describe(`transition: ${transition} scenarios:`, () => { + describe(`${rootType}-${root}-transition-${transition}-scenarios:`, () => { before(async function () { logWarn(`========= ${root}-${transition} =========`); @@ -70,7 +66,7 @@ describe("frame-tab-root:", () => { await screen.loadedHome(); }); - it(`loaded frame ${rootWithHyphen} root with nested frames`, async () => { + it(`loaded frame ${root} root with nested frames`, async () => { await screen[`navigateToPage${root}WithFrames`](); await screen[`loadedPage${root}WithFrames`](); }); diff --git a/e2e/nested-frame-navigation/e2e/layout-root.e2e-spec.ts b/e2e/nested-frame-navigation/e2e/layout-root.e2e-spec.ts index 86d8d3ac1..15623e4e1 100644 --- a/e2e/nested-frame-navigation/e2e/layout-root.e2e-spec.ts +++ b/e2e/nested-frame-navigation/e2e/layout-root.e2e-spec.ts @@ -1,16 +1,18 @@ -import { AppiumDriver, createDriver } from "nativescript-dev-appium"; +import { AppiumDriver, createDriver, logWarn } from "nativescript-dev-appium"; import { Screen, playersData, home, somePage, otherPage, teamsData, driverDefaultWaitTime } from "./screen"; import * as shared from "./shared.e2e-spec"; import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config"; -describe("layout-root:", () => { +const rootType = "layout-root"; +describe(rootType, () => { let driver: AppiumDriver; let screen: Screen; before(async () => { driver = await createDriver(); screen = new Screen(driver); + logWarn("====== layout-root ========") if (dontKeepActivities) { await driver.setDontKeepActivities(true); } @@ -32,12 +34,14 @@ describe("layout-root:", () => { } }); - transitions.forEach(transition => { + for (let index = 0; index < transitions.length; index++) { + const transition = transitions[index]; + const playerOne = playersData[`playerOne${transition}`]; const playerTwo = playersData[`playerTwo${transition}`]; const teamOne = teamsData[`teamOne${transition}`]; - describe(`transition: ${transition} scenarios:`, () => { + describe(`${rootType}-transition-${transition}-scenarios:`, () => { before(async function () { if (transition === "Flip" && @@ -300,9 +304,9 @@ describe("layout-root:", () => { await screen.loadedHome(); }); }); - }); + }; - describe("players list slide transition with parent frame default transition:", () => { + describe(`${rootType}-players-list-slide-transition with parent frame default transition:`, () => { const playerOne = playersData["playerOneSlide"]; const playerTwo = playersData["playerTwoSlide"]; @@ -361,7 +365,7 @@ describe("layout-root:", () => { }); }); - describe("players list slide transition with parent frame no transition:", () => { + describe(`${rootType}-players-list-slide-transition with parent frame no transition:`, () => { const playerOne = playersData["playerOneSlide"]; const playerTwo = playersData["playerTwoSlide"]; @@ -420,7 +424,7 @@ describe("layout-root:", () => { }); }); - describe("players list flip transition with parent frame default transition:", () => { + describe(`${rootType}-players-list-flip-transition with parent frame default transition:`, () => { const playerOne = playersData["playerOneFlip"]; const playerTwo = playersData["playerTwoFlip"]; @@ -479,7 +483,7 @@ describe("layout-root:", () => { }); }); - describe("players list flip transition with parent frame no transition:", () => { + describe(`${rootType}-players-list-flip-transition with parent frame no transition:`, () => { const playerOne = playersData["playerOneFlip"]; const playerTwo = playersData["playerTwoFlip"]; diff --git a/e2e/nested-frame-navigation/e2e/tab-root.e2e-spec.ts b/e2e/nested-frame-navigation/e2e/tab-root.e2e-spec.ts index 0ed9cc4d8..87f935703 100644 --- a/e2e/nested-frame-navigation/e2e/tab-root.e2e-spec.ts +++ b/e2e/nested-frame-navigation/e2e/tab-root.e2e-spec.ts @@ -1,4 +1,4 @@ -import { AppiumDriver, createDriver } from "nativescript-dev-appium"; +import { AppiumDriver, createDriver, logWarn } from "nativescript-dev-appium"; import { Screen, playersData, teamsData } from "./screen"; import * as shared from "./shared.e2e-spec"; @@ -7,15 +7,13 @@ import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from " // NOTE: TabTop is Android only scenario (for iOS we will essentially execute 2x TabBottom) const roots = ["TabTop", "TabBottom"]; -function hyphenate(s: string) { - return s.replace(/([a-zA-Z])(?=[A-Z])/g, "$1-").toLowerCase(); -} - -describe("tab-root:", () => { +const rootType = "tab-root"; +describe(rootType, () => { let driver: AppiumDriver; let screen: Screen; before(async () => { + logWarn(`====== ${rootType} ========`) driver = await createDriver(); screen = new Screen(driver); if (dontKeepActivities) { @@ -39,18 +37,19 @@ describe("tab-root:", () => { } }); - roots.forEach(root => { - const rootWithHyphen = hyphenate(root); + for (let index = 0; index < roots.length; index++) { + const root = roots[index]; + describe(`${rootType}-${root}-scenarios:`, () => { - describe(`${rootWithHyphen} scenarios:`, () => { + for (let index = 0; index < transitions.length; index++) { + const transition = transitions[index]; - 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:`, () => { + describe(`${rootType}-${root}-transition-${transition}-scenarios:`, () => { before(async function () { if (transition === "Flip" && @@ -65,7 +64,7 @@ describe("tab-root:", () => { await screen.loadedHome(); }); - it(`loaded ${rootWithHyphen} root with frames`, async () => { + it(`loaded ${root} root with frames`, async () => { await screen[`navigateTo${root}RootWithFrames`](); await screen[`loaded${root}RootWithFrames`](); }); @@ -169,7 +168,7 @@ describe("tab-root:", () => { await screen.loadedHome(); }); }); - }); + }; }); - }); + } });