From e7ad038b4d1d10affdf3d7b3e412c3c2477bdc47 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 3 Nov 2016 16:27:30 -0400
Subject: [PATCH] test(modal): update modal test to add new buttons and move
 toast

---
 src/components/modal/test/basic/app-module.ts | 26 ++++++++++++-------
 src/components/modal/test/basic/e2e.ts        |  4 +--
 src/components/modal/test/basic/main.html     |  6 +++++
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/components/modal/test/basic/app-module.ts b/src/components/modal/test/basic/app-module.ts
index 84fa6098ed..f441b89730 100644
--- a/src/components/modal/test/basic/app-module.ts
+++ b/src/components/modal/test/basic/app-module.ts
@@ -77,6 +77,22 @@ export class E2EPage {
   }
 
   presentModalChildNav() {
+    this.modalCtrl.create(ContactUs).present();
+  }
+
+  presentToolbarModal() {
+    this.modalCtrl.create(ToolbarModal).present();
+  }
+
+  presentModalWithInputs() {
+    let modal = this.modalCtrl.create(ModalWithInputs);
+    modal.onDidDismiss((data: any) => {
+      console.log('Modal with inputs data:', data);
+    });
+    modal.present();
+  }
+
+  presentNavModalWithToast() {
     this.toastCtrl.create({
       message: 'Will present a modal with child nav...',
       duration: 1000,
@@ -87,7 +103,7 @@ export class E2EPage {
     }, 500);
   }
 
-  presentToolbarModal() {
+  presentToolbarModalWithToast() {
     this.toastCtrl.create({
       message: 'Will present a modal with toolbars...',
       duration: 1000,
@@ -98,14 +114,6 @@ export class E2EPage {
     }, 500);
   }
 
-  presentModalWithInputs() {
-    let modal = this.modalCtrl.create(ModalWithInputs);
-    modal.onDidDismiss((data: any) => {
-      console.log('Modal with inputs data:', data);
-    });
-    modal.present();
-  }
-
   ionViewDidLoad() {
     console.log('E2EPage ionViewDidLoad fired');
   }
diff --git a/src/components/modal/test/basic/e2e.ts b/src/components/modal/test/basic/e2e.ts
index ca8239ab0c..0500dc4c10 100644
--- a/src/components/modal/test/basic/e2e.ts
+++ b/src/components/modal/test/basic/e2e.ts
@@ -4,7 +4,7 @@ it('should open modal', function() {
 });
 
 it('should close alert with button click', function() {
-  element(by.css('.alert-button:last-child')).click();
+  element(by.css('.alert-button')).click();
 });
 
 it('should close with close button click', function() {
@@ -16,7 +16,7 @@ it('should open toolbar modal', function() {
 });
 
 it('should close alert with button click', function() {
-  element(by.css('.alert-button:last-child')).click();
+  element(by.css('.alert-button')).click();
 });
 
 it('should close toolbar modal', function() {
diff --git a/src/components/modal/test/basic/main.html b/src/components/modal/test/basic/main.html
index 323e612055..9e99f95d90 100644
--- a/src/components/modal/test/basic/main.html
+++ b/src/components/modal/test/basic/main.html
@@ -21,6 +21,12 @@
   <p>
     <button ion-button (click)="presentModalWithInputs()">Present modal w/ inputs</button>
   </p>
+  <p>
+    <button ion-button (click)="presentNavModalWithToast()">Present toast then child ion-nav modal</button>
+  </p>
+  <p>
+    <button ion-button (click)="presentToolbarModalWithToast()">Present toast then toolbar modal</button>
+  </p>
   <p>
     {{platforms | json}}
   </p>