From 7a50c5d5927077a1246b5c8ca805b2c21db2fb73 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 2 Dec 2015 19:41:21 -0500
Subject: [PATCH] test(text-input): updated test for form-inputs

references #678
---
 .../text-input/test/form-inputs/index.ts      |  7 ++++-
 .../text-input/test/form-inputs/main.html     | 27 ++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ionic/components/text-input/test/form-inputs/index.ts b/ionic/components/text-input/test/form-inputs/index.ts
index a1816192fb..1eb3f9b37f 100644
--- a/ionic/components/text-input/test/form-inputs/index.ts
+++ b/ionic/components/text-input/test/form-inputs/index.ts
@@ -8,15 +8,20 @@ import {FormBuilder, Validators} from 'angular2/angular2';
 class E2EApp {
   constructor(fb: FormBuilder) {
     this.loginForm = fb.group({
-      username: ["", Validators.required],
       email: ["", Validators.required],
+      username: [""],
       password: ["", Validators.required],
       comments: ["", Validators.required]
     });
+
+    this.login = {};
+
+    this.submitted = false;
   }
 
   submit(ev) {
     console.log("Submitted", this.loginForm.value);
+    this.submitted = true;
   }
 
 }
diff --git a/ionic/components/text-input/test/form-inputs/main.html b/ionic/components/text-input/test/form-inputs/main.html
index 2e47aa04fd..3356ff2d82 100644
--- a/ionic/components/text-input/test/form-inputs/main.html
+++ b/ionic/components/text-input/test/form-inputs/main.html
@@ -4,12 +4,12 @@
 
 <ion-content>
 
-  <form (ng-submit)="submit($event)" [ng-form-model]="loginForm">
+  <form (ng-submit)="submit($event)" [ng-form-model]="loginForm" #mf="form" novalidate>
 
     <ion-list>
       <ion-input>
         <ion-label>Email:</ion-label>
-        <input ng-control="email" type="email">
+        <input [(ng-model)]="login.email" ng-control="email" type="email" placeholder="Required" required>
         <button clear item-right>
           <icon mail></icon>
         </button>
@@ -17,7 +17,7 @@
 
       <ion-input>
         <ion-label>Username:</ion-label>
-        <input ng-control="username" type="text">
+        <input [(ng-model)]="login.username" ng-control="username" type="text" placeholder="Optional">
         <button clear item-right>
           <icon person></icon>
         </button>
@@ -25,7 +25,7 @@
 
       <ion-input>
         <ion-label>Password:</ion-label>
-        <input ng-control="password" type="password">
+        <input [(ng-model)]="login.password" ng-control="password" type="password" placeholder="Required" required>
         <button clear item-right>
           <icon lock></icon>
         </button>
@@ -33,11 +33,26 @@
 
       <ion-input>
         <ion-label>Comments:</ion-label>
-        <textarea ng-control="comments">Comment value</textarea>
+        <textarea [(ng-model)]="login.comments" ng-control="comments" placeholder="Required" required>Comment value</textarea>
       </ion-input>
+
+      <ion-item [hidden]="submitted == false || mf.form.valid">
+        <p danger>Form is Invalid</p>
+      </ion-item>
     </ion-list>
 
-    <button block type="submit">Login</button>
+    <div padding>
+      <button block type="submit">Login</button>
+    </div>
+
+    <div [hidden]="submitted == false" padding-left>
+      <b>Valid form?:</b> {{ mf.form.valid }}<br>
+      <b>Submitted form?:</b> {{ submitted }}<br>
+      <b>Email:</b> {{ login.email }}<br>
+      <b>Username:</b> {{ login.username }}<br>
+      <b>Password:</b> {{ login.password }}<br>
+      <b>Comments:</b> {{ login.comments }}
+    </div>
 
   </form>