From 0f616338d7d6409fa0cc70aeb29482c0e7cf3faa Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 7 Feb 2018 13:03:34 -0500 Subject: [PATCH] tests(standalone): update standalone overlay tests to remove buttons having the ion-buttons in the standalone tests was providing button styles that some of the components needed, we need to make sure they look good without those styles --- .../action-sheet/test/standalone/e2e.js | 38 ++- .../action-sheet/test/standalone/index.html | 310 +++++++++++++++++- .../components/alert/test/standalone/e2e.js | 42 ++- .../item-divider/test/standalone/index.html | 2 +- .../item/test/standalone/index.html | 4 +- .../components/loading/test/basic/index.html | 1 + .../components/loading/test/standalone/e2e.js | 12 + .../loading/test/standalone/index.html | 27 +- .../menu/test/standalone/index.html | 30 +- .../modal/test/standalone/index.html | 16 +- .../popover/test/standalone/index.html | 59 +++- .../components/toast/test/basic/index.html | 1 + .../toast/test/standalone/index.html | 32 +- 13 files changed, 555 insertions(+), 19 deletions(-) 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 3477762c28..5f372c56a8 100644 --- a/packages/core/src/components/action-sheet/test/standalone/e2e.js +++ b/packages/core/src/components/action-sheet/test/standalone/e2e.js @@ -1,7 +1,7 @@ '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) { @@ -14,6 +14,11 @@ class E2ETestPage extends Page { 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 => { @@ -27,5 +32,36 @@ platforms.forEach(platform => { 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/packages/core/src/components/action-sheet/test/standalone/index.html b/packages/core/src/components/action-sheet/test/standalone/index.html index 232cc2d3de..ad74465867 100644 --- a/packages/core/src/components/action-sheet/test/standalone/index.html +++ b/packages/core/src/components/action-sheet/test/standalone/index.html @@ -9,14 +9,34 @@ - Basic + + + + + + + + - diff --git a/packages/core/src/components/alert/test/standalone/e2e.js b/packages/core/src/components/alert/test/standalone/e2e.js index c33e199c36..175adc860b 100644 --- a/packages/core/src/components/alert/test/standalone/e2e.js +++ b/packages/core/src/components/alert/test/standalone/e2e.js @@ -14,6 +14,11 @@ class E2ETestPage extends Page { await this.driver.wait(until.elementLocated(By.css('.alert-wrapper'))); return await this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.alert-wrapper')))); } + + 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 => { @@ -23,9 +28,44 @@ platforms.forEach(platform => { return page.navigate('#basic'); }); - register('should open alert', driver => { + register('should open basic alert', driver => { const page = new E2ETestPage(driver, platform); return page.present('basic'); }); + + register('should open alert long message', driver => { + const page = new E2ETestPage(driver, platform); + return page.present('longMessage'); + }); + + register('should open alert multiple buttons', driver => { + const page = new E2ETestPage(driver, platform); + return page.present('multipleButtons'); + }); + + register('should open alert no message', driver => { + const page = new E2ETestPage(driver, platform); + return page.present('noMessage'); + }); + + register('should open confirm alert', driver => { + const page = new E2ETestPage(driver, platform); + return page.present('confirm'); + }); + + register('should open prompt alert', driver => { + const page = new E2ETestPage(driver, platform); + return page.present('prompt'); + }); + + register('should open radio alert', driver => { + const page = new E2ETestPage(driver, platform); + return page.present('radio'); + }); + + register('should open checkbox alert', driver => { + const page = new E2ETestPage(driver, platform); + return page.present('checkbox'); + }); }); }); diff --git a/packages/core/src/components/item-divider/test/standalone/index.html b/packages/core/src/components/item-divider/test/standalone/index.html index 8455b22f6b..a47338880f 100644 --- a/packages/core/src/components/item-divider/test/standalone/index.html +++ b/packages/core/src/components/item-divider/test/standalone/index.html @@ -11,7 +11,7 @@ Item Divider - button + diff --git a/packages/core/src/components/item/test/standalone/index.html b/packages/core/src/components/item/test/standalone/index.html index d18e7d658b..2c9ec17b70 100644 --- a/packages/core/src/components/item/test/standalone/index.html +++ b/packages/core/src/components/item/test/standalone/index.html @@ -29,8 +29,8 @@ Item Button - Start Button - End Button + + diff --git a/packages/core/src/components/loading/test/basic/index.html b/packages/core/src/components/loading/test/basic/index.html index a765e6e81f..0d1eed13bf 100644 --- a/packages/core/src/components/loading/test/basic/index.html +++ b/packages/core/src/components/loading/test/basic/index.html @@ -23,6 +23,7 @@ Show Loading with no spinner Show Loading with translucent Show Loading with cssClass + diff --git a/packages/core/src/components/loading/test/standalone/e2e.js b/packages/core/src/components/loading/test/standalone/e2e.js index 448b20ff12..5d2dc2bbef 100644 --- a/packages/core/src/components/loading/test/standalone/e2e.js +++ b/packages/core/src/components/loading/test/standalone/e2e.js @@ -7,6 +7,13 @@ class E2ETestPage extends Page { constructor(driver, platform) { super(driver, `http://localhost:3333/src/components/loading/test/standalone?ionicplatform=${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 => { @@ -15,5 +22,10 @@ platforms.forEach(platform => { 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/packages/core/src/components/loading/test/standalone/index.html b/packages/core/src/components/loading/test/standalone/index.html index fffe441d49..ddcdb3371b 100644 --- a/packages/core/src/components/loading/test/standalone/index.html +++ b/packages/core/src/components/loading/test/standalone/index.html @@ -9,10 +9,28 @@ - Show Loading + + + + + + + diff --git a/packages/core/src/components/menu/test/standalone/index.html b/packages/core/src/components/menu/test/standalone/index.html index e08418d5aa..43eb8853cc 100644 --- a/packages/core/src/components/menu/test/standalone/index.html +++ b/packages/core/src/components/menu/test/standalone/index.html @@ -51,18 +51,36 @@

- Open left menu - Open right menu + +

- Set Push - Set Overlay - Set Reveal + + + - Set Swipe Enabled False +

+ + diff --git a/packages/core/src/components/modal/test/standalone/index.html b/packages/core/src/components/modal/test/standalone/index.html index a9f0550d94..89fe6d7078 100644 --- a/packages/core/src/components/modal/test/standalone/index.html +++ b/packages/core/src/components/modal/test/standalone/index.html @@ -9,10 +9,24 @@ - Present Modal + + + diff --git a/packages/core/src/components/toast/test/basic/index.html b/packages/core/src/components/toast/test/basic/index.html index f8c8a18e95..a9bc1b6fb8 100644 --- a/packages/core/src/components/toast/test/basic/index.html +++ b/packages/core/src/components/toast/test/basic/index.html @@ -25,6 +25,7 @@ Show Toast with Close Button Show Toast with Custom Close Button Text Show Translucent Toast + diff --git a/packages/core/src/components/toast/test/standalone/index.html b/packages/core/src/components/toast/test/standalone/index.html index a6c8c965f9..78dede2fc5 100644 --- a/packages/core/src/components/toast/test/standalone/index.html +++ b/packages/core/src/components/toast/test/standalone/index.html @@ -9,11 +9,34 @@ - Show Toast Bottom + + + + + + + + +