From 05f3d92af4d27a564ab90b5e9a3b19d927874bf4 Mon Sep 17 00:00:00 2001
From: Cam Wiegert <cam@camwiegert.com>
Date: Tue, 2 Oct 2018 10:39:49 -0500
Subject: [PATCH] test(loading): migrate e2e tests

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

diff --git a/core/src/components/loading/test/basic/e2e.js b/core/src/components/loading/test/basic/e2e.js
deleted file mode 100644
index f8d829770a..0000000000
--- a/core/src/components/loading/test/basic/e2e.js
+++ /dev/null
@@ -1,36 +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/loading/test/basic?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('.loading-wrapper')));
-    return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.loading-wrapper'))));
-  }
-}
-
-platforms.forEach(platform => {
-  describe('loading/basic', () => {
-    register('should init', driver => {
-      const page = new E2ETestPage(driver, platform);
-      return page.navigate('#basic');
-    });
-
-    register('should open loading', driver => {
-      const page = new E2ETestPage(driver, platform);
-      return page.present('basic');
-    });
-
-    register('should open default spinner', driver => {
-      const page = new E2ETestPage(driver, platform);
-      return page.present('default');
-    });
-  });
-});
diff --git a/core/src/components/loading/test/basic/e2e.ts b/core/src/components/loading/test/basic/e2e.ts
new file mode 100644
index 0000000000..797cffb794
--- /dev/null
+++ b/core/src/components/loading/test/basic/e2e.ts
@@ -0,0 +1,14 @@
+import { newE2EPage } from '@stencil/core/testing';
+
+it('loading: basic', async () => {
+  const page = await newE2EPage({
+    url: '/src/components/loading/test/basic?ionic:animated=false'
+  });
+
+  await page.click('#basic');
+  const loading = await page.find('ion-loading');
+  expect(loading).not.toBeNull();
+
+  const compare = await page.compareScreenshot();
+  expect(compare).toMatchScreenshot();
+});
diff --git a/core/src/components/loading/test/standalone/e2e.js b/core/src/components/loading/test/standalone/e2e.js
deleted file mode 100644
index e040ea60d3..0000000000
--- a/core/src/components/loading/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/loading/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('.loading-wrapper')));
-    return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.loading-wrapper'))));
-  }
-}
-
-platforms.forEach(platform => {
-  describe('loading/standalone', () => {
-    register('should init', driver => {
-      const page = new E2ETestPage(driver, platform);
-      return page.navigate('#basic');
-    });
-
-    register('should open loading', driver => {
-      const page = new E2ETestPage(driver, platform);
-      return page.present('basic');
-    });
-  });
-});
diff --git a/core/src/components/loading/test/standalone/e2e.ts b/core/src/components/loading/test/standalone/e2e.ts
new file mode 100644
index 0000000000..6c2945f7d0
--- /dev/null
+++ b/core/src/components/loading/test/standalone/e2e.ts
@@ -0,0 +1,14 @@
+import { newE2EPage } from '@stencil/core/testing';
+
+it('loading: standalone', async () => {
+  const page = await newE2EPage({
+    url: '/src/components/loading/test/standalone?ionic:animated=false'
+  });
+
+  await page.click('#basic');
+  const loading = await page.find('ion-loading');
+  expect(loading).not.toBeNull();
+
+  const compare = await page.compareScreenshot();
+  expect(compare).toMatchScreenshot();
+});