From 657c2edc4d4aab06da567cc437ca981457f0d790 Mon Sep 17 00:00:00 2001
From: Cam Wiegert <cam@camwiegert.com>
Date: Mon, 1 Oct 2018 15:05:48 -0500
Subject: [PATCH] test(modal): migrate e2e tests

references #15803
---
 core/src/components/modal/test/basic/e2e.js   | 19 ------------
 core/src/components/modal/test/basic/e2e.ts   | 14 +++++++++
 .../components/modal/test/standalone/e2e.js   | 31 -------------------
 .../components/modal/test/standalone/e2e.ts   | 14 +++++++++
 4 files changed, 28 insertions(+), 50 deletions(-)
 delete mode 100644 core/src/components/modal/test/basic/e2e.js
 create mode 100644 core/src/components/modal/test/basic/e2e.ts
 delete mode 100644 core/src/components/modal/test/standalone/e2e.js
 create mode 100644 core/src/components/modal/test/standalone/e2e.ts

diff --git a/core/src/components/modal/test/basic/e2e.js b/core/src/components/modal/test/basic/e2e.js
deleted file mode 100644
index 44645d463c..0000000000
--- a/core/src/components/modal/test/basic/e2e.js
+++ /dev/null
@@ -1,19 +0,0 @@
-'use strict';
-
-const { By, until } = require('selenium-webdriver');
-const { register, Page, platforms } = require('../../../../../scripts/e2e');
-
-class E2ETestPage extends Page {
-  constructor(driver, platform) {
-    super(driver, `http://localhost:3333/src/components/modal/test/basic?ionic:mode=${platform}`);
-  }
-}
-
-platforms.forEach(platform => {
-  describe('modal/basic', () => {
-    register('should init', driver => {
-      const page = new E2ETestPage(driver, platform);
-      return page.navigate('#presentModal');
-    });
-  });
-});
diff --git a/core/src/components/modal/test/basic/e2e.ts b/core/src/components/modal/test/basic/e2e.ts
new file mode 100644
index 0000000000..a78e5aff4e
--- /dev/null
+++ b/core/src/components/modal/test/basic/e2e.ts
@@ -0,0 +1,14 @@
+import { newE2EPage } from '@stencil/core/testing';
+
+it('modal: basic', async () => {
+  const page = await newE2EPage({
+    url: '/src/components/modal/test/basic?ionic:animated=false'
+  });
+
+  await page.click('.e2ePresentModal');
+  const popover = await page.find('ion-modal');
+  expect(popover).not.toBeNull();
+
+  const compare = await page.compareScreenshot();
+  expect(compare).toMatchScreenshot();
+});
diff --git a/core/src/components/modal/test/standalone/e2e.js b/core/src/components/modal/test/standalone/e2e.js
deleted file mode 100644
index 8fba8b60ff..0000000000
--- a/core/src/components/modal/test/standalone/e2e.js
+++ /dev/null
@@ -1,31 +0,0 @@
-'use strict';
-
-const { By, until } = require('selenium-webdriver');
-const { register, Page, platforms } = require('../../../../../scripts/e2e');
-
-class E2ETestPage extends Page {
-  constructor(driver, platform) {
-    super(driver, `http://localhost:3333/src/components/modal/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('.modal-wrapper')));
-    return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.modal-wrapper'))));
-  }
-}
-
-platforms.forEach(platform => {
-  describe('modal/standalone', () => {
-    register('should init', driver => {
-      const page = new E2ETestPage(driver, platform);
-      return page.navigate('#basic');
-    });
-
-    register('shows basic modal', driver => {
-      const page = new E2ETestPage(driver, platform);
-      return page.present('basic');
-    });
-  });
-});
diff --git a/core/src/components/modal/test/standalone/e2e.ts b/core/src/components/modal/test/standalone/e2e.ts
new file mode 100644
index 0000000000..02adc406b2
--- /dev/null
+++ b/core/src/components/modal/test/standalone/e2e.ts
@@ -0,0 +1,14 @@
+import { newE2EPage } from '@stencil/core/testing';
+
+it('modal: standalone', async () => {
+  const page = await newE2EPage({
+    url: '/src/components/modal/test/standalone?ionic:animated=false'
+  });
+
+  await page.click('#basic');
+  const popover = await page.find('ion-modal');
+  expect(popover).not.toBeNull();
+
+  const compare = await page.compareScreenshot();
+  expect(compare).toMatchScreenshot();
+});