From 4d36369a7416de735251cccffd293a238cb90258 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandy@ionic.io>
Date: Mon, 11 Dec 2017 13:51:30 -0500
Subject: [PATCH] test(e2e): get e2e tests matching with v3

---
 .../components/action-sheet/test/basic/e2e.js | 57 ++++++++-------
 .../src/components/alert/test/basic/e2e.js    | 69 +++++++++++++++++++
 .../components/alert/test/basic/index.html    | 16 ++---
 .../src/components/card/test/basic/index.html |  5 ++
 .../src/components/loading/test/basic/e2e.js  | 10 +--
 .../src/components/menu/test/basic/e2e.js     | 10 +--
 .../src/components/modal/test/basic/e2e.js    | 10 +--
 .../src/components/popover/test/basic/e2e.js  | 10 +--
 .../src/components/select/test/basic/e2e.js   | 10 +--
 .../src/components/toast/test/basic/e2e.js    | 10 +--
 10 files changed, 132 insertions(+), 75 deletions(-)
 create mode 100644 packages/core/src/components/alert/test/basic/e2e.js

diff --git a/packages/core/src/components/action-sheet/test/basic/e2e.js b/packages/core/src/components/action-sheet/test/basic/e2e.js
index cedce9f4d5..123a7dbf84 100644
--- a/packages/core/src/components/action-sheet/test/basic/e2e.js
+++ b/packages/core/src/components/action-sheet/test/basic/e2e.js
@@ -14,6 +14,10 @@ class ActionSheetE2ETestPage extends Page {
     this.driver.wait(until.elementLocated(By.css('.action-sheet-container')));
     return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.action-sheet-container'))));
   }
+
+  closeWithBackdrop() {
+    this.driver.findElement(By.css('ion-backdrop')).click();
+  }
 }
 
 describe('action-sheet/basic', () => {
@@ -22,35 +26,38 @@ describe('action-sheet/basic', () => {
     return page.navigate();
   });
 
-  describe('present', () => {
-    register('shows basic', driver => {
-      const page = new ActionSheetE2ETestPage(driver);
-      return page.present('basic');
-    });
+  register('should open action sheet', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('basic');
+  });
 
-    register('shows noBackdropDismiss',  (driver)  => {
-      const page = new ActionSheetE2ETestPage(driver);
-      return page.present('noBackdropDismiss');
-    });
+  register('should close with backdrop click', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.closeWithBackdrop();
+  });
 
-    register('shows alertFromActionSheet',  (driver)  => {
-      const page = new ActionSheetE2ETestPage(driver);
-      return page.present('alertFromActionSheet');
-    });
+  register('shows noBackdropDismiss',  (driver)  => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('noBackdropDismiss');
+  });
 
-    register('shows scrollableOptions',  (driver)  => {
-      const page = new ActionSheetE2ETestPage(driver);
-      return page.present('scrollableOptions');
-    });
+  register('shows alertFromActionSheet',  (driver)  => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('alertFromActionSheet');
+  });
 
-    register('shows scrollWithoutCancel',  (driver)  => {
-      const page = new ActionSheetE2ETestPage(driver);
-      return page.present('scrollWithoutCancel');
-    });
+  register('shows scrollableOptions',  (driver)  => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('scrollableOptions');
+  });
 
-    register('shows cancelOnly',  (driver)  => {
-      const page = new ActionSheetE2ETestPage(driver);
-      return page.present('cancelOnly');
-    });
+  register('shows scrollWithoutCancel',  (driver)  => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('scrollWithoutCancel');
+  });
+
+  register('shows cancelOnly',  (driver)  => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('cancelOnly');
   });
 });
diff --git a/packages/core/src/components/alert/test/basic/e2e.js b/packages/core/src/components/alert/test/basic/e2e.js
new file mode 100644
index 0000000000..d02aa25de1
--- /dev/null
+++ b/packages/core/src/components/alert/test/basic/e2e.js
@@ -0,0 +1,69 @@
+'use strict';
+
+const { By, until } = require('selenium-webdriver');
+const { register, Page } = require('../../../../../scripts/e2e');
+
+class ActionSheetE2ETestPage extends Page {
+  constructor(driver) {
+    super(driver, 'http://localhost:3333/src/components/alert/test/basic');
+  }
+
+  present(buttonId) {
+    this.navigate();
+    this.driver.findElement(By.id(buttonId)).click();
+    this.driver.wait(until.elementLocated(By.css('.alert-wrapper')));
+    return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.alert-wrapper'))));
+  }
+
+  closeWithBackdrop() {
+    this.driver.findElement(By.css('ion-backdrop')).click();
+  }
+}
+
+describe('alert/basic', () => {
+  register('should init', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.navigate();
+  });
+
+  register('should open basic alert', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('basic');
+  });
+
+  register('should open alert long message', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('longMessage');
+  });
+
+  register('should open alert multiple buttons', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('multipleButtons');
+  });
+
+  register('should open alert no message', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('noMessage');
+  });
+
+  register('should open confirm alert', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('confirm');
+  });
+
+  register('should open prompt alert', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('prompt');
+  });
+
+  register('should open radio alert', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('radio');
+  });
+
+  register('should open checkbox alert', driver => {
+    const page = new ActionSheetE2ETestPage(driver);
+    return page.present('checkbox');
+  });
+
+});
diff --git a/packages/core/src/components/alert/test/basic/index.html b/packages/core/src/components/alert/test/basic/index.html
index 9675446533..ddca698735 100644
--- a/packages/core/src/components/alert/test/basic/index.html
+++ b/packages/core/src/components/alert/test/basic/index.html
@@ -20,14 +20,14 @@
       <ion-content padding>
         <ion-alert-controller></ion-alert-controller>
 
-        <ion-button expand="block" onclick="presentAlert()">Alert</ion-button>
-        <ion-button expand="block" onclick="presentAlertLongMessage()">Alert Long Message</ion-button>
-        <ion-button expand="block" onclick="presentAlertMultipleButtons()">Multiple Buttons (>2)</ion-button>
-        <ion-button expand="block" onclick="presentAlertNoMessage()">Alert No Message</ion-button>
-        <ion-button expand="block" onclick="presentAlertConfirm()">Confirm</ion-button>
-        <ion-button expand="block" onclick="presentAlertPrompt()">Prompt</ion-button>
-        <ion-button expand="block" onclick="presentAlertRadio()">Radio</ion-button>
-        <ion-button expand="block" onclick="presentAlertCheckbox()">Checkbox</ion-button>
+        <ion-button id="basic" expand="block" onclick="presentAlert()">Alert</ion-button>
+        <ion-button id="longMessage" expand="block" onclick="presentAlertLongMessage()">Alert Long Message</ion-button>
+        <ion-button id="multipleButtons" expand="block" onclick="presentAlertMultipleButtons()">Multiple Buttons (>2)</ion-button>
+        <ion-button id="noMessage" expand="block" onclick="presentAlertNoMessage()">Alert No Message</ion-button>
+        <ion-button id="confirm" expand="block" onclick="presentAlertConfirm()">Confirm</ion-button>
+        <ion-button id="prompt" expand="block" onclick="presentAlertPrompt()">Prompt</ion-button>
+        <ion-button id="radio" expand="block" onclick="presentAlertRadio()">Radio</ion-button>
+        <ion-button id="checkbox" expand="block" onclick="presentAlertCheckbox()">Checkbox</ion-button>
         <ion-button expand="block" onclick="presentWithCssClass()">CssClass</ion-button>
       </ion-content>
     </ion-page>
diff --git a/packages/core/src/components/card/test/basic/index.html b/packages/core/src/components/card/test/basic/index.html
index 45ea106f58..45749f2e8c 100644
--- a/packages/core/src/components/card/test/basic/index.html
+++ b/packages/core/src/components/card/test/basic/index.html
@@ -66,6 +66,11 @@
       </ion-content>
     </ion-page>
   </ion-app>
+  <style>
+    .content {
+      background: #e5e5e5;
+    }
+  </style>
 </body>
 
 </html>
diff --git a/packages/core/src/components/loading/test/basic/e2e.js b/packages/core/src/components/loading/test/basic/e2e.js
index 134b17dcbd..6e4c19890c 100644
--- a/packages/core/src/components/loading/test/basic/e2e.js
+++ b/packages/core/src/components/loading/test/basic/e2e.js
@@ -5,13 +5,9 @@ describe('loading/basic', () => {
 
   register('should init', navigate(testPageURL));
 
-  describe('present', () => {
-
-    register('shows loading', driver => {
-      const page = new Page(driver, testPageURL);
-      return page.present('.e2eShowLoading', { waitFor: 'ion-loading' });
-    });
-
+  register('shows loading', driver => {
+    const page = new Page(driver, testPageURL);
+    return page.present('.e2eShowLoading', { waitFor: 'ion-loading' });
   });
 
 });
diff --git a/packages/core/src/components/menu/test/basic/e2e.js b/packages/core/src/components/menu/test/basic/e2e.js
index 8993b6fc2f..b045d6e607 100644
--- a/packages/core/src/components/menu/test/basic/e2e.js
+++ b/packages/core/src/components/menu/test/basic/e2e.js
@@ -5,13 +5,9 @@ describe('menu/basic', () => {
 
   register('should init', navigate(testPageURL));
 
-  describe('present', () => {
-
-    register('shows left menu', driver => {
-      const page = new Page(driver, testPageURL);
-      return page.present('.e2eOpenLeftMenu', { waitFor: '.e2eLeftMenu' })
-    });
-
+  register('shows left menu', driver => {
+    const page = new Page(driver, testPageURL);
+    return page.present('.e2eOpenLeftMenu', { waitFor: '.e2eLeftMenu' })
   });
 
 });
diff --git a/packages/core/src/components/modal/test/basic/e2e.js b/packages/core/src/components/modal/test/basic/e2e.js
index 62f4d3493e..6eae0048ff 100644
--- a/packages/core/src/components/modal/test/basic/e2e.js
+++ b/packages/core/src/components/modal/test/basic/e2e.js
@@ -5,13 +5,9 @@ describe('modal/basic', () => {
 
   register('should init', navigate(testPageURL));
 
-  describe('present', () => {
-
-    register('shows modal', driver => {
-      const page = new Page(driver, testPageURL);
-      return page.present('.e2ePresentModal', { waitFor: 'ion-modal' });
-    });
-
+  register('shows modal', driver => {
+    const page = new Page(driver, testPageURL);
+    return page.present('.e2ePresentModal', { waitFor: 'ion-modal' });
   });
 
 });
diff --git a/packages/core/src/components/popover/test/basic/e2e.js b/packages/core/src/components/popover/test/basic/e2e.js
index 2703bed6ad..bffb409e4a 100644
--- a/packages/core/src/components/popover/test/basic/e2e.js
+++ b/packages/core/src/components/popover/test/basic/e2e.js
@@ -6,13 +6,9 @@ describe('popover/basic', () => {
 
   register('should init', navigate(testPageURL));
 
-  describe('present', () => {
-
-    register('shows modal', driver => {
-      const page = new Page(driver, testPageURL);
-      return page.present('.e2eShowPopover', { waitFor: 'ion-popover' });
-    });
-
+  register('shows modal', driver => {
+    const page = new Page(driver, testPageURL);
+    return page.present('.e2eShowPopover', { waitFor: 'ion-popover' });
   });
 
 });
diff --git a/packages/core/src/components/select/test/basic/e2e.js b/packages/core/src/components/select/test/basic/e2e.js
index bd3bfd93b1..cd7e5e3e95 100644
--- a/packages/core/src/components/select/test/basic/e2e.js
+++ b/packages/core/src/components/select/test/basic/e2e.js
@@ -5,13 +5,9 @@ describe('select/basic', () => {
 
   register('should init', navigate(testPageURL));
 
-  describe('present', () => {
-
-    register('shows selector', driver => {
-      const page = new Page(driver, testPageURL);
-      return page.present('.e2eSelectGender > button', { waitFor: 'ion-alert' });
-    });
-
+  register('shows selector', driver => {
+    const page = new Page(driver, testPageURL);
+    return page.present('.e2eSelectGender > button', { waitFor: 'ion-alert' });
   });
 
 });
diff --git a/packages/core/src/components/toast/test/basic/e2e.js b/packages/core/src/components/toast/test/basic/e2e.js
index dd64b80d57..e05c9ad370 100644
--- a/packages/core/src/components/toast/test/basic/e2e.js
+++ b/packages/core/src/components/toast/test/basic/e2e.js
@@ -5,13 +5,9 @@ describe('toast/basic', () => {
 
   register('should init', navigate(testPageURL));
 
-  describe('present', () => {
-
-    register('shows bottom toast', driver => {
-      const page = new Page(driver, testPageURL);
-      return page.present('.e2eShowBottomToast', { waitFor: 'ion-toast' });
-    });
-
+  register('shows bottom toast', driver => {
+    const page = new Page(driver, testPageURL);
+    return page.present('.e2eShowBottomToast', { waitFor: 'ion-toast' });
   });
 
 });