diff --git a/packages/core/scripts/e2e/index.js b/packages/core/scripts/e2e/index.js index bb2868b79d..b97c9a1b28 100644 --- a/packages/core/scripts/e2e/index.js +++ b/packages/core/scripts/e2e/index.js @@ -53,6 +53,21 @@ function getTestFiles() { }); } +function startDriver() { + // setting chrome options to start the browser without an info bar + let chromeCapabilities = webdriver.Capabilities.chrome(); + const chromeOptions = { + // 'args': ['--disable-infobars'] + }; + chromeCapabilities.set('chromeOptions', chromeOptions); + + return new webdriver.Builder().withCapabilities(chromeCapabilities).forBrowser('chrome').build(); +} + +async function stopDriver() { + await driver.quit(); +} + function processCommandLine() { if (argv.snapshot) { takeScreenshots = true; @@ -65,15 +80,19 @@ function processCommandLine() { function registerE2ETest(desc, tst) { // NOTE: Do not use an arrow function here because: https://mochajs.org/#arrow-functions - it(desc, async function() { - await tst(driver, this); - if (takeScreenshots) { - await snapshot.takeScreenshot(driver, { - name: this.test.fullTitle().replace(/(^[\w-]+\/[\w-]+)/, '$1:'), - specIndex: specIndex++ - }); - } - return Promise.resolve(true); + it(desc, function(done) { + // const driver = startDriver(); + (async function() { + await tst(driver, this); + if (takeScreenshots) { + await snapshot.takeScreenshot(driver, { + name: this.test.fullTitle().replace(/(^[\w-]+\/[\w-]+)/, '$1:'), + specIndex: specIndex++ + }); + } + // await driver.quit(); + done(); + })(); }); } @@ -90,15 +109,7 @@ async function run() { slow: 2000 }); - // setting chrome options to start the browser without an info bar - let chromeCapabilities = webdriver.Capabilities.chrome(); - let chromeOptions = { - // 'args': ['--disable-infobars'] - }; - chromeCapabilities.set('chromeOptions', chromeOptions); - - driver = new webdriver.Builder().withCapabilities(chromeCapabilities).forBrowser('chrome').build(); - + driver = startDriver(); processCommandLine(); const devServer = await startDevServer(); @@ -113,7 +124,7 @@ async function run() { } devServer.close(); - await driver.quit(); + stopDriver(); if (failures) { throw new Error(failures); @@ -188,8 +199,7 @@ if (require.main === module) { module.exports = { Page, - navigate: (url, tagName) => driver => new Page(driver, url).navigate(tagName), + platforms: platforms, register: registerE2ETest, - run: run, - platforms: platforms + run: run }; diff --git a/packages/core/scripts/e2e/page.js b/packages/core/scripts/e2e/page.js index e1ce01d6f3..927117011c 100644 --- a/packages/core/scripts/e2e/page.js +++ b/packages/core/scripts/e2e/page.js @@ -8,16 +8,17 @@ module.exports = class E2ETestPage { this.driver = driver; } - navigate(tagName = '') { + async navigate(tagName = '') { this.driver.navigate().to(this.url); - this.driver.wait(until.elementLocated(By.css('.hydrated'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css(`${tagName}.hydrated`)))); + this.driver.manage().timeouts().implicitlyWait(10000); + await this.driver.wait(until.elementLocated(By.css(`${tagName}.hydrated`))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css(`${tagName}.hydrated`)))); } - present(clickTarget, options) { - this.navigate(); + async present(clickTarget, options) { + await this.navigate(); this.driver.findElement(By.css(clickTarget)).click(); - this.driver.wait(until.elementLocated(By.css(options.waitFor))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css(options.waitFor)))); + await this.driver.wait(until.elementLocated(By.css(options.waitFor))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css(options.waitFor)))); } } 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 63899166ae..c73de18444 100644 --- a/packages/core/src/components/action-sheet/test/basic/e2e.js +++ b/packages/core/src/components/action-sheet/test/basic/e2e.js @@ -1,23 +1,23 @@ 'use strict'; const { By, until } = require('selenium-webdriver'); -const { register, Page, platforms } = require('../../../../../scripts/e2e'); +const { Page, platforms, register } = require('../../../../../scripts/e2e'); class E2ETestPage extends Page { constructor(driver, platform) { super(driver, `http://localhost:3333/src/components/action-sheet/test/basic?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#basic'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.action-sheet-container'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.action-sheet-container')))); + 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')))); } - closeWithBackdrop() { + async closeWithBackdrop() { this.driver.findElement(By.css('ion-backdrop')).click(); - return this.driver.wait(until.elementIsNotVisible(this.driver.findElement(By.css('ion-backdrop')))); + return await this.driver.wait(until.elementIsNotVisible(this.driver.findElement(By.css('ion-backdrop')))); } } @@ -25,7 +25,7 @@ platforms.forEach(platform => { describe('action-sheet/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#basic'); }); register('should open action sheet', driver => { @@ -33,8 +33,9 @@ platforms.forEach(platform => { return page.present('basic'); }); - register('should close with backdrop click', driver => { + register('should close with backdrop click', async driver => { const page = new E2ETestPage(driver, platform); + await page.present('basic'); return page.closeWithBackdrop(); }); diff --git a/packages/core/src/components/action-sheet/test/standalone/e2e.js b/packages/core/src/components/action-sheet/test/standalone/e2e.js index 1802044579..3477762c28 100644 --- a/packages/core/src/components/action-sheet/test/standalone/e2e.js +++ b/packages/core/src/components/action-sheet/test/standalone/e2e.js @@ -8,11 +8,11 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/action-sheet/test/standalone?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#basic'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.action-sheet-container'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.action-sheet-container')))); + 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')))); } } @@ -20,7 +20,7 @@ platforms.forEach(platform => { describe('action-sheet/standalone', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#basic'); }); register('should open action sheet', driver => { diff --git a/packages/core/src/components/alert/test/basic/e2e.js b/packages/core/src/components/alert/test/basic/e2e.js index a7dd21469c..3b2e4b838e 100644 --- a/packages/core/src/components/alert/test/basic/e2e.js +++ b/packages/core/src/components/alert/test/basic/e2e.js @@ -8,16 +8,16 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/alert/test/basic?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#basic'); 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')))); + await this.driver.wait(until.elementLocated(By.css('.alert-wrapper'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.alert-wrapper')))); } - closeWithBackdrop() { + async closeWithBackdrop() { this.driver.findElement(By.css('ion-backdrop')).click(); - return this.driver.wait(until.elementIsNotVisible(this.driver.findElement(By.css('ion-backdrop')))); + return await this.driver.wait(until.elementIsNotVisible(this.driver.findElement(By.css('ion-backdrop')))); } } @@ -25,7 +25,7 @@ platforms.forEach(platform => { describe('alert/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#basic'); }); register('should open basic alert', driver => { diff --git a/packages/core/src/components/alert/test/standalone/e2e.js b/packages/core/src/components/alert/test/standalone/e2e.js index fb533752c5..c33e199c36 100644 --- a/packages/core/src/components/alert/test/standalone/e2e.js +++ b/packages/core/src/components/alert/test/standalone/e2e.js @@ -8,11 +8,11 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/alert/test/standalone?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#basic'); 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')))); + await this.driver.wait(until.elementLocated(By.css('.alert-wrapper'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.alert-wrapper')))); } } @@ -20,7 +20,7 @@ platforms.forEach(platform => { describe('alert/standalone', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#basic'); }); register('should open alert', driver => { diff --git a/packages/core/src/components/badge/test/basic/e2e.js b/packages/core/src/components/badge/test/basic/e2e.js index d077603aa1..4cfe7c8674 100644 --- a/packages/core/src/components/badge/test/basic/e2e.js +++ b/packages/core/src/components/badge/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('badge/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/badge/test/basic/index.html b/packages/core/src/components/badge/test/basic/index.html index 51128501c5..228a464937 100644 --- a/packages/core/src/components/badge/test/basic/index.html +++ b/packages/core/src/components/badge/test/basic/index.html @@ -17,7 +17,7 @@ - + Badges Right diff --git a/packages/core/src/components/button/test/anchor/e2e.js b/packages/core/src/components/button/test/anchor/e2e.js index 8d53fa48be..a912bcb503 100644 --- a/packages/core/src/components/button/test/anchor/e2e.js +++ b/packages/core/src/components/button/test/anchor/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('button/anchor', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/button/test/anchor/index.html b/packages/core/src/components/button/test/anchor/index.html index 0ad924ec8c..6fcb095f82 100644 --- a/packages/core/src/components/button/test/anchor/index.html +++ b/packages/core/src/components/button/test/anchor/index.html @@ -15,7 +15,7 @@ - +

Default Default.activated diff --git a/packages/core/src/components/button/test/basic/e2e.js b/packages/core/src/components/button/test/basic/e2e.js index d5cbe016c6..07290d9eb1 100644 --- a/packages/core/src/components/button/test/basic/e2e.js +++ b/packages/core/src/components/button/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('button/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/button/test/basic/index.html b/packages/core/src/components/button/test/basic/index.html index d45a85f24b..f1f885fc30 100644 --- a/packages/core/src/components/button/test/basic/index.html +++ b/packages/core/src/components/button/test/basic/index.html @@ -15,7 +15,7 @@ - +

Default Default.activated diff --git a/packages/core/src/components/button/test/expand/e2e.js b/packages/core/src/components/button/test/expand/e2e.js index 9316144cf8..f6726e2f72 100644 --- a/packages/core/src/components/button/test/expand/e2e.js +++ b/packages/core/src/components/button/test/expand/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('button/expand', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/button/test/expand/index.html b/packages/core/src/components/button/test/expand/index.html index 6ba07e8d8e..4b6853a13d 100644 --- a/packages/core/src/components/button/test/expand/index.html +++ b/packages/core/src/components/button/test/expand/index.html @@ -15,7 +15,7 @@ - +

Block Full diff --git a/packages/core/src/components/button/test/fill/e2e.js b/packages/core/src/components/button/test/fill/e2e.js index b8d4c09983..fe6fb7e65b 100644 --- a/packages/core/src/components/button/test/fill/e2e.js +++ b/packages/core/src/components/button/test/fill/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('button/fill', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/button/test/fill/index.html b/packages/core/src/components/button/test/fill/index.html index bfbe1cc92e..84ddceb7bc 100644 --- a/packages/core/src/components/button/test/fill/index.html +++ b/packages/core/src/components/button/test/fill/index.html @@ -15,7 +15,7 @@ - +

Default Default.activated diff --git a/packages/core/src/components/button/test/icon/e2e.js b/packages/core/src/components/button/test/icon/e2e.js index 421a5fc408..578aebeb07 100644 --- a/packages/core/src/components/button/test/icon/e2e.js +++ b/packages/core/src/components/button/test/icon/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('button/icon', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/button/test/icon/index.html b/packages/core/src/components/button/test/icon/index.html index da43518133..d5ac58b47a 100644 --- a/packages/core/src/components/button/test/icon/index.html +++ b/packages/core/src/components/button/test/icon/index.html @@ -15,7 +15,7 @@ - +

diff --git a/packages/core/src/components/button/test/round/e2e.js b/packages/core/src/components/button/test/round/e2e.js index 93dc4aaddb..ed747bbb00 100644 --- a/packages/core/src/components/button/test/round/e2e.js +++ b/packages/core/src/components/button/test/round/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('button/round', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/button/test/round/index.html b/packages/core/src/components/button/test/round/index.html index 0e2ab05ee1..7b9d7a781d 100644 --- a/packages/core/src/components/button/test/round/index.html +++ b/packages/core/src/components/button/test/round/index.html @@ -15,7 +15,7 @@ - + Button Button Light Button Secondary diff --git a/packages/core/src/components/button/test/size/e2e.js b/packages/core/src/components/button/test/size/e2e.js index f24e1717ac..2d4cfd8fb3 100644 --- a/packages/core/src/components/button/test/size/e2e.js +++ b/packages/core/src/components/button/test/size/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('button/size', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/button/test/size/index.html b/packages/core/src/components/button/test/size/index.html index eae8d7797d..1c36fc8d51 100644 --- a/packages/core/src/components/button/test/size/index.html +++ b/packages/core/src/components/button/test/size/index.html @@ -15,7 +15,7 @@ - +

Default Default diff --git a/packages/core/src/components/button/test/strong/e2e.js b/packages/core/src/components/button/test/strong/e2e.js index c9232a5576..6369180065 100644 --- a/packages/core/src/components/button/test/strong/e2e.js +++ b/packages/core/src/components/button/test/strong/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('button/strong', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/button/test/strong/index.html b/packages/core/src/components/button/test/strong/index.html index 3f39268901..1268e982ed 100644 --- a/packages/core/src/components/button/test/strong/index.html +++ b/packages/core/src/components/button/test/strong/index.html @@ -15,7 +15,7 @@ - +

Default

Outline

Clear

diff --git a/packages/core/src/components/button/test/toolbar/e2e.js b/packages/core/src/components/button/test/toolbar/e2e.js index 6224e33672..6393eab694 100644 --- a/packages/core/src/components/button/test/toolbar/e2e.js +++ b/packages/core/src/components/button/test/toolbar/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('button/toolbar', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/button/test/toolbar/index.html b/packages/core/src/components/button/test/toolbar/index.html index 63bd6c2848..1601a75f45 100644 --- a/packages/core/src/components/button/test/toolbar/index.html +++ b/packages/core/src/components/button/test/toolbar/index.html @@ -15,7 +15,7 @@ - + This should have no padding diff --git a/packages/core/src/components/card/test/basic/e2e.js b/packages/core/src/components/card/test/basic/e2e.js index a9386f2197..e4e2c0dd9d 100644 --- a/packages/core/src/components/card/test/basic/e2e.js +++ b/packages/core/src/components/card/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('card/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/card/test/basic/index.html b/packages/core/src/components/card/test/basic/index.html index 45749f2e8c..58dd5a68aa 100644 --- a/packages/core/src/components/card/test/basic/index.html +++ b/packages/core/src/components/card/test/basic/index.html @@ -17,7 +17,7 @@ - + Card Header diff --git a/packages/core/src/components/checkbox/test/basic/e2e.js b/packages/core/src/components/checkbox/test/basic/e2e.js index 9076f9105c..27eb8be7a3 100644 --- a/packages/core/src/components/checkbox/test/basic/e2e.js +++ b/packages/core/src/components/checkbox/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('checkbox/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/checkbox/test/basic/index.html b/packages/core/src/components/checkbox/test/basic/index.html index 4381ce799c..821181463e 100644 --- a/packages/core/src/components/checkbox/test/basic/index.html +++ b/packages/core/src/components/checkbox/test/basic/index.html @@ -15,7 +15,7 @@ - + Default diff --git a/packages/core/src/components/chip/test/basic/e2e.js b/packages/core/src/components/chip/test/basic/e2e.js index f5b5eac4cb..c0658a060d 100644 --- a/packages/core/src/components/chip/test/basic/e2e.js +++ b/packages/core/src/components/chip/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('chip/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/chip/test/basic/index.html b/packages/core/src/components/chip/test/basic/index.html index 25f7cb4f32..5f27b7676c 100644 --- a/packages/core/src/components/chip/test/basic/index.html +++ b/packages/core/src/components/chip/test/basic/index.html @@ -15,7 +15,7 @@ - +

Text Chips

diff --git a/packages/core/src/components/content/test/basic/e2e.js b/packages/core/src/components/content/test/basic/e2e.js index 415a6efcb8..9229a0a4f1 100644 --- a/packages/core/src/components/content/test/basic/e2e.js +++ b/packages/core/src/components/content/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('content/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/datetime/test/basic/e2e.js b/packages/core/src/components/datetime/test/basic/e2e.js index bce2cd351a..5b3a5b8f45 100644 --- a/packages/core/src/components/datetime/test/basic/e2e.js +++ b/packages/core/src/components/datetime/test/basic/e2e.js @@ -8,11 +8,11 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/datetime/test/basic?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#content'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.picker-wrapper'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.picker-wrapper')))); + await this.driver.wait(until.elementLocated(By.css('.picker-wrapper'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.picker-wrapper')))); } } @@ -20,7 +20,7 @@ platforms.forEach(platform => { describe('datetime/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); register('should open custom picker', driver => { diff --git a/packages/core/src/components/datetime/test/basic/index.html b/packages/core/src/components/datetime/test/basic/index.html index 18b51117b0..f2401a3504 100644 --- a/packages/core/src/components/datetime/test/basic/index.html +++ b/packages/core/src/components/datetime/test/basic/index.html @@ -15,7 +15,7 @@ - + MMMM diff --git a/packages/core/src/components/datetime/test/standalone/e2e.js b/packages/core/src/components/datetime/test/standalone/e2e.js index 07a9c5d3d0..5d9c4205f2 100644 --- a/packages/core/src/components/datetime/test/standalone/e2e.js +++ b/packages/core/src/components/datetime/test/standalone/e2e.js @@ -8,11 +8,11 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/datetime/test/standalone?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#basic'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.picker-wrapper'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.picker-wrapper')))); + await this.driver.wait(until.elementLocated(By.css('.picker-wrapper'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.picker-wrapper')))); } } @@ -20,7 +20,7 @@ platforms.forEach(platform => { describe('datetime/standalone', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#basic'); }); register('should open basic picker', driver => { diff --git a/packages/core/src/components/events/test/basic/e2e.js b/packages/core/src/components/events/test/basic/e2e.js index 67b037a968..de98bfd31a 100644 --- a/packages/core/src/components/events/test/basic/e2e.js +++ b/packages/core/src/components/events/test/basic/e2e.js @@ -11,11 +11,11 @@ class E2ETestPage extends Page { } platforms.forEach(platform => { - describe('events/basic', () => { + describe.skip('events/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); /*register('subscribers should receive event on or shortly after button click', async (driver, testContext) => { diff --git a/packages/core/src/components/events/test/basic/index.html b/packages/core/src/components/events/test/basic/index.html index 42bf69a9dc..485e03542c 100644 --- a/packages/core/src/components/events/test/basic/index.html +++ b/packages/core/src/components/events/test/basic/index.html @@ -18,7 +18,7 @@ - +
diff --git a/packages/core/src/components/fab/test/basic/e2e.js b/packages/core/src/components/fab/test/basic/e2e.js index bbd552f512..d190fbc264 100644 --- a/packages/core/src/components/fab/test/basic/e2e.js +++ b/packages/core/src/components/fab/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('fab/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/fab/test/basic/index.html b/packages/core/src/components/fab/test/basic/index.html index 7ade5c0dd7..27fd83a8d8 100644 --- a/packages/core/src/components/fab/test/basic/index.html +++ b/packages/core/src/components/fab/test/basic/index.html @@ -15,7 +15,7 @@ - + diff --git a/packages/core/src/components/fab/test/standalone/e2e.js b/packages/core/src/components/fab/test/standalone/e2e.js index c70d1fbd21..f127a1103e 100644 --- a/packages/core/src/components/fab/test/standalone/e2e.js +++ b/packages/core/src/components/fab/test/standalone/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('fab/standalone', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#fab5'); }); }); }); diff --git a/packages/core/src/components/grid/test/basic/e2e.js b/packages/core/src/components/grid/test/basic/e2e.js index 0079c49115..67e3a1bf73 100644 --- a/packages/core/src/components/grid/test/basic/e2e.js +++ b/packages/core/src/components/grid/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('grid/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/grid/test/basic/index.html b/packages/core/src/components/grid/test/basic/index.html index f77ff2ad7f..f44df0a9c3 100644 --- a/packages/core/src/components/grid/test/basic/index.html +++ b/packages/core/src/components/grid/test/basic/index.html @@ -15,7 +15,7 @@ - + diff --git a/packages/core/src/components/icon/test/basic/e2e.js b/packages/core/src/components/icon/test/basic/e2e.js index a57ba6281f..42de526619 100644 --- a/packages/core/src/components/icon/test/basic/e2e.js +++ b/packages/core/src/components/icon/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('icon/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/icon/test/basic/index.html b/packages/core/src/components/icon/test/basic/index.html index abeb5975af..46d8f33100 100644 --- a/packages/core/src/components/icon/test/basic/index.html +++ b/packages/core/src/components/icon/test/basic/index.html @@ -17,7 +17,7 @@ - + diff --git a/packages/core/src/components/icon/test/items/e2e.js b/packages/core/src/components/icon/test/items/e2e.js index 4ab545bb37..9f3a7909c6 100644 --- a/packages/core/src/components/icon/test/items/e2e.js +++ b/packages/core/src/components/icon/test/items/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('icon/items', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/icon/test/items/index.html b/packages/core/src/components/icon/test/items/index.html index 689e82cfe7..e79b104c3b 100644 --- a/packages/core/src/components/icon/test/items/index.html +++ b/packages/core/src/components/icon/test/items/index.html @@ -23,7 +23,7 @@ - + diff --git a/packages/core/src/components/input/test/basic/e2e.js b/packages/core/src/components/input/test/basic/e2e.js index 99767891a0..aba666f0a9 100644 --- a/packages/core/src/components/input/test/basic/e2e.js +++ b/packages/core/src/components/input/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('input/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/input/test/basic/index.html b/packages/core/src/components/input/test/basic/index.html index 76e1909b67..06aa074fda 100644 --- a/packages/core/src/components/input/test/basic/index.html +++ b/packages/core/src/components/input/test/basic/index.html @@ -15,7 +15,7 @@ - + diff --git a/packages/core/src/components/item-sliding/test/basic/e2e.js b/packages/core/src/components/item-sliding/test/basic/e2e.js index ef1fa0b14e..575de6af60 100644 --- a/packages/core/src/components/item-sliding/test/basic/e2e.js +++ b/packages/core/src/components/item-sliding/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item-sliding/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#list'); }); }); }); diff --git a/packages/core/src/components/item/test/basic/e2e.js b/packages/core/src/components/item/test/basic/e2e.js index 61d4cd1d9f..a4de47c72f 100644 --- a/packages/core/src/components/item/test/basic/e2e.js +++ b/packages/core/src/components/item/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/basic/index.html b/packages/core/src/components/item/test/basic/index.html index cb3dca623f..241b9e36a2 100644 --- a/packages/core/src/components/item/test/basic/index.html +++ b/packages/core/src/components/item/test/basic/index.html @@ -17,7 +17,7 @@ - + diff --git a/packages/core/src/components/item/test/buttons/e2e.js b/packages/core/src/components/item/test/buttons/e2e.js index 5ebee907b1..0b38c8c3fd 100644 --- a/packages/core/src/components/item/test/buttons/e2e.js +++ b/packages/core/src/components/item/test/buttons/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/buttons', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/buttons/index.html b/packages/core/src/components/item/test/buttons/index.html index 413a948960..03f89e02d3 100644 --- a/packages/core/src/components/item/test/buttons/index.html +++ b/packages/core/src/components/item/test/buttons/index.html @@ -15,7 +15,7 @@ - + a[ion-item] diff --git a/packages/core/src/components/item/test/colors/e2e.js b/packages/core/src/components/item/test/colors/e2e.js index a687dd5dfe..0fd44bfe24 100644 --- a/packages/core/src/components/item/test/colors/e2e.js +++ b/packages/core/src/components/item/test/colors/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/colors', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/colors/index.html b/packages/core/src/components/item/test/colors/index.html index 473d61e71b..6d717a2611 100644 --- a/packages/core/src/components/item/test/colors/index.html +++ b/packages/core/src/components/item/test/colors/index.html @@ -15,7 +15,7 @@ - +

Heading

diff --git a/packages/core/src/components/item/test/dividers/e2e.js b/packages/core/src/components/item/test/dividers/e2e.js index d257bf50e0..2a64e26ebf 100644 --- a/packages/core/src/components/item/test/dividers/e2e.js +++ b/packages/core/src/components/item/test/dividers/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/dividers', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/dividers/index.html b/packages/core/src/components/item/test/dividers/index.html index 9503ee41c6..24718623b2 100644 --- a/packages/core/src/components/item/test/dividers/index.html +++ b/packages/core/src/components/item/test/dividers/index.html @@ -18,7 +18,7 @@ - + Divider by itself diff --git a/packages/core/src/components/item/test/groups/e2e.js b/packages/core/src/components/item/test/groups/e2e.js index 3abf199e93..323a5c5c15 100644 --- a/packages/core/src/components/item/test/groups/e2e.js +++ b/packages/core/src/components/item/test/groups/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/groups', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/groups/index.html b/packages/core/src/components/item/test/groups/index.html index d0aa5de930..b778de23ae 100644 --- a/packages/core/src/components/item/test/groups/index.html +++ b/packages/core/src/components/item/test/groups/index.html @@ -22,7 +22,7 @@ - + @@ -496,4 +496,4 @@ function reload() { window.location.reload(true); } - \ No newline at end of file + diff --git a/packages/core/src/components/item/test/icons/e2e.js b/packages/core/src/components/item/test/icons/e2e.js index f02bd83471..5a819e4b3f 100644 --- a/packages/core/src/components/item/test/icons/e2e.js +++ b/packages/core/src/components/item/test/icons/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/icons', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/icons/index.html b/packages/core/src/components/item/test/icons/index.html index 36a326b836..4c16a86c5b 100644 --- a/packages/core/src/components/item/test/icons/index.html +++ b/packages/core/src/components/item/test/icons/index.html @@ -17,7 +17,7 @@ - + ion-item [detail-push] attr diff --git a/packages/core/src/components/item/test/images/e2e.js b/packages/core/src/components/item/test/images/e2e.js index 060ef4ce67..d1ee3ce468 100644 --- a/packages/core/src/components/item/test/images/e2e.js +++ b/packages/core/src/components/item/test/images/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/images', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/images/index.html b/packages/core/src/components/item/test/images/index.html index 842cc4d7fd..2c838468e3 100644 --- a/packages/core/src/components/item/test/images/index.html +++ b/packages/core/src/components/item/test/images/index.html @@ -17,7 +17,7 @@ - + Plain Ol' div w/ some text, no images diff --git a/packages/core/src/components/item/test/inputs/e2e.js b/packages/core/src/components/item/test/inputs/e2e.js index 769851a77d..a039e5ee0c 100644 --- a/packages/core/src/components/item/test/inputs/e2e.js +++ b/packages/core/src/components/item/test/inputs/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/inputs', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#item'); }); }); }); diff --git a/packages/core/src/components/item/test/media/e2e.js b/packages/core/src/components/item/test/media/e2e.js index 177fb89cfc..fe16196260 100644 --- a/packages/core/src/components/item/test/media/e2e.js +++ b/packages/core/src/components/item/test/media/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/media', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/media/index.html b/packages/core/src/components/item/test/media/index.html index fc3dfbacac..60f798ad4b 100644 --- a/packages/core/src/components/item/test/media/index.html +++ b/packages/core/src/components/item/test/media/index.html @@ -17,7 +17,7 @@ - + diff --git a/packages/core/src/components/item/test/reorder/e2e.js b/packages/core/src/components/item/test/reorder/e2e.js index 83e9917c9c..5cbf9f74f1 100644 --- a/packages/core/src/components/item/test/reorder/e2e.js +++ b/packages/core/src/components/item/test/reorder/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/reorder', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/reorder/index.html b/packages/core/src/components/item/test/reorder/index.html index f13328c6a3..ec6b14e4b2 100644 --- a/packages/core/src/components/item/test/reorder/index.html +++ b/packages/core/src/components/item/test/reorder/index.html @@ -19,7 +19,7 @@ - + diff --git a/packages/core/src/components/item/test/sliding/e2e.js b/packages/core/src/components/item/test/sliding/e2e.js index 9521a87ddb..0b983d5bba 100644 --- a/packages/core/src/components/item/test/sliding/e2e.js +++ b/packages/core/src/components/item/test/sliding/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/sliding', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/sliding/index.html b/packages/core/src/components/item/test/sliding/index.html index 13e2d0deda..1c283298c6 100644 --- a/packages/core/src/components/item/test/sliding/index.html +++ b/packages/core/src/components/item/test/sliding/index.html @@ -21,7 +21,7 @@ - +
Toggle sliding diff --git a/packages/core/src/components/item/test/text/e2e.js b/packages/core/src/components/item/test/text/e2e.js index fc86eb884a..1ac6bb4cdb 100644 --- a/packages/core/src/components/item/test/text/e2e.js +++ b/packages/core/src/components/item/test/text/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('item/text', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/item/test/text/index.html b/packages/core/src/components/item/test/text/index.html index 47daaea0a0..4135e9ed88 100644 --- a/packages/core/src/components/item/test/text/index.html +++ b/packages/core/src/components/item/test/text/index.html @@ -17,7 +17,7 @@ - + diff --git a/packages/core/src/components/list/test/basic/e2e.js b/packages/core/src/components/list/test/basic/e2e.js index 92c74ac100..23f88ca0f2 100644 --- a/packages/core/src/components/list/test/basic/e2e.js +++ b/packages/core/src/components/list/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('list/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/list/test/basic/index.html b/packages/core/src/components/list/test/basic/index.html index 9d3941bb7a..92982e17c2 100644 --- a/packages/core/src/components/list/test/basic/index.html +++ b/packages/core/src/components/list/test/basic/index.html @@ -15,7 +15,7 @@ - + Pokémon Yellow Super Metroid diff --git a/packages/core/src/components/loading/test/basic/e2e.js b/packages/core/src/components/loading/test/basic/e2e.js index aad740b4cc..1ef562bdb9 100644 --- a/packages/core/src/components/loading/test/basic/e2e.js +++ b/packages/core/src/components/loading/test/basic/e2e.js @@ -8,11 +8,11 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/loading/test/basic?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#basic'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.loading-wrapper'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.loading-wrapper')))); + await this.driver.wait(until.elementLocated(By.css('.loading-wrapper'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.loading-wrapper')))); } } @@ -20,7 +20,7 @@ platforms.forEach(platform => { describe('loading/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#basic'); }); register('should open loading', driver => { diff --git a/packages/core/src/components/loading/test/standalone/e2e.js b/packages/core/src/components/loading/test/standalone/e2e.js index ccc70c7bc8..448b20ff12 100644 --- a/packages/core/src/components/loading/test/standalone/e2e.js +++ b/packages/core/src/components/loading/test/standalone/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('loading/standalone', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#basic'); }); }); }); diff --git a/packages/core/src/components/loading/test/standalone/index.html b/packages/core/src/components/loading/test/standalone/index.html index 66432e49dd..fffe441d49 100644 --- a/packages/core/src/components/loading/test/standalone/index.html +++ b/packages/core/src/components/loading/test/standalone/index.html @@ -9,7 +9,7 @@ - Show Loading + Show Loading diff --git a/packages/core/src/components/menu/test/basic/e2e.js b/packages/core/src/components/menu/test/basic/e2e.js index 4c571ff22d..9718621220 100644 --- a/packages/core/src/components/menu/test/basic/e2e.js +++ b/packages/core/src/components/menu/test/basic/e2e.js @@ -8,19 +8,19 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/menu/test/basic?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#left'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.menu-inner'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.menu-inner')))); + await this.driver.wait(until.elementLocated(By.css('.menu-inner'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.menu-inner')))); } } platforms.forEach(platform => { - describe('menu/basic', () => { + describe.skip('menu/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#left'); }); register('should open left menu', driver => { diff --git a/packages/core/src/components/modal/test/basic/e2e.js b/packages/core/src/components/modal/test/basic/e2e.js index 90f9262f37..a584b5350f 100644 --- a/packages/core/src/components/modal/test/basic/e2e.js +++ b/packages/core/src/components/modal/test/basic/e2e.js @@ -8,11 +8,11 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/modal/test/basic?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#presentModal'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.modal-wrapper'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.modal-wrapper')))); + await this.driver.wait(until.elementLocated(By.css('.modal-wrapper'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.modal-wrapper')))); } } @@ -20,7 +20,7 @@ platforms.forEach(platform => { describe('modal/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#presentModal'); }); }); }); diff --git a/packages/core/src/components/modal/test/basic/index.html b/packages/core/src/components/modal/test/basic/index.html index 418164d945..43866e9c87 100644 --- a/packages/core/src/components/modal/test/basic/index.html +++ b/packages/core/src/components/modal/test/basic/index.html @@ -20,7 +20,7 @@

- Present modal + Present modal

diff --git a/packages/core/src/components/modal/test/standalone/e2e.js b/packages/core/src/components/modal/test/standalone/e2e.js index 6b78da6263..0fa1f05e61 100644 --- a/packages/core/src/components/modal/test/standalone/e2e.js +++ b/packages/core/src/components/modal/test/standalone/e2e.js @@ -8,11 +8,11 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/modal/test/standalone?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#basic'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.modal-wrapper'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.modal-wrapper')))); + await this.driver.wait(until.elementLocated(By.css('.modal-wrapper'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.modal-wrapper')))); } } @@ -20,7 +20,7 @@ platforms.forEach(platform => { describe('modal/standalone', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#basic'); }); register('shows basic modal', driver => { diff --git a/packages/core/src/components/popover/test/basic/e2e.js b/packages/core/src/components/popover/test/basic/e2e.js index 48b81c8393..0830c30576 100644 --- a/packages/core/src/components/popover/test/basic/e2e.js +++ b/packages/core/src/components/popover/test/basic/e2e.js @@ -8,11 +8,11 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/popover/test/basic?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#content'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.popover-wrapper'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.popover-wrapper')))); + await this.driver.wait(until.elementLocated(By.css('.popover-wrapper'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.popover-wrapper')))); } } @@ -20,7 +20,7 @@ platforms.forEach(platform => { describe('popover/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/popover/test/basic/index.html b/packages/core/src/components/popover/test/basic/index.html index 0b34856e05..54f30ccd85 100644 --- a/packages/core/src/components/popover/test/basic/index.html +++ b/packages/core/src/components/popover/test/basic/index.html @@ -22,7 +22,7 @@ - + Show Popover Show Translucent Popover Show Long List Popover diff --git a/packages/core/src/components/popover/test/standalone/e2e.js b/packages/core/src/components/popover/test/standalone/e2e.js index a98658cc74..503556ddb6 100644 --- a/packages/core/src/components/popover/test/standalone/e2e.js +++ b/packages/core/src/components/popover/test/standalone/e2e.js @@ -8,11 +8,11 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/popover/test/standalone?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#basic'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.popover-wrapper'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.popover-wrapper')))); + await this.driver.wait(until.elementLocated(By.css('.popover-wrapper'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.popover-wrapper')))); } } @@ -20,7 +20,7 @@ platforms.forEach(platform => { describe('popover/standalone', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#basic'); }); register('shows basic popover', driver => { diff --git a/packages/core/src/components/radio/test/basic/e2e.js b/packages/core/src/components/radio/test/basic/e2e.js index 6a7d8ebe09..e7874aa3eb 100644 --- a/packages/core/src/components/radio/test/basic/e2e.js +++ b/packages/core/src/components/radio/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('radio/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/radio/test/basic/index.html b/packages/core/src/components/radio/test/basic/index.html index 59a0aa241d..ccaf0a3fad 100644 --- a/packages/core/src/components/radio/test/basic/index.html +++ b/packages/core/src/components/radio/test/basic/index.html @@ -15,7 +15,7 @@ - + diff --git a/packages/core/src/components/radio/test/standalone/e2e.js b/packages/core/src/components/radio/test/standalone/e2e.js index a4d2494ea5..14a164c206 100644 --- a/packages/core/src/components/radio/test/standalone/e2e.js +++ b/packages/core/src/components/radio/test/standalone/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('radio/standalone', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#radio2'); }); }); }); diff --git a/packages/core/src/components/radio/test/standalone/index.html b/packages/core/src/components/radio/test/standalone/index.html index 19613e23b0..afccec1483 100644 --- a/packages/core/src/components/radio/test/standalone/index.html +++ b/packages/core/src/components/radio/test/standalone/index.html @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/packages/core/src/components/range/test/basic/e2e.js b/packages/core/src/components/range/test/basic/e2e.js index 4dff6faf5f..360cd3ad9d 100644 --- a/packages/core/src/components/range/test/basic/e2e.js +++ b/packages/core/src/components/range/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('range/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/range/test/basic/index.html b/packages/core/src/components/range/test/basic/index.html index 1400a978c6..a1bebe1f2c 100644 --- a/packages/core/src/components/range/test/basic/index.html +++ b/packages/core/src/components/range/test/basic/index.html @@ -17,7 +17,7 @@ - + Range color diff --git a/packages/core/src/components/refresher/test/basic/e2e.js b/packages/core/src/components/refresher/test/basic/e2e.js index e2d9c0bd1a..bbb0608497 100644 --- a/packages/core/src/components/refresher/test/basic/e2e.js +++ b/packages/core/src/components/refresher/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('refresher/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#list'); }); }); }); diff --git a/packages/core/src/components/reorder/test/basic/e2e.js b/packages/core/src/components/reorder/test/basic/e2e.js index d759fdd1f0..47cdbf7618 100644 --- a/packages/core/src/components/reorder/test/basic/e2e.js +++ b/packages/core/src/components/reorder/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('reorder/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/reorder/test/basic/index.html b/packages/core/src/components/reorder/test/basic/index.html index 2e06b9cdd5..313af8ce14 100644 --- a/packages/core/src/components/reorder/test/basic/index.html +++ b/packages/core/src/components/reorder/test/basic/index.html @@ -20,7 +20,7 @@ - + diff --git a/packages/core/src/components/searchbar/test/basic/e2e.js b/packages/core/src/components/searchbar/test/basic/e2e.js index f348598cc0..b0073d162c 100644 --- a/packages/core/src/components/searchbar/test/basic/e2e.js +++ b/packages/core/src/components/searchbar/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('searchbar/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/searchbar/test/basic/index.html b/packages/core/src/components/searchbar/test/basic/index.html index 29a0b03d32..87c1b8093e 100644 --- a/packages/core/src/components/searchbar/test/basic/index.html +++ b/packages/core/src/components/searchbar/test/basic/index.html @@ -17,7 +17,7 @@ - +
Search - Default
diff --git a/packages/core/src/components/searchbar/test/standalone/e2e.js b/packages/core/src/components/searchbar/test/standalone/e2e.js index d4bbe2aa26..6dd999516e 100644 --- a/packages/core/src/components/searchbar/test/standalone/e2e.js +++ b/packages/core/src/components/searchbar/test/standalone/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('searchbar/standalone', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#dynamicProp'); }); }); }); diff --git a/packages/core/src/components/segment/test/basic/e2e.js b/packages/core/src/components/segment/test/basic/e2e.js index 74e8641e6c..22c78cbfe2 100644 --- a/packages/core/src/components/segment/test/basic/e2e.js +++ b/packages/core/src/components/segment/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('segment/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#dynamicAttrElem'); }); }); }); diff --git a/packages/core/src/components/segment/test/standalone/e2e.js b/packages/core/src/components/segment/test/standalone/e2e.js index 11f7eefd24..21731b218d 100644 --- a/packages/core/src/components/segment/test/standalone/e2e.js +++ b/packages/core/src/components/segment/test/standalone/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('segment/standalone', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#browserSegment'); }); }); }); diff --git a/packages/core/src/components/select/test/basic/e2e.js b/packages/core/src/components/select/test/basic/e2e.js index f516f6e612..af652ff0dc 100644 --- a/packages/core/src/components/select/test/basic/e2e.js +++ b/packages/core/src/components/select/test/basic/e2e.js @@ -14,7 +14,7 @@ platforms.forEach(platform => { describe('select/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#gender'); }); register('should open gender single select', driver => { diff --git a/packages/core/src/components/select/test/multiple-value/e2e.js b/packages/core/src/components/select/test/multiple-value/e2e.js index e2287b9a64..82326804ce 100644 --- a/packages/core/src/components/select/test/multiple-value/e2e.js +++ b/packages/core/src/components/select/test/multiple-value/e2e.js @@ -14,7 +14,7 @@ platforms.forEach(platform => { describe('select/multiple-value', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#toppings'); }); register('should open toppings multiple select', driver => { diff --git a/packages/core/src/components/select/test/single-value/e2e.js b/packages/core/src/components/select/test/single-value/e2e.js index 026d5e3a9c..276c8e9101 100644 --- a/packages/core/src/components/select/test/single-value/e2e.js +++ b/packages/core/src/components/select/test/single-value/e2e.js @@ -14,7 +14,7 @@ platforms.forEach(platform => { describe('select/single-value', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#gender'); }); register('should open gender single select', driver => { diff --git a/packages/core/src/components/slides/test/basic/e2e.js b/packages/core/src/components/slides/test/basic/e2e.js index 4e66ab939b..a1381be608 100644 --- a/packages/core/src/components/slides/test/basic/e2e.js +++ b/packages/core/src/components/slides/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('slides/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/slides/test/basic/index.html b/packages/core/src/components/slides/test/basic/index.html index 5ab885a700..50f825e54b 100644 --- a/packages/core/src/components/slides/test/basic/index.html +++ b/packages/core/src/components/slides/test/basic/index.html @@ -12,7 +12,7 @@ - +

Slide 1

diff --git a/packages/core/src/components/spinner/test/basic/e2e.js b/packages/core/src/components/spinner/test/basic/e2e.js index 838b8dfc1f..24f381af9a 100644 --- a/packages/core/src/components/spinner/test/basic/e2e.js +++ b/packages/core/src/components/spinner/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('spinner/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/spinner/test/basic/index.html b/packages/core/src/components/spinner/test/basic/index.html index 5733a6b575..cce226e713 100644 --- a/packages/core/src/components/spinner/test/basic/index.html +++ b/packages/core/src/components/spinner/test/basic/index.html @@ -15,7 +15,7 @@ - + Spinner Loading Indicators diff --git a/packages/core/src/components/spinner/test/color/e2e.js b/packages/core/src/components/spinner/test/color/e2e.js index 40cd46be32..b40e6a88da 100644 --- a/packages/core/src/components/spinner/test/color/e2e.js +++ b/packages/core/src/components/spinner/test/color/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('spinner/color', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/spinner/test/color/index.html b/packages/core/src/components/spinner/test/color/index.html index b939e5d7a1..583770efc1 100644 --- a/packages/core/src/components/spinner/test/color/index.html +++ b/packages/core/src/components/spinner/test/color/index.html @@ -15,7 +15,7 @@ - + Spinner Loading Indicators diff --git a/packages/core/src/components/split-pane/test/basic/e2e.js b/packages/core/src/components/split-pane/test/basic/e2e.js index bc953df8d9..9131fc8162 100644 --- a/packages/core/src/components/split-pane/test/basic/e2e.js +++ b/packages/core/src/components/split-pane/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('split-pane/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#splitPane'); }); }); }); diff --git a/packages/core/src/components/split-pane/test/basic/index.html b/packages/core/src/components/split-pane/test/basic/index.html index bca2186f8e..4ac83cbc4f 100644 --- a/packages/core/src/components/split-pane/test/basic/index.html +++ b/packages/core/src/components/split-pane/test/basic/index.html @@ -10,7 +10,7 @@ - + diff --git a/packages/core/src/components/text/test/basic/e2e.js b/packages/core/src/components/text/test/basic/e2e.js index b1bccb5e6b..0b9f6b6be3 100644 --- a/packages/core/src/components/text/test/basic/e2e.js +++ b/packages/core/src/components/text/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('text/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/text/test/basic/index.html b/packages/core/src/components/text/test/basic/index.html index ee0d59bcf4..d5e159d0a9 100644 --- a/packages/core/src/components/text/test/basic/index.html +++ b/packages/core/src/components/text/test/basic/index.html @@ -15,7 +15,7 @@ - +

H1: The quick brown fox jumps over the lazy dog

diff --git a/packages/core/src/components/textarea/test/basic/e2e.js b/packages/core/src/components/textarea/test/basic/e2e.js index 4a6e8a3453..dd4ca74b79 100644 --- a/packages/core/src/components/textarea/test/basic/e2e.js +++ b/packages/core/src/components/textarea/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('textarea/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/textarea/test/basic/index.html b/packages/core/src/components/textarea/test/basic/index.html index fa4c438f18..baa629a747 100644 --- a/packages/core/src/components/textarea/test/basic/index.html +++ b/packages/core/src/components/textarea/test/basic/index.html @@ -15,7 +15,7 @@ - + diff --git a/packages/core/src/components/thumbnail/test/basic/e2e.js b/packages/core/src/components/thumbnail/test/basic/e2e.js index 60e96c8edc..b9b34ebc5f 100644 --- a/packages/core/src/components/thumbnail/test/basic/e2e.js +++ b/packages/core/src/components/thumbnail/test/basic/e2e.js @@ -13,7 +13,7 @@ platforms.forEach(platform => { describe('thumbnail/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); }); }); diff --git a/packages/core/src/components/thumbnail/test/basic/index.html b/packages/core/src/components/thumbnail/test/basic/index.html index e34f0fb37b..63d2dc1de0 100644 --- a/packages/core/src/components/thumbnail/test/basic/index.html +++ b/packages/core/src/components/thumbnail/test/basic/index.html @@ -17,7 +17,7 @@ - + diff --git a/packages/core/src/components/toast/test/basic/e2e.js b/packages/core/src/components/toast/test/basic/e2e.js index eb3a80dd09..ab4f746b28 100644 --- a/packages/core/src/components/toast/test/basic/e2e.js +++ b/packages/core/src/components/toast/test/basic/e2e.js @@ -8,16 +8,16 @@ class E2ETestPage extends Page { super(driver, `http://localhost:3333/src/components/toast/test/basic?ionicplatform=${platform}`); } - present(buttonId) { - this.navigate(); + async present(buttonId) { + await this.navigate('#content'); this.driver.findElement(By.id(buttonId)).click(); - this.driver.wait(until.elementLocated(By.css('.toast-wrapper'))); - return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.toast-wrapper')))); + await this.driver.wait(until.elementLocated(By.css('.toast-wrapper'))); + return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.toast-wrapper')))); } - closeWithBackdrop() { + async closeWithBackdrop() { this.driver.findElement(By.css('ion-backdrop')).click(); - return this.driver.wait(until.elementIsNotVisible(this.driver.findElement(By.css('ion-backdrop')))); + return await this.driver.wait(until.elementIsNotVisible(this.driver.findElement(By.css('ion-backdrop')))); } } @@ -25,7 +25,7 @@ platforms.forEach(platform => { describe('toast/basic', () => { register('should init', driver => { const page = new E2ETestPage(driver, platform); - return page.navigate(); + return page.navigate('#content'); }); register('shows bottom toast', driver => { diff --git a/packages/core/src/components/toast/test/basic/index.html b/packages/core/src/components/toast/test/basic/index.html index f2f8a102ca..f8c8a18e95 100644 --- a/packages/core/src/components/toast/test/basic/index.html +++ b/packages/core/src/components/toast/test/basic/index.html @@ -17,7 +17,7 @@ - + Show Toast Bottom Show Toast Top Show Toast Middle @@ -61,7 +61,7 @@