test(location): add location strategy tests

Author: MartoYankov

Diff for: e2e/modal-navigation-ng/e2e/config/appium.capabilities.json

@@ -1,13 +1,11 @@
 <TabView androidTabsPosition="bottom">
     <page-router-outlet 
         *tabItem="{title: 'Players'}" 
-        name="playerTab" 
-        (activate)='onActivate(0)'>
+        name="playerTab">
     </page-router-outlet>
 
     <page-router-outlet
         *tabItem="{title: 'Teams'}" 
-        name="teamTab" 
-        (activate)='onActivate(1)'>
+        name="teamTab">
     </page-router-outlet>
 </TabView>

Diff for: e2e/modal-navigation-ng/e2e/config/mocha.opts

@@ -16,23 +16,11 @@ export class AppComponent {
 
     constructor(router: Router, location: NSLocationStrategy) {
         router.events.subscribe(e => {
-            // console.log("[ROUTER]: " + e.toString());
-
             if (e instanceof NavigationEnd) {
                 this.isInitialNavigation = false;
                 console.log("[ROUTER]: " + e.toString());
-                // console.log("[ROUTER] NAVIGATION END. Location history:");
-                location._getStates().forEach(state => {
-                    console.log(`[page: ${state.isPageNavigation}] ${state.url}`);
-                });
+                console.log(location.toString());
             }
         })
     }
-
-    onActivate(tabIndex: number) {
-        // if (!this.isInitialNavigation && this.tabView.selectedIndex !== tabIndex) {
-        //     console.log(`---> onActivate changing tabIndex from: ${this.tabView.selectedIndex} to: ${tabIndex}`);
-        //     this.tabView.selectedIndex = tabIndex;
-        // }
-    }
 }

Diff for: e2e/router-tab-view/app/app.component.html

@@ -19,7 +19,7 @@ describe("TabView with page-router-outlet in each tab", () => {
         }
     });
 
-    it("should find an tabs by text", async () => {
+    it("should find any tabs by text", async () => {
         await driver.findElementByText("Players", SearchOptions.exact);
         await driver.findElementByText("Teams", SearchOptions.exact);
         await driver.findElementByText("Player List", SearchOptions.exact);

Diff for: e2e/router-tab-view/app/app.component.ts

@@ -3,6 +3,7 @@ import { ActivatedRoute, Router, Route } from "@angular/router";
 
 import { Page } from "ui/page";
 import { Observable } from "rxjs/Observable";
+import { RouterExtensions } from "nativescript-angular/router";
 
 @Component({
     selector: "second",
@@ -17,11 +18,12 @@ import { Observable } from "rxjs/Observable";
 
     <StackLayout>
         <Label [text]="'Second Component: ' + (id$ | async)" class="title"></Label>
+        <Button text="Back" (tap)="back()"></Button>
     </StackLayout>`
 })
 export class SecondComponent implements OnInit, OnDestroy {
     public id$: Observable<number>;
-    constructor(route: ActivatedRoute) {
+    constructor(route: ActivatedRoute, private routerExtensions: RouterExtensions) {
         this.id$ = route.params.map(r => +r["id"]);
     }
 
@@ -32,4 +34,8 @@ export class SecondComponent implements OnInit, OnDestroy {
     ngOnDestroy() {
         console.log("SecondComponent - ngOnDestroy()");
     }
+
+    back() {
+        this.routerExtensions.back();
+    }
 }

Diff for: e2e/router-tab-view/e2e/config/appium.capabilities.json

@@ -124,7 +124,7 @@ export class ModalDialogService {
             const detachedProxy = <ProxyViewContainer>compRef.location.nativeElement;
 
             if (detachedProxy.getChildrenCount() > 1) {
-                throw new Error("Modal contet has more than one root view.");
+                throw new Error("Modal content has more than one root view.");
             }
             componentView = detachedProxy.getChildAt(0);