From 091545e8c5f99abb5ffcee00ba5702ffc418a0bf Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 23 Jan 2017 14:08:28 -0500
Subject: [PATCH] chore(e2e): update tests to remove component name strings

---
 scripts/gulp/util.ts                             |  4 +---
 src/components/nav/test/basic/app.module.ts      |  5 +++--
 src/components/tabs/test/advanced/app.module.ts  | 14 ++++++++++++--
 src/components/tabs/test/advanced/signIn.html    |  4 ++--
 src/components/tabs/test/advanced/tab1page1.html |  2 +-
 src/components/tabs/test/advanced/tab1page2.html |  2 +-
 src/components/tabs/test/advanced/tab2page1.html |  2 +-
 src/components/tabs/test/advanced/tab2page2.html |  2 +-
 src/components/tabs/test/advanced/tabs.html      |  6 +++---
 9 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/scripts/gulp/util.ts b/scripts/gulp/util.ts
index ccea6371f0d..dc232339958 100644
--- a/scripts/gulp/util.ts
+++ b/scripts/gulp/util.ts
@@ -183,9 +183,7 @@ export function runAppScripts(folderInfo: any, sassConfigPath: string, appEntryP
   let tsConfig = distDir + 'tsconfig.json';
   let scriptArgs = [
     'build',
-    '--aot',
-    '--minifyCss',
-    '--optimizeJs',
+    '--prod',
     '--sass', sassConfigPath,
     '--appEntryPoint', appEntryPoint,
     '--srcDir', distDir,
diff --git a/src/components/nav/test/basic/app.module.ts b/src/components/nav/test/basic/app.module.ts
index 78506e7c87d..6be4286c51f 100644
--- a/src/components/nav/test/basic/app.module.ts
+++ b/src/components/nav/test/basic/app.module.ts
@@ -62,9 +62,9 @@ export class MyCmpTest {
           <ion-label>Text Input</ion-label>
           <ion-textarea></ion-textarea>
         </ion-item>
-        <button ion-item navPush="FullPage">Push FullPage w/ navPush="FullPage"</button>
+        <button ion-item [navPush]="pushPage">Push FullPage w/ [navPush]="pushPage"</button>
         <button ion-item [navPush]="pushPage" [navParams]="{id:40}">Push w/ [navPush] and [navParams]</button>
-        <button ion-item [navPush]="'FirstPage'">Push w/ [navPush] and string view name</button>
+        <button ion-item [navPush]="firstPage">Push w/ [navPush] and firstPage</button>
         <button ion-item (click)="setPages()">setPages() (Go to PrimaryHeaderPage)</button>
         <button ion-item (click)="setRoot()">setRoot(PrimaryHeaderPage) (Go to PrimaryHeaderPage)</button>
         <button ion-item (click)="pop()">Pop</button>
@@ -84,6 +84,7 @@ export class MyCmpTest {
 })
 export class FirstPage {
   pushPage = FullPage;
+  firstPage = FirstPage;
   title = 'First Page';
   pages: Array<number> = [];
   @ViewChild(Content) content: Content;
diff --git a/src/components/tabs/test/advanced/app.module.ts b/src/components/tabs/test/advanced/app.module.ts
index d2a696f3aa8..0efa801b5d7 100644
--- a/src/components/tabs/test/advanced/app.module.ts
+++ b/src/components/tabs/test/advanced/app.module.ts
@@ -1,12 +1,14 @@
 import { Component, NgModule, ViewChild } from '@angular/core';
-import { /*DeepLink,*/AlertController, DeepLinkConfig, IonicApp, IonicModule, App, NavController, NavParams, ModalController, ViewController, Tabs, Tab } from '../../../../../ionic-angular';
+import { AlertController, DeepLinkConfig, IonicApp, IonicModule, App, NavController, NavParams, ModalController, ViewController, Tabs, Tab } from '../../../../../ionic-angular';
 
 
 // @DeepLink({ name: 'sign-in' })
 @Component({
   templateUrl: './signIn.html'
 })
-export class SignIn {}
+export class SignIn {
+  tabsPage = TabsPage;
+}
 
 
 @Component({
@@ -32,6 +34,9 @@ export class ChatPage {
 })
 export class TabsPage {
   showTab: boolean = false;
+  rootPage1 = Tab1Page1;
+  rootPage2 = Tab2Page1;
+  rootPage3 = Tab3Page1;
 
   @ViewChild(Tabs) tabs: Tabs;
 
@@ -125,6 +130,7 @@ export class TabsPage {
   templateUrl: './tab1page1.html'
 })
 export class Tab1Page1 {
+  tab1Page2 = Tab1Page2;
   color: boolean;
   userId: string;
 
@@ -176,6 +182,8 @@ export class Tab1Page1 {
   templateUrl: './tab1page2.html'
 })
 export class Tab1Page2 {
+  tab1Page3 = Tab1Page3;
+
   constructor(public tabs: Tabs) { }
 
   favoritesTab() {
@@ -243,6 +251,7 @@ export class Tab1Page3 {
   templateUrl: './tab2page1.html'
 })
 export class Tab2Page1 {
+  tab2Page2 = Tab2Page2;
 
   ionViewWillEnter() {
     console.log('Tab2Page1, ionViewWillEnter');
@@ -271,6 +280,7 @@ export class Tab2Page1 {
   templateUrl: './tab2page2.html'
 })
 export class Tab2Page2 {
+  tab2Page3 = Tab2Page3;
 
   ionViewWillEnter() {
     console.log('Tab2Page2, ionViewWillEnter');
diff --git a/src/components/tabs/test/advanced/signIn.html b/src/components/tabs/test/advanced/signIn.html
index da6b30fe58b..81f34fea5f0 100644
--- a/src/components/tabs/test/advanced/signIn.html
+++ b/src/components/tabs/test/advanced/signIn.html
@@ -19,12 +19,12 @@
       <ion-input type="password"></ion-input>
     </ion-item>
     <ion-item>
-      <a ion-button block navPush="TabsPage" class="e2eSignIn">Sign In</a>
+      <a ion-button block [navPush]="tabsPage" class="e2eSignIn">Sign In</a>
     </ion-item>
   </ion-card>
 
   <p style="text-align: center;">
-    <a navPush="TabsPage">View Tabs Page</a>
+    <a [navPush]="tabsPage">View Tabs Page</a>
   </p>
 
 </ion-content>
diff --git a/src/components/tabs/test/advanced/tab1page1.html b/src/components/tabs/test/advanced/tab1page1.html
index e48af4ddfcc..3897ae9f878 100644
--- a/src/components/tabs/test/advanced/tab1page1.html
+++ b/src/components/tabs/test/advanced/tab1page1.html
@@ -9,7 +9,7 @@
 
 <ion-content padding>
 
-  <p><button ion-button class="e2eGoToTab1Page2" navPush="Tab1Page2">Go to Tab 1, Page 2</button></p>
+  <p><button ion-button class="e2eGoToTab1Page2" [navPush]="tab1Page2">Go to Tab 1, Page 2</button></p>
   <p><button ion-button (click)="logout()">Logout</button></p>
   <p><button ion-button (click)="favoritesTab()">Favorites Tab</button></p>
   <p><button ion-button (click)="goBack()">Go Back</button></p>
diff --git a/src/components/tabs/test/advanced/tab1page2.html b/src/components/tabs/test/advanced/tab1page2.html
index d6e68bc76d4..0fec6d96f1d 100644
--- a/src/components/tabs/test/advanced/tab1page2.html
+++ b/src/components/tabs/test/advanced/tab1page2.html
@@ -9,7 +9,7 @@
 
 <ion-content padding>
 
-  <p><button ion-button navPush="Tab1Page3">Go to Tab 1, Page 3</button></p>
+  <p><button ion-button [navPush]="tab1Page3">Go to Tab 1, Page 3</button></p>
   <p><button ion-button (click)="favoritesTab()">Favorites Tab</button></p>
   <p><button ion-button class="e2eBackToTab1Page1" navPop>Back to Tab 1, Page 1</button></p>
   <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
diff --git a/src/components/tabs/test/advanced/tab2page1.html b/src/components/tabs/test/advanced/tab2page1.html
index cd6d6d5e6b7..9136d07650c 100644
--- a/src/components/tabs/test/advanced/tab2page1.html
+++ b/src/components/tabs/test/advanced/tab2page1.html
@@ -9,7 +9,7 @@
 
 <ion-content padding>
 
-  <p><button ion-button navPush="Tab2Page2">Go to Tab 2, Page 2</button></p>
+  <p><button ion-button [navPush]="tab2Page2">Go to Tab 2, Page 2</button></p>
   <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
   <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
 
diff --git a/src/components/tabs/test/advanced/tab2page2.html b/src/components/tabs/test/advanced/tab2page2.html
index 97572b232f2..cd82893dc72 100644
--- a/src/components/tabs/test/advanced/tab2page2.html
+++ b/src/components/tabs/test/advanced/tab2page2.html
@@ -9,7 +9,7 @@
 
 <ion-content padding>
 
-  <p><button ion-button navPush="Tab2Page3">Go to Tab 2, Page 3 (no navbar)</button></p>
+  <p><button ion-button [navPush]="tab2Page3">Go to Tab 2, Page 3 (no navbar)</button></p>
   <p><button ion-button navPop>Back to Tab 2, Page 1</button></p>
   <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
   <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
diff --git a/src/components/tabs/test/advanced/tabs.html b/src/components/tabs/test/advanced/tabs.html
index 95ab12e88f0..9c3ba89d529 100644
--- a/src/components/tabs/test/advanced/tabs.html
+++ b/src/components/tabs/test/advanced/tabs.html
@@ -1,8 +1,8 @@
 
 <ion-tabs preloadTabs="false" (ionChange)="onTabChange($event)">
-  <ion-tab tabTitle="Recents" tabIcon="call" root="Tab1Page1" swipeBackEnabled="true"></ion-tab>
-  <ion-tab tabTitle="Favorites" tabIcon="star" root="Tab2Page1" tabsHideOnSubPages="false"></ion-tab>
-  <ion-tab tabTitle="Settings" tabIcon="settings" root="Tab3Page1"></ion-tab>
+  <ion-tab tabTitle="Recents" tabIcon="call" [root]="rootPage1" swipeBackEnabled="true"></ion-tab>
+  <ion-tab tabTitle="Favorites" tabIcon="star" [root]="rootPage2" tabsHideOnSubPages="false"></ion-tab>
+  <ion-tab tabTitle="Settings" tabIcon="settings" [root]="rootPage3"></ion-tab>
   <ion-tab tabTitle="Chat" tabIcon="chatbubbles" (ionSelect)="chat()" [show]="showTab"></ion-tab>
   <ion-tab tabTitle="Logout" tabIcon="exit" (ionSelect)="logout()"></ion-tab>
 </ion-tabs>