From d8a12c3c98179034e3b6d352e2e5f48e7b934293 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Fri, 9 Oct 2015 10:38:34 -0400
Subject: [PATCH] test(search-bar): added tests for all search bars

references #247
---
 .../search-bar/test/floating/e2e.ts           | 24 +++++++++++--
 .../search-bar/test/floating/index.ts         | 10 +++---
 .../search-bar/test/floating/main.html        | 34 +++++++++----------
 3 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/ionic/components/search-bar/test/floating/e2e.ts b/ionic/components/search-bar/test/floating/e2e.ts
index b9a75978aa..19d6d98c0a 100644
--- a/ionic/components/search-bar/test/floating/e2e.ts
+++ b/ionic/components/search-bar/test/floating/e2e.ts
@@ -1,4 +1,24 @@
 
-it('should animate focus', function() {
-  element(by.css('.e2eFloatingSearchBar input')).sendKeys("Should animate");
+it('default should focus', function() {
+  element(by.css('.e2eDefaultFloatingSearchBar input')).sendKeys("Default");
+});
+
+it('custom placeholder should focus', function() {
+  element(by.css('.e2eCustomPlaceholderFloatingSearchBar input')).sendKeys("Custom Placeholder");
+});
+
+it('default cancel button should focus', function() {
+  element(by.css('.e2eDefaultCancelButtonFloatingSearchBar input')).sendKeys("Default Cancel Button");
+});
+
+it('custom cancel button should focus', function() {
+  element(by.css('.e2eCustomCancelButtonFloatingSearchBar input')).sendKeys("Custom Cancel Button");
+});
+
+it('custom cancel button long text should focus', function() {
+  element(by.css('.e2eCustomCancelButtonLongTextFloatingSearchBar input')).sendKeys("Custom Cancel Button Long Text");
+});
+
+it('custom cancel action should focus', function() {
+  element(by.css('.e2eCustomCancelActionFloatingSearchBar input')).sendKeys("Custom Cancel Action");
 });
diff --git a/ionic/components/search-bar/test/floating/index.ts b/ionic/components/search-bar/test/floating/index.ts
index 60bb186293..81af9b462a 100644
--- a/ionic/components/search-bar/test/floating/index.ts
+++ b/ionic/components/search-bar/test/floating/index.ts
@@ -11,11 +11,13 @@ import {SearchPipe} from 'ionic/components/search-bar/search-bar';
 class IonicApp {
   constructor(fb: FormBuilder) {
     this.form = fb.group({
-      searchQuery: ['', Validators.required]
+      defaultSearch: ['', Validators.required],
+      customPlaceholder: ['', Validators.required],
+      defaultCancel: ['', Validators.required],
+      customCancel: ['', Validators.required],
+      customCancelLong: ['', Validators.required],
+      customCancelAction: ['', Validators.required],
     });
-    this.toolbarForm = fb.group({
-      toolbarSearchQuery: ['', Validators.required]
-    })
   }
   myCancelAction = function() {
     console.log('myCancelAction');
diff --git a/ionic/components/search-bar/test/floating/main.html b/ionic/components/search-bar/test/floating/main.html
index 9d04b18b29..1468de3ba4 100644
--- a/ionic/components/search-bar/test/floating/main.html
+++ b/ionic/components/search-bar/test/floating/main.html
@@ -1,21 +1,21 @@
-<!-- <ion-toolbar>
-  <form [ng-form-model]="toolbarForm">
-    <ion-search-bar ng-control="toolbarSearchQuery"></ion-search-bar>
-  </form>
-</ion-toolbar> -->
 <ion-content>
   <form [ng-form-model]="form">
-    <label> Search - Default </label>
-    <ion-search-bar ng-control="searchQuery" class="e2eFloatingSearchBar"></ion-search-bar>
-    <label> Search - Custom Placeholder </label>
-    <ion-search-bar ng-control="searchQuery" placeholder="Filter"></ion-search-bar>
-    <label> Search - Cancel Button </label>
-    <ion-search-bar ng-control="searchQuery" show-cancel="true"></ion-search-bar>
-    <label> Search - Custom Cancel Button </label>
-    <ion-search-bar ng-control="searchQuery" show-cancel="true" cancel-text="Done"></ion-search-bar>
-    <label> Search - Custom Cancel Button Long Text</label>
-    <ion-search-bar ng-control="searchQuery" show-cancel="true" cancel-text="I Am So Done"></ion-search-bar>
-    <label> Search - Custom Cancel Action</label>
-    <ion-search-bar ng-control="searchQuery" show-cancel="true" cancel-text="Done" [cancel-action]="myCancelAction"></ion-search-bar>
+    <h5 padding-left padding-top> Search - Default </h5>
+    <ion-search-bar ng-control="defaultSearch" class="e2eDefaultFloatingSearchBar"></ion-search-bar>
+
+    <h5 padding-left> Search - Custom Placeholder </h5>
+    <ion-search-bar ng-control="customPlaceholder" placeholder="Filter" class="e2eCustomPlaceholderFloatingSearchBar"></ion-search-bar>
+
+    <h5 padding-left> Search - Default Cancel Button </h5>
+    <ion-search-bar ng-control="defaultCancel" show-cancel="true" class="e2eDefaultCancelButtonFloatingSearchBar"></ion-search-bar>
+
+    <h5 padding-left> Search - Custom Cancel Button </h5>
+    <ion-search-bar ng-control="customCancel" show-cancel="true" cancel-text="Done" class="e2eCustomCancelButtonFloatingSearchBar"></ion-search-bar>
+
+    <h5 padding-left> Search - Custom Cancel Button Long</h5>
+    <ion-search-bar ng-control="customCancelLong" show-cancel="true" cancel-text="I Am So Done" class="e2eCustomCancelButtonLongTextFloatingSearchBar"></ion-search-bar>
+
+    <h5 padding-left> Search - Custom Cancel Action</h5>
+    <ion-search-bar ng-control="customCancelAction" show-cancel="true" cancel-text="Done" [cancel-action]="myCancelAction" class="e2eCustomCancelActionFloatingSearchBar"></ion-search-bar>
   </form>
 </ion-content>