From 7ac15a875dc82766b439787b7bd88ef419a5434c Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Mon, 22 Oct 2018 14:47:03 -0500
Subject: [PATCH] test(alert): waitForVisible (#16031)

---
 .../action-sheet/test/standalone/e2e.js       | 67 -------------------
 core/src/components/alert/test/basic/e2e.ts   |  4 +-
 .../components/alert/test/standalone/e2e.ts   |  4 +-
 3 files changed, 6 insertions(+), 69 deletions(-)
 delete mode 100644 core/src/components/action-sheet/test/standalone/e2e.js

diff --git a/core/src/components/action-sheet/test/standalone/e2e.js b/core/src/components/action-sheet/test/standalone/e2e.js
deleted file mode 100644
index 27fe792ed0..0000000000
--- a/core/src/components/action-sheet/test/standalone/e2e.js
+++ /dev/null
@@ -1,67 +0,0 @@
-'use strict';
-
-const { By, until } = require('selenium-webdriver');
-const { Page, platforms, register } = require('../../../../../scripts/e2e');
-
-class E2ETestPage extends Page {
-  constructor(driver, platform) {
-    super(driver, `http://localhost:3333/src/components/action-sheet/test/standalone?ionic:mode=${platform}`);
-  }
-
-  async present(buttonId) {
-    await this.navigate('#basic');
-    this.driver.findElement(By.id(buttonId)).click();
-    await this.driver.wait(until.elementLocated(By.css('.action-sheet-container')));
-    return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.action-sheet-container'))));
-  }
-
-  async closeWithBackdrop() {
-    this.driver.findElement(By.css('ion-backdrop')).click();
-    return await this.driver.wait(until.elementIsNotVisible(this.driver.findElement(By.css('ion-backdrop'))));
-  }
-}
-
-platforms.forEach(platform => {
-  describe('action-sheet/standalone', () => {
-    register('should init', driver => {
-      const page = new E2ETestPage(driver, platform);
-      return page.navigate('#basic');
-    });
-
-    register('should open action sheet', driver => {
-      const page = new E2ETestPage(driver, platform);
-      return page.present('basic');
-    });
-
-    register('should close with backdrop click', async driver => {
-      const page = new E2ETestPage(driver, platform);
-      await page.present('basic');
-      return page.closeWithBackdrop();
-    });
-
-    register('shows noBackdropDismiss',  (driver)  => {
-      const page = new E2ETestPage(driver, platform);
-      return page.present('noBackdropDismiss');
-    });
-
-    register('shows alertFromActionSheet',  (driver)  => {
-      const page = new E2ETestPage(driver, platform);
-      return page.present('alertFromActionSheet');
-    });
-
-    register('shows scrollableOptions',  (driver)  => {
-      const page = new E2ETestPage(driver, platform);
-      return page.present('scrollableOptions');
-    });
-
-    register('shows scrollWithoutCancel',  (driver)  => {
-      const page = new E2ETestPage(driver, platform);
-      return page.present('scrollWithoutCancel');
-    });
-
-    register('shows cancelOnly',  (driver)  => {
-      const page = new E2ETestPage(driver, platform);
-      return page.present('cancelOnly');
-    });
-  });
-});
diff --git a/core/src/components/alert/test/basic/e2e.ts b/core/src/components/alert/test/basic/e2e.ts
index 3dc875da67..b008080961 100644
--- a/core/src/components/alert/test/basic/e2e.ts
+++ b/core/src/components/alert/test/basic/e2e.ts
@@ -19,8 +19,10 @@ it('alert: basic', async () => {
   for (const [buttonSelector, message] of alerts) {
     await page.click(buttonSelector);
     const alert = await page.find('ion-alert');
-    const compare = await page.compareScreenshot(message);
     expect(alert).not.toBe(null);
+    await alert.waitForVisible();
+
+    const compare = await page.compareScreenshot(message);
     expect(compare).toMatchScreenshot();
     await alert.callMethod('dismiss');
   }
diff --git a/core/src/components/alert/test/standalone/e2e.ts b/core/src/components/alert/test/standalone/e2e.ts
index eb23902476..1fc3af63cc 100644
--- a/core/src/components/alert/test/standalone/e2e.ts
+++ b/core/src/components/alert/test/standalone/e2e.ts
@@ -19,8 +19,10 @@ it('alert: standalone', async () => {
   for (const [buttonSelector, message] of alerts) {
     await page.click(buttonSelector);
     const alert = await page.find('ion-alert');
-    const compare = await page.compareScreenshot(message);
     expect(alert).not.toBe(null);
+    await alert.waitForVisible();
+
+    const compare = await page.compareScreenshot(message);
     expect(compare).toMatchScreenshot();
     await alert.callMethod('dismiss');
   }