tests: add e2e tests in single-page app

Author: ADjenkov

e2e/single-page/app/app.css

@@ -1,5 +1,5 @@
 .title {
-    font-size: 30;
+    font-size: 15;
     margin: 16;
 }
 

e2e/single-page/app/app.module.ts

@@ -11,14 +11,19 @@ import { AppComponent } from "./app.component";
 
 import { rendererTraceCategory, viewUtilCategory, routeReuseStrategyTraceCategory, routerTraceCategory } from "nativescript-angular/trace";
 import { setCategories, enable } from "tns-core-modules/trace";
+import { ModalComponent } from "./second/modal/modal.component";
 setCategories(routerTraceCategory + "," + routeReuseStrategyTraceCategory);
 enable();
 
 @NgModule({
     declarations: [
         AppComponent,
+        ModalComponent,
         ...navigatableComponents,
     ],
+    entryComponents:[
+        ModalComponent
+    ],
     bootstrap: [AppComponent],
     providers: [
         { provide: NgModuleFactoryLoader, useClass: NSModuleFactoryLoader }

e2e/single-page/app/second/modal/modal.component.html

@@ -0,0 +1,4 @@
+<StackLayout>
+    <Label text="Welcome to modal"></Label>
+    <Button text="Close Modal" (tap)="close()"></Button>
+</StackLayout>

e2e/single-page/app/second/modal/modal.component.ts

@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import { ModalDialogParams } from "nativescript-angular/modal-dialog";
+
+@Component({
+    moduleId: module.id,
+    selector: 'modal',
+    templateUrl: './modal.component.html'
+})
+
+export class ModalComponent {
+
+    constructor(private params: ModalDialogParams) {
+    }
+
+    public close(result: string) {
+        this.params.closeCallback(result);
+    }
+
+}

e2e/single-page/app/second/second.component.ts

@@ -1,10 +1,12 @@
-import { Component, OnInit, OnDestroy } from "@angular/core";
+import { Component, OnInit, OnDestroy, ViewContainerRef } from "@angular/core";
 import { ActivatedRoute, Router, Route } from "@angular/router";
 
+import { ModalDialogService, ModalDialogOptions } from "nativescript-angular";
 import { Page } from "tns-core-modules/ui/page";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
 import { RouterExtensions } from "nativescript-angular/router";
+import { ModalComponent } from "./modal/modal.component";
 
 @Component({
     selector: "second",
@@ -19,12 +21,16 @@ import { RouterExtensions } from "nativescript-angular/router";
 
     <StackLayout>
         <Label [text]="'Second Component: ' + (id$ | async)" class="title"></Label>
+        <Button text="Show Modal" (tap)="onShowModal()"></Button>
         <Button text="Back" (tap)="back()"></Button>
     </StackLayout>`
 })
 export class SecondComponent implements OnInit, OnDestroy {
     public id$: Observable<number>;
-    constructor(route: ActivatedRoute, private routerExtensions: RouterExtensions) {
+    constructor(route: ActivatedRoute,
+        private routerExtensions: RouterExtensions,
+        private viewContainerRef: ViewContainerRef,
+        private modalService: ModalDialogService) {
         this.id$ = route.params.pipe(map(r => +r["id"]));
     }
 
@@ -39,4 +45,16 @@ export class SecondComponent implements OnInit, OnDestroy {
     back() {
         this.routerExtensions.back();
     }
+
+    onShowModal() {
+        let options: ModalDialogOptions = {
+            viewContainerRef: this.viewContainerRef,
+            context: {
+            },
+            fullscreen: true
+        };
+
+        this.modalService.showModal(ModalComponent, options).then((dialogResult: string) => {
+        });
+    }
 }

e2e/single-page/e2e/tests.e2e-spec.ts

@@ -19,29 +19,45 @@ describe("Single page app", () => {
     });
 
     it("should load second(1) page", async () => {
-        await findAndClick(driver, "SECOND(1)")
+        await findAndClick(driver, "SECOND(1)");
 
         await driver.findElementByAutomationText("Second Component: 1");
-        
+
         // ActionBar Title and item
         await driver.findElementByAutomationText("Second Title");
         await driver.findElementByAutomationText("ACTION2");
     });
 
     it("should load second(2) page", async () => {
-        await findAndClick(driver, "SECOND(2)")
+        await findAndClick(driver, "SECOND(2)");
+
+        await driver.findElementByAutomationText("Second Component: 2");
 
-        await driver.findElementByAutomationText("Second Component: 1");
-        
         // ActionBar Title and items
         await driver.findElementByAutomationText("Second Title");
         await driver.findElementByAutomationText("ACTION2");
         await driver.findElementByAutomationText("ADD");
     });
+
+    it("should open and close modal view", async () => {
+        await findAndClick(driver, "Show Modal");
+
+        await driver.findElementByAutomationText("Welcome to modal");
+        await findAndClick(driver, "Close Modal");
+
+        await driver.findElementByAutomationText("Second Component: 2");
+    });
+
+    it("should go back to second(1) and first", async () => {
+        await findAndClick(driver, "Back");
+        await driver.findElementByAutomationText("Second Component: 1");
+        await findAndClick(driver, "Back");
+        await driver.findElementByAutomationText("First Title");
+        await driver.findElementByAutomationText("ACTION1");
+    });
 });
 
 async function findAndClick(driver: AppiumDriver, text: string) {
-    const navigationButton =
-        await driver.findElementByAutomationText(text);
-    navigationButton.click();
+    const navigationButton = await driver.findElementByAutomationText(text);
+    await navigationButton.click();
 }