From 25526870e06f3bae015b2ded69657f44609c5f18 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 4 Jan 2016 15:33:13 -0500
Subject: [PATCH] test(searchbar): added nav test and removed model test

references #853
---
 .../searchbar/test/floating/index.ts          |  1 -
 .../components/searchbar/test/model/main.html | 16 ----------
 .../components/searchbar/test/nav/first.html  |  7 +++++
 ionic/components/searchbar/test/nav/index.ts  | 30 +++++++++++++++++++
 .../components/searchbar/test/nav/second.html | 13 ++++++++
 .../searchbar/test/toolbar/index.ts           |  5 +---
 6 files changed, 51 insertions(+), 21 deletions(-)
 delete mode 100644 ionic/components/searchbar/test/model/main.html
 create mode 100644 ionic/components/searchbar/test/nav/first.html
 create mode 100644 ionic/components/searchbar/test/nav/index.ts
 create mode 100644 ionic/components/searchbar/test/nav/second.html

diff --git a/ionic/components/searchbar/test/floating/index.ts b/ionic/components/searchbar/test/floating/index.ts
index 1cb395d5a6..5713049de8 100644
--- a/ionic/components/searchbar/test/floating/index.ts
+++ b/ionic/components/searchbar/test/floating/index.ts
@@ -1,7 +1,6 @@
 import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
 
 import {App} from 'ionic/ionic';
-import {SearchPipe} from 'ionic/components/searchbar/searchbar';
 
 @App({
   templateUrl: 'main.html',
diff --git a/ionic/components/searchbar/test/model/main.html b/ionic/components/searchbar/test/model/main.html
deleted file mode 100644
index 275be607c9..0000000000
--- a/ionic/components/searchbar/test/model/main.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<!-- <ion-view nav-title="Search Bar"> -->
-
-  <ion-content>
-    <!-- <form [ngFormModel]="form"> -->
-
-      <ion-searchbar [(ngModel)]="searchQuery"></ion-searchbar>
-      <ion-list inset #list>
-        <ion-item *ngFor="#item of getItems()">
-          {{item.title}}
-        </ion-item>
-      </ion-list>
-    <!-- </form> -->
-  </ion-content>
-
-<!-- </ion-view> -->
diff --git a/ionic/components/searchbar/test/nav/first.html b/ionic/components/searchbar/test/nav/first.html
new file mode 100644
index 0000000000..a44f3c3861
--- /dev/null
+++ b/ionic/components/searchbar/test/nav/first.html
@@ -0,0 +1,7 @@
+<ion-navbar *navbar>
+  <ion-title>First Page</ion-title>
+</ion-navbar>
+
+<ion-content padding>
+  <button block (click)="goToSecond()">Go to Searchbar Page</button>
+</ion-content>
diff --git a/ionic/components/searchbar/test/nav/index.ts b/ionic/components/searchbar/test/nav/index.ts
new file mode 100644
index 0000000000..5ff4125565
--- /dev/null
+++ b/ionic/components/searchbar/test/nav/index.ts
@@ -0,0 +1,30 @@
+import {App, Page, NavController} from 'ionic/ionic';
+
+@Page({
+  templateUrl: 'first.html'
+})
+class FirstPage {
+  constructor(private _nav: NavController) {
+
+  }
+
+  goToSecond() {
+    this._nav.push(SecondPage);
+  }
+}
+
+@Page({
+  templateUrl: 'second.html'
+})
+class SecondPage {
+
+}
+
+@App({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+class E2EApp {
+  constructor() {
+    this.root = FirstPage;
+  }
+}
diff --git a/ionic/components/searchbar/test/nav/second.html b/ionic/components/searchbar/test/nav/second.html
new file mode 100644
index 0000000000..bd85326841
--- /dev/null
+++ b/ionic/components/searchbar/test/nav/second.html
@@ -0,0 +1,13 @@
+<ion-navbar *navbar>
+  <ion-title>Searchbar</ion-title>
+</ion-navbar>
+
+<ion-toolbar>
+  <ion-searchbar primary placeholder="Filter Schedules">
+  </ion-searchbar>
+</ion-toolbar>
+
+<ion-content>
+  <ion-searchbar primary placeholder="Filter Schedules">
+  </ion-searchbar>
+</ion-content>
diff --git a/ionic/components/searchbar/test/toolbar/index.ts b/ionic/components/searchbar/test/toolbar/index.ts
index a0c90e1e25..810b63c5bc 100644
--- a/ionic/components/searchbar/test/toolbar/index.ts
+++ b/ionic/components/searchbar/test/toolbar/index.ts
@@ -1,7 +1,4 @@
-import {App, NavController} from 'ionic/ionic';
-import {Page, Config, IonicApp} from 'ionic/ionic';
-import {NavParams, NavController, ViewController} from 'ionic/ionic';
-import {SearchPipe} from 'ionic/components/searchbar/searchbar';
+import {App} from 'ionic/ionic';
 
 @App({
   templateUrl: 'main.html'