chore(unit-tests): modify unit tests to the new location strategy

ADjenkov · ADjenkov · commit df1bfbdfa078 · 2018-10-23T13:47:09.000+03:00
diff --git a/e2e/modal-navigation-ng/e2e/modal-frame.e2e-spec.ts b/e2e/modal-navigation-ng/e2e/modal-frame.e2e-spec.ts
@@ -33,8 +33,7 @@ describe("modal-frame:", () => {
 
             afterEach(async function () {
                 if (this.currentTest.state === "failed") {
-                    await driver.logPageSource(this.currentTest.title);
-                    await driver.logScreenshot(this.currentTest.title);
+                    await driver.logTestArtifacts(this.currentTest.title);
                     await driver.resetApp();
                     await screen[root]();
                 }
diff --git a/e2e/modal-navigation-ng/e2e/modal-layout.e2e-spec.ts b/e2e/modal-navigation-ng/e2e/modal-layout.e2e-spec.ts
@@ -33,8 +33,7 @@ describe("modal-layout:", () => {
 
             afterEach(async function () {
                 if (this.currentTest.state === "failed") {
-                    await driver.logPageSource(this.currentTest.title);
-                    await driver.logScreenshot(this.currentTest.title);
+                    await driver.logTestArtifacts(this.currentTest.title);
                     await driver.resetApp();
                     await screen[root]();
                 }
diff --git a/e2e/modal-navigation-ng/e2e/modal.shared.e2e-spec.ts b/e2e/modal-navigation-ng/e2e/modal.shared.e2e-spec.ts
@@ -18,8 +18,7 @@ describe("Shared modal from home and back", () => {
 
     afterEach(async function () {
         if (this.currentTest.state === "failed") {
-            await driver.logPageSource(this.currentTest.title);
-            await driver.logScreenshot(this.currentTest.title);
+            await driver.logTestArtifacts(this.currentTest.title);
         }
     });
 
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
@@ -31,7 +31,7 @@ describe("home-tabs:", () => {
 
             afterEach(async function () {
                 if (this.currentTest.state === "failed") {
-                    await driver.logScreenshot(this.currentTest.title);
+                    await driver.logTestArtifacts(this.currentTest.title);
                 }
             });
 
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
@@ -31,7 +31,7 @@ describe("split-view:", () => {
 
             afterEach(async function () {
                 if (this.currentTest.state === "failed") {
-                    await driver.logScreenshot(this.currentTest.title);
+                    await driver.logTestArtifacts(this.currentTest.title);
                 }
             });
 
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
@@ -26,7 +26,7 @@ describe("tab-view:", () => {
 
     afterEach(async function () {
         if (this.currentTest.state === "failed") {
-            await driver.logScreenshot(this.currentTest.title);
+            await driver.logTestArtifacts(this.currentTest.title);
         }
     });
 
diff --git a/e2e/router-tab-view/e2e/tab-view-navigation.e2e-spec.ts b/e2e/router-tab-view/e2e/tab-view-navigation.e2e-spec.ts
@@ -15,7 +15,7 @@ describe("TabView with page-router-outlet in each tab", () => {
 
     afterEach(async function () {
         if (this.currentTest.state === "failed") {
-            await driver.logScreenshot(this.currentTest.title);
+            await driver.logTestArtifacts(this.currentTest.title);
         }
     });
 
diff --git a/tests/app/tests/modal-dialog.ts b/tests/app/tests/modal-dialog.ts
@@ -9,7 +9,7 @@ import { device, isIOS } from "tns-core-modules/platform";
 
 import { ComponentFixture, async } from "@angular/core/testing";
 import { nsTestBedRender, nsTestBedAfterEach, nsTestBedBeforeEach } from "nativescript-angular/testing";
-import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
+import { NSLocationStrategy, Outlet } from "nativescript-angular/router/ns-location-strategy";
 import { FrameService } from "nativescript-angular";
 import { FakeFrameService } from "./ns-location-strategy";
 const CLOSE_WAIT = isIOS ? 1000 : 0;
@@ -47,7 +47,11 @@ export class FailComponent {
     </GridLayout>`
 })
 export class SuccessComponent {
-    constructor(public service: ModalDialogService, public vcRef: ViewContainerRef) {
+    constructor(
+        public service: ModalDialogService,
+        public vcRef: ViewContainerRef,
+        public locationStrategy: NSLocationStrategy,
+        public fakeFrameService: FrameService) {
     }
 }
 
@@ -88,6 +92,16 @@ describe("modal-dialog", () => {
         nsTestBedRender(SuccessComponent)
             .then((fixture: ComponentFixture<SuccessComponent>) => {
                 const service = <ModalDialogService>fixture.componentRef.instance.service;
+                const locStrategy = <NSLocationStrategy>fixture.componentRef.instance.locationStrategy;
+                const outlet = new Outlet("primary", "primary", 0);
+
+                let parentView = fixture.componentRef.instance.vcRef.element.nativeElement;
+                parentView = parentView.page && parentView.page.frame;
+                outlet.frame = parentView;
+                locStrategy.outlets.push(outlet);
+
+                locStrategy.pushState(null, "test", "/test", null);
+
                 const comp = <SuccessComponent>fixture.componentRef.instance;
                 return service.showModal(ModalComponent, { viewContainerRef: comp.vcRef });
             })
@@ -100,6 +114,16 @@ describe("modal-dialog", () => {
         nsTestBedRender(SuccessComponent)
             .then((fixture: ComponentFixture<SuccessComponent>) => {
                 const service = <ModalDialogService>fixture.componentRef.instance.service;
+                const locStrategy = <NSLocationStrategy>fixture.componentRef.instance.locationStrategy;
+                const outlet = new Outlet("primary", "primary", 0);
+
+                let parentView = fixture.componentRef.instance.vcRef.element.nativeElement;
+                parentView = parentView.page && parentView.page.frame;
+                outlet.frame = parentView;
+                locStrategy.outlets.push(outlet);
+
+                locStrategy.pushState(null, "test", "/test", null);
+
                 const comp = <SuccessComponent>fixture.componentRef.instance;
                 return service.showModal(ModalComponent, {
                     viewContainerRef: comp.vcRef,
diff --git a/tests/app/tests/ns-location-strategy.ts b/tests/app/tests/ns-location-strategy.ts

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ describe("modal-frame:", () => {`
`33`	`33`
`34`	`34`	`afterEach(async function () {`
`35`	`35`	`if (this.currentTest.state === "failed") {`
`36`		`- await driver.logPageSource(this.currentTest.title);`
`37`		`- await driver.logScreenshot(this.currentTest.title);`
	`36`	`+ await driver.logTestArtifacts(this.currentTest.title);`
`38`	`37`	`await driver.resetApp();`
`39`	`38`	`await screen[root]();`
`40`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ describe("modal-layout:", () => {`
`33`	`33`
`34`	`34`	`afterEach(async function () {`
`35`	`35`	`if (this.currentTest.state === "failed") {`
`36`		`- await driver.logPageSource(this.currentTest.title);`
`37`		`- await driver.logScreenshot(this.currentTest.title);`
	`36`	`+ await driver.logTestArtifacts(this.currentTest.title);`
`38`	`37`	`await driver.resetApp();`
`39`	`38`	`await screen[root]();`
`40`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@ describe("Shared modal from home and back", () => {`
`18`	`18`
`19`	`19`	`afterEach(async function () {`
`20`	`20`	`if (this.currentTest.state === "failed") {`
`21`		`- await driver.logPageSource(this.currentTest.title);`
`22`		`- await driver.logScreenshot(this.currentTest.title);`
	`21`	`+ await driver.logTestArtifacts(this.currentTest.title);`
`23`	`22`	`}`
`24`	`23`	`});`
`25`	`24`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ describe("home-tabs:", () => {`
`31`	`31`
`32`	`32`	`afterEach(async function () {`
`33`	`33`	`if (this.currentTest.state === "failed") {`
`34`		`- await driver.logScreenshot(this.currentTest.title);`
	`34`	`+ await driver.logTestArtifacts(this.currentTest.title);`
`35`	`35`	`}`
`36`	`36`	`});`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ describe("split-view:", () => {`
`31`	`31`
`32`	`32`	`afterEach(async function () {`
`33`	`33`	`if (this.currentTest.state === "failed") {`
`34`		`- await driver.logScreenshot(this.currentTest.title);`
	`34`	`+ await driver.logTestArtifacts(this.currentTest.title);`
`35`	`35`	`}`
`36`	`36`	`});`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ describe("tab-view:", () => {`
`26`	`26`
`27`	`27`	`afterEach(async function () {`
`28`	`28`	`if (this.currentTest.state === "failed") {`
`29`		`- await driver.logScreenshot(this.currentTest.title);`
	`29`	`+ await driver.logTestArtifacts(this.currentTest.title);`
`30`	`30`	`}`
`31`	`31`	`});`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ describe("TabView with page-router-outlet in each tab", () => {`
`15`	`15`
`16`	`16`	`afterEach(async function () {`
`17`	`17`	`if (this.currentTest.state === "failed") {`
`18`		`- await driver.logScreenshot(this.currentTest.title);`
	`18`	`+ await driver.logTestArtifacts(this.currentTest.title);`
`19`	`19`	`}`
`20`	`20`	`});`
`21`	`21`