From f7880c9d5f84748c568daf22b0b61fbcf6c9f3a0 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 22 Jun 2016 15:52:51 -0400
Subject: [PATCH] test(e2e): fix e2e tests with missing ion-navs, hide border
 on toolbars

---
 .../show-hide-when/test/basic/index.ts        | 10 ++++++-
 src/components/spinner/test/basic/index.ts    | 10 ++++++-
 src/components/toolbar/test/colors/main.html  | 26 ++++++++---------
 .../toolbar/test/scenarios/main.html          | 28 +++++++++----------
 4 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/components/show-hide-when/test/basic/index.ts b/src/components/show-hide-when/test/basic/index.ts
index e9b68d4f20..c0c8c8ee25 100644
--- a/src/components/show-hide-when/test/basic/index.ts
+++ b/src/components/show-hide-when/test/basic/index.ts
@@ -6,7 +6,7 @@ import {ionicBootstrap} from '../../../../../src';
 @Component({
   templateUrl: 'main.html'
 })
-class E2EApp {
+class E2EPage {
   fruitsForm: ControlGroup;
   grapeDisabled = true;
   grapeChecked = true;
@@ -36,4 +36,12 @@ class E2EApp {
   }
 }
 
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+class E2EApp {
+  root = E2EPage;
+}
+
 ionicBootstrap(E2EApp);
diff --git a/src/components/spinner/test/basic/index.ts b/src/components/spinner/test/basic/index.ts
index 8715c84f1e..646b167657 100644
--- a/src/components/spinner/test/basic/index.ts
+++ b/src/components/spinner/test/basic/index.ts
@@ -5,7 +5,7 @@ import {ionicBootstrap} from '../../../../../src';
 @Component({
   templateUrl: 'main.html'
 })
-class E2EApp {
+class E2EPage {
   paused: boolean = false;
 
   toggleState() {
@@ -13,4 +13,12 @@ class E2EApp {
   }
 }
 
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+class E2EApp {
+  root = E2EPage;
+}
+
 ionicBootstrap(E2EApp);
diff --git a/src/components/toolbar/test/colors/main.html b/src/components/toolbar/test/colors/main.html
index 73adba1f52..6e8dfb43a7 100644
--- a/src/components/toolbar/test/colors/main.html
+++ b/src/components/toolbar/test/colors/main.html
@@ -1,10 +1,10 @@
 
 <ion-content>
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-title>This is the title that never ends. It just goes on and on my friend.</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <button menuToggle>
       <ion-icon name="menu"></ion-icon>
     </button>
@@ -24,7 +24,7 @@
     <ion-title>Default</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar primary>
+  <ion-toolbar no-border-top primary>
     <ion-buttons start>
       <button showWhen="ios">
         <ion-icon name="contact"></ion-icon>
@@ -41,7 +41,7 @@
     <ion-title>Primary</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar primary>
+  <ion-toolbar no-border-top primary>
     <ion-buttons start>
       <button cla showWhen="ios"ss="activated">
         <ion-icon name="contact"></ion-icon>
@@ -58,7 +58,7 @@
     <ion-title>Primary.activated</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar secondary>
+  <ion-toolbar no-border-top secondary>
     <ion-buttons start>
       <button solid>
         <ion-icon name="contact"></ion-icon>
@@ -77,7 +77,7 @@
     </ion-buttons>
   </ion-toolbar>
 
-  <ion-toolbar secondary>
+  <ion-toolbar no-border-top secondary>
     <ion-buttons start>
       <button solid class="activated">
         <ion-icon name="contact"></ion-icon>
@@ -96,7 +96,7 @@
     </ion-buttons>
   </ion-toolbar>
 
-  <ion-toolbar dark>
+  <ion-toolbar no-border-top dark>
     <ion-buttons start>
       <button outline>
         <ion-icon name="contact"></ion-icon>
@@ -114,7 +114,7 @@
     <ion-title>Dark</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar dark>
+  <ion-toolbar no-border-top dark>
     <ion-buttons start>
       <button outline class="activated">
         <ion-icon name="contact"></ion-icon>
@@ -132,7 +132,7 @@
     <ion-title>Dark.activated</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar danger>
+  <ion-toolbar no-border-top danger>
     <ion-buttons start>
       <button>
         <ion-icon name="contact"></ion-icon>
@@ -148,7 +148,7 @@
     <ion-title>Danger</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar danger>
+  <ion-toolbar no-border-top danger>
     <button menuToggle>
       <ion-icon name="menu"></ion-icon>
     </button>
@@ -160,7 +160,7 @@
     <ion-title>Danger</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar light>
+  <ion-toolbar no-border-top light>
     <ion-buttons start>
       <button>
         <ion-icon name="contact"></ion-icon>
@@ -176,7 +176,7 @@
     <ion-title>Light</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar light>
+  <ion-toolbar no-border-top light>
     <button menuToggle>
       <ion-icon name="menu"></ion-icon>
     </button>
@@ -188,7 +188,7 @@
     <ion-title>Light</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar transparent>
+  <ion-toolbar no-border-top transparent>
     <ion-buttons end>
       <button #button1 (click)="buttonClick(button1)">
         <ion-icon name="star"></ion-icon>
diff --git a/src/components/toolbar/test/scenarios/main.html b/src/components/toolbar/test/scenarios/main.html
index c1a75dea0c..0865c79263 100644
--- a/src/components/toolbar/test/scenarios/main.html
+++ b/src/components/toolbar/test/scenarios/main.html
@@ -1,10 +1,10 @@
 
 <ion-content>
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-title>This is the title that never ends. It just goes on and on my friend.</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons start>
       <button>
         <ion-icon name="contact"></ion-icon>
@@ -21,7 +21,7 @@
     <ion-title>This is a long title with buttons. It just goes on and on my friend.</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons start>
       <button>
         <ion-icon name="contact"></ion-icon>
@@ -38,7 +38,7 @@
     <ion-title>Defaults</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons start>
       <button class="activated">
         <ion-icon name="contact"></ion-icon>
@@ -55,7 +55,7 @@
     <ion-title>Defaults.activated</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons start>
       <button solid>
         <ion-icon name="contact"></ion-icon>
@@ -74,7 +74,7 @@
     </ion-buttons>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons start>
       <a button solid class="activated">
         <ion-icon name="contact"></ion-icon>
@@ -93,7 +93,7 @@
     </ion-buttons>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons start>
       <button outline>
         <ion-icon name="contact"></ion-icon>
@@ -111,7 +111,7 @@
     <ion-title>Outline</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons start>
       <button outline class="activated">
         <ion-icon name="contact"></ion-icon>
@@ -129,7 +129,7 @@
     <ion-title>Outline.activated</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons start>
       <button>
         <ion-icon name="contact"></ion-icon>
@@ -144,7 +144,7 @@
     <ion-title>Icon/Color Attr</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons start>
       <button>
         Go Back
@@ -158,7 +158,7 @@
     <ion-title>Text Only</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <button menuToggle>
       <ion-icon name="menu"></ion-icon>
     </button>
@@ -170,7 +170,7 @@
     <ion-title>Left side menu toggle</ion-title>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons end>
       <button #button1 (click)="buttonClick(button1)">
         <ion-icon name="star"></ion-icon>
@@ -182,7 +182,7 @@
     </button>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-buttons end>
       <button #button2 (click)="buttonClick(button2)">
         <ion-icon name="search"></ion-icon>
@@ -198,7 +198,7 @@
     </ion-segment>
   </ion-toolbar>
 
-  <ion-toolbar>
+  <ion-toolbar no-border-top>
     <ion-segment>
       <ion-segment-button value="light">
         Light