From db475cd1534e65d7f12fb00eefb2b7e7c87cc277 Mon Sep 17 00:00:00 2001 From: Cam Wiegert Date: Thu, 16 Nov 2017 12:19:23 -0600 Subject: [PATCH] test(e2e): port e2e tests to @ionic/core (#13438) * feat(e2e-tests) simplify e2e test structure * test(badge) add basic e2e test * test(button) update e2e test to new structure * test(card) add basic e2e test * test(checkbox) add basic e2e test * chore(e2e-test) update path to e2e module in run-e2e * fix(button) update toolbar e2e deps * fix(e2e-test) update path in snapshot script * feat(e2e-test) move e2e scripts into scripts/e2e * test(chip) add basic e2e test * test(content) add basic e2e test * test(datetime) add basic e2e test * style(e2e-test) use consistent title/header in e2e test pages * test(fab) add basic e2e test * fix(e2e-test) don't run e2e script when required * test(grid) add basic e2e test * test(icon) add basic e2e test * test(input) add basic e2e test * style(e2e-test) use consistent e2e test header titles * test(list) add basic e2e test * test(menu) add basic e2e test * test(modal) add basic e2e test * feat(e2e-test) add navigate export to e2e module * feat(e2e-test) add present method to Page class * test(popover) add basic e2e test * test(menu) add present left menu e2e test * test(radio) add basic e2e test * test(range) add basic e2e test * test(searchbar) add basic e2e test * test(segment) add basic e2e test * test(select) add basic e2e test * test(modal) add shows modal e2e test * test(slides) add basic e2e test * test(spinner) add basic/color e2e tests * test(tabs) add basic e2e test * test(toast) add basic e2e test * test(toggle) add basic e2e test * test(toolbar) add basic e2e test * docs(e2e-test) update e2e readme to reflect simplest test * test(card) update basic e2e test * chore(e2e-test) remove run-e2e script * test(components): move remaining component tests to index files * chore(package): add mocha to devDependencies * test(infinite-scroll) add basic e2e test * test(item-sliding) add basic e2e test * test(item) add basic/buttons e2e tests * test(nav) add basic e2e test * test(reorder) add basic e2e test * test(split-pane) add basic e2e test * chore() update declarations file * refactor(toast): reduce border-radius * chore(components): update components.d.ts --- packages/core/package.json | 5 +- packages/core/scripts/{ => e2e}/README.md | 11 +- .../{E2ETestPage.js => e2e/e2e-test-page.js} | 7 + .../core/scripts/{e2e.js => e2e/index.js} | 14 +- .../scripts/{Snapshot.js => e2e/snapshot.js} | 0 packages/core/scripts/run-e2e.js | 3 - .../action-sheet/test/basic/index.html | 4 +- .../components/alert/test/basic/index.html | 4 +- .../src/components/badge/test/basic/e2e.js | 7 + .../components/badge/test/basic/index.html | 63 +++++++++ .../components/button/test/basic.e2e-spec.js | 11 -- .../src/components/button/test/basic.html | 82 ----------- .../src/components/button/test/basic/e2e.js | 7 + .../components/button/test/basic/index.html | 30 ++++ .../src/components/button/test/button.spec.ts | 27 ---- .../button/test/toolbar.e2e-spec.js | 11 -- .../src/components/button/test/toolbar/e2e.js | 5 + .../test/{toolbar.html => toolbar/index.html} | 12 +- .../src/components/card/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 12 +- .../src/components/checkbox/test/basic.html | 128 ------------------ .../src/components/checkbox/test/basic/e2e.js | 7 + .../components/checkbox/test/basic/index.html | 55 ++++++++ .../src/components/chip/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 4 +- .../src/components/content/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 6 +- .../src/components/datetime/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 4 +- .../core/src/components/fab/test/basic/e2e.js | 7 + .../fab/test/{basic.html => basic/index.html} | 4 +- .../src/components/grid/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 8 +- .../core/src/components/icon/test/basic.html | 91 ------------- .../src/components/icon/test/basic/e2e.js | 7 + .../src/components/icon/test/basic/index.html | 92 +++++++++++++ .../src/components/icon/test/items/e2e.js | 7 + .../test/{items.html => items/index.html} | 13 +- .../infinite-scroll/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 4 +- .../src/components/input/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 4 +- .../src/components/input/test/textarea/e2e.js | 7 + .../{textarea.html => textarea/index.html} | 4 +- .../components/item-sliding/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 4 +- .../src/components/item/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 4 +- .../src/components/item/test/buttons/e2e.js | 7 + .../test/{buttons.html => buttons/index.html} | 4 +- .../src/components/list/test/basic/e2e.js | 7 + .../src/components/list/test/basic/index.html | 45 ++++++ .../src/components/menu/test/basic/e2e.js | 17 +++ .../test/{basic.html => basic/index.html} | 8 +- .../src/components/modal/test/basic/e2e.js | 17 +++ .../components/modal/test/basic/index.html | 42 ++++++ .../core/src/components/nav/test/basic/e2e.js | 7 + .../nav/test/{basic.html => basic/index.html} | 0 .../src/components/popover/test/basic/e2e.js | 18 +++ .../test/{basic.html => basic/index.html} | 6 +- .../src/components/radio/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 4 +- .../src/components/range/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 4 +- .../src/components/reorder/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 4 +- .../components/searchbar/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 10 +- .../src/components/segment/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 8 +- .../src/components/select/test/basic/e2e.js | 17 +++ .../test/{basic.html => basic/index.html} | 6 +- .../src/components/slides/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 9 +- .../src/components/spinner/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 8 +- .../src/components/spinner/test/color.html | 59 -------- .../src/components/spinner/test/color/e2e.js | 7 + .../components/spinner/test/color/index.html | 60 ++++++++ .../components/split-pane/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 2 +- .../src/components/tabs/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 2 +- .../src/components/toast/test/basic/e2e.js | 17 +++ .../test/{basic.html => basic/index.html} | 8 +- .../core/src/components/toast/toast.ios.scss | 2 +- .../src/components/toggle/test/basic/e2e.js | 7 + .../test/{basic.html => basic/index.html} | 4 +- .../src/components/toolbar/test/basic/e2e.js | 7 + .../components/toolbar/test/basic/index.html | 31 +++++ 90 files changed, 846 insertions(+), 509 deletions(-) rename packages/core/scripts/{ => e2e}/README.md (92%) rename packages/core/scripts/{E2ETestPage.js => e2e/e2e-test-page.js} (60%) rename packages/core/scripts/{e2e.js => e2e/index.js} (89%) rename packages/core/scripts/{Snapshot.js => e2e/snapshot.js} (100%) delete mode 100644 packages/core/scripts/run-e2e.js create mode 100644 packages/core/src/components/badge/test/basic/e2e.js create mode 100644 packages/core/src/components/badge/test/basic/index.html delete mode 100644 packages/core/src/components/button/test/basic.e2e-spec.js delete mode 100644 packages/core/src/components/button/test/basic.html create mode 100644 packages/core/src/components/button/test/basic/e2e.js create mode 100644 packages/core/src/components/button/test/basic/index.html delete mode 100644 packages/core/src/components/button/test/button.spec.ts delete mode 100644 packages/core/src/components/button/test/toolbar.e2e-spec.js create mode 100644 packages/core/src/components/button/test/toolbar/e2e.js rename packages/core/src/components/button/test/{toolbar.html => toolbar/index.html} (97%) create mode 100644 packages/core/src/components/card/test/basic/e2e.js rename packages/core/src/components/card/test/{basic.html => basic/index.html} (97%) delete mode 100644 packages/core/src/components/checkbox/test/basic.html create mode 100644 packages/core/src/components/checkbox/test/basic/e2e.js create mode 100644 packages/core/src/components/checkbox/test/basic/index.html create mode 100644 packages/core/src/components/chip/test/basic/e2e.js rename packages/core/src/components/chip/test/{basic.html => basic/index.html} (98%) create mode 100644 packages/core/src/components/content/test/basic/e2e.js rename packages/core/src/components/content/test/{basic.html => basic/index.html} (96%) create mode 100644 packages/core/src/components/datetime/test/basic/e2e.js rename packages/core/src/components/datetime/test/{basic.html => basic/index.html} (98%) create mode 100644 packages/core/src/components/fab/test/basic/e2e.js rename packages/core/src/components/fab/test/{basic.html => basic/index.html} (98%) create mode 100644 packages/core/src/components/grid/test/basic/e2e.js rename packages/core/src/components/grid/test/{basic.html => basic/index.html} (97%) delete mode 100644 packages/core/src/components/icon/test/basic.html create mode 100644 packages/core/src/components/icon/test/basic/e2e.js create mode 100644 packages/core/src/components/icon/test/basic/index.html create mode 100644 packages/core/src/components/icon/test/items/e2e.js rename packages/core/src/components/icon/test/{items.html => items/index.html} (98%) create mode 100644 packages/core/src/components/infinite-scroll/test/basic/e2e.js rename packages/core/src/components/infinite-scroll/test/{basic.html => basic/index.html} (95%) create mode 100644 packages/core/src/components/input/test/basic/e2e.js rename packages/core/src/components/input/test/{basic.html => basic/index.html} (97%) create mode 100644 packages/core/src/components/input/test/textarea/e2e.js rename packages/core/src/components/input/test/{textarea.html => textarea/index.html} (97%) create mode 100644 packages/core/src/components/item-sliding/test/basic/e2e.js rename packages/core/src/components/item-sliding/test/{basic.html => basic/index.html} (99%) create mode 100644 packages/core/src/components/item/test/basic/e2e.js rename packages/core/src/components/item/test/{basic.html => basic/index.html} (97%) create mode 100644 packages/core/src/components/item/test/buttons/e2e.js rename packages/core/src/components/item/test/{buttons.html => buttons/index.html} (96%) create mode 100644 packages/core/src/components/list/test/basic/e2e.js create mode 100644 packages/core/src/components/list/test/basic/index.html create mode 100644 packages/core/src/components/menu/test/basic/e2e.js rename packages/core/src/components/menu/test/{basic.html => basic/index.html} (93%) create mode 100644 packages/core/src/components/modal/test/basic/e2e.js create mode 100644 packages/core/src/components/modal/test/basic/index.html create mode 100644 packages/core/src/components/nav/test/basic/e2e.js rename packages/core/src/components/nav/test/{basic.html => basic/index.html} (100%) create mode 100644 packages/core/src/components/popover/test/basic/e2e.js rename packages/core/src/components/popover/test/{basic.html => basic/index.html} (93%) create mode 100644 packages/core/src/components/radio/test/basic/e2e.js rename packages/core/src/components/radio/test/{basic.html => basic/index.html} (98%) create mode 100644 packages/core/src/components/range/test/basic/e2e.js rename packages/core/src/components/range/test/{basic.html => basic/index.html} (97%) create mode 100644 packages/core/src/components/reorder/test/basic/e2e.js rename packages/core/src/components/reorder/test/{basic.html => basic/index.html} (96%) create mode 100644 packages/core/src/components/searchbar/test/basic/e2e.js rename packages/core/src/components/searchbar/test/{basic.html => basic/index.html} (95%) create mode 100644 packages/core/src/components/segment/test/basic/e2e.js rename packages/core/src/components/segment/test/{basic.html => basic/index.html} (96%) create mode 100644 packages/core/src/components/select/test/basic/e2e.js rename packages/core/src/components/select/test/{basic.html => basic/index.html} (98%) create mode 100644 packages/core/src/components/slides/test/basic/e2e.js rename packages/core/src/components/slides/test/{basic.html => basic/index.html} (65%) create mode 100644 packages/core/src/components/spinner/test/basic/e2e.js rename packages/core/src/components/spinner/test/{basic.html => basic/index.html} (90%) delete mode 100644 packages/core/src/components/spinner/test/color.html create mode 100644 packages/core/src/components/spinner/test/color/e2e.js create mode 100644 packages/core/src/components/spinner/test/color/index.html create mode 100644 packages/core/src/components/split-pane/test/basic/e2e.js rename packages/core/src/components/split-pane/test/{basic.html => basic/index.html} (98%) create mode 100644 packages/core/src/components/tabs/test/basic/e2e.js rename packages/core/src/components/tabs/test/{basic.html => basic/index.html} (96%) create mode 100644 packages/core/src/components/toast/test/basic/e2e.js rename packages/core/src/components/toast/test/{basic.html => basic/index.html} (89%) create mode 100644 packages/core/src/components/toggle/test/basic/e2e.js rename packages/core/src/components/toggle/test/{basic.html => basic/index.html} (97%) create mode 100644 packages/core/src/components/toolbar/test/basic/e2e.js create mode 100644 packages/core/src/components/toolbar/test/basic/index.html diff --git a/packages/core/package.json b/packages/core/package.json index fd47403b6b..93ea9accb8 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -16,6 +16,7 @@ "@types/jest": "^21.1.0", "ionicons": "^4.0.0-6", "jest": "^21.1.0", + "mocha": "^4.0.1", "np": "^2.16.1", "sass-lint": "^1.11.1", "selenium-webdriver": "^3.6.0", @@ -26,8 +27,8 @@ "build": "stencil build", "tsc": "./node_modules/.bin/tsc -p .", "dev": "sd concurrent \"stencil build --dev --watch\" \"stencil-dev-server\"", - "e2e": "node ./scripts/run-e2e.js", - "snapshot": "node ./scripts/e2e.js --snapshot", + "e2e": "node ./scripts/e2e", + "snapshot": "node ./scripts/e2e --snapshot", "test": "jest --no-cache", "test.watch": "jest --watch --no-cache", "clean": "rm -rf dist", diff --git a/packages/core/scripts/README.md b/packages/core/scripts/e2e/README.md similarity index 92% rename from packages/core/scripts/README.md rename to packages/core/scripts/e2e/README.md index cb0164c027..2a28a8c064 100644 --- a/packages/core/scripts/README.md +++ b/packages/core/scripts/e2e/README.md @@ -20,13 +20,10 @@ In general, writing an end-to-end tests consists of the following steps: The most basic end-to-end test just navigates to the page in order to verify that it draws properly. In this case, it is not necessary to extend the E2ETestPage class. The base class contains a navigate method that goes to the page and waits for it to load. The test just needs to instantiate the page with the proper URL and call the navigate. Such a test looks like this: ```ts -const { register, Page } = require('../../../../scripts/e2e'); +const { register, navigate } = require('../../../../scripts/e2e'); describe('button: basic', () => { - register('navigates', driver => { - const page = new Page(driver, 'http://localhost:3333/src/components/button/test/basic/index.html'); - return page.navigate(); - }); + register('navigates', navigate('http://localhost:3333/src/components/button/test/basic')); }); ``` @@ -38,7 +35,7 @@ const { register, Page } = require('../../../../scripts/e2e');; class ActionSheetE2ETestPage extends Page { constructor(driver) { - super(driver, 'http://localhost:3333/src/components/action-sheet/test/basic/index.html'); + super(driver, 'http://localhost:3333/src/components/action-sheet/test/basic'); } present(buttonId) { @@ -84,4 +81,4 @@ To run the tests, just use npm from the `packages/core` directory under the `ion 1. turn off animations and then adjust the wait time accordingly 1. adjustments will likely be needed when the Snapshot tool has better reporting, for example the tool will likely have `start` and `finish` methods (or some such thing) 1. cycle through the various platforms (or at least iOS and Android) like the current `ionic-angular` does (I think that is currently handled via `gulp`, needs to be looked into) -1. the current Snapshots seem to have some funky boardering issues when uploaded, may need to look into that \ No newline at end of file +1. the current Snapshots seem to have some funky boardering issues when uploaded, may need to look into that diff --git a/packages/core/scripts/E2ETestPage.js b/packages/core/scripts/e2e/e2e-test-page.js similarity index 60% rename from packages/core/scripts/E2ETestPage.js rename to packages/core/scripts/e2e/e2e-test-page.js index b5dd8e4d89..b53d817a99 100644 --- a/packages/core/scripts/E2ETestPage.js +++ b/packages/core/scripts/e2e/e2e-test-page.js @@ -13,4 +13,11 @@ module.exports = class E2ETestPage { this.driver.wait(until.elementLocated(By.css('.hydrated'))); return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.hydrated')))); } + + present(clickTarget, options) { + 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)))); + } } diff --git a/packages/core/scripts/e2e.js b/packages/core/scripts/e2e/index.js similarity index 89% rename from packages/core/scripts/e2e.js rename to packages/core/scripts/e2e/index.js index 27643ce6ed..fa43c10333 100644 --- a/packages/core/scripts/e2e.js +++ b/packages/core/scripts/e2e/index.js @@ -6,8 +6,8 @@ const Mocha = require('mocha'); const path = require('path'); const webdriver = require('selenium-webdriver'); -const Page = require('./E2ETestPage'); -const Snapshot = require('./Snapshot'); +const Page = require('./e2e-test-page'); +const Snapshot = require('./snapshot'); let driver; let snapshot; @@ -33,7 +33,7 @@ function generateTestId() { function getTestFiles() { return new Promise((resolve, reject) => { - const src = path.join(__dirname, '../src/**/e2e.js'); + const src = path.join(__dirname, '../../src/**/e2e.js'); glob(src, (err, files) => { if (err) { reject(err); @@ -124,8 +124,16 @@ async function run() { }); } +const navigate = url => driver => new Page(driver, url).navigate(); + +// Invoke run() only if executed directly i.e. `node ./scripts/e2e` +if (require.main === module) { + run(); +} + module.exports = { Page, + navigate, register: registerE2ETest, run: run }; diff --git a/packages/core/scripts/Snapshot.js b/packages/core/scripts/e2e/snapshot.js similarity index 100% rename from packages/core/scripts/Snapshot.js rename to packages/core/scripts/e2e/snapshot.js diff --git a/packages/core/scripts/run-e2e.js b/packages/core/scripts/run-e2e.js deleted file mode 100644 index d8a1af77e5..0000000000 --- a/packages/core/scripts/run-e2e.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict'; - -require('./e2e').run(); diff --git a/packages/core/src/components/action-sheet/test/basic/index.html b/packages/core/src/components/action-sheet/test/basic/index.html index dd089ef0b5..122580355c 100644 --- a/packages/core/src/components/action-sheet/test/basic/index.html +++ b/packages/core/src/components/action-sheet/test/basic/index.html @@ -3,7 +3,7 @@ - Action Sheet Basic + Action Sheet - Basic @@ -13,7 +13,7 @@ - Action Sheet + Action Sheet - Basic diff --git a/packages/core/src/components/alert/test/basic/index.html b/packages/core/src/components/alert/test/basic/index.html index 75e46e71b0..a0e6b8def0 100644 --- a/packages/core/src/components/alert/test/basic/index.html +++ b/packages/core/src/components/alert/test/basic/index.html @@ -3,7 +3,7 @@ - Alert Basic + Alert - Basic @@ -13,7 +13,7 @@ - Alerts + Alert - Basic diff --git a/packages/core/src/components/badge/test/basic/e2e.js b/packages/core/src/components/badge/test/basic/e2e.js new file mode 100644 index 0000000000..1cc5169cd4 --- /dev/null +++ b/packages/core/src/components/badge/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('badge: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/badge/test/basic')); + +}); diff --git a/packages/core/src/components/badge/test/basic/index.html b/packages/core/src/components/badge/test/basic/index.html new file mode 100644 index 0000000000..a8fa1c2e26 --- /dev/null +++ b/packages/core/src/components/badge/test/basic/index.html @@ -0,0 +1,63 @@ + + + + + + Badge - Basic + + + + + + + + + + Badge - Basic + + + + + + + 11 + Primary + + + 22 + Secondary + + + 33 + Danger + + + 44 + Light + + + 55 + Dark + + + + Toggle Colors + + + + + + + + diff --git a/packages/core/src/components/button/test/basic.e2e-spec.js b/packages/core/src/components/button/test/basic.e2e-spec.js deleted file mode 100644 index 0d7c140e62..0000000000 --- a/packages/core/src/components/button/test/basic.e2e-spec.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -const register = require('../../../../scripts/e2e-test-runner').register; -const E2ETestPage = require('../../../../scripts/E2ETestPage'); - -describe('button: basic', () => { - register('navigates', driver => { - const page = new E2ETestPage(driver, 'http://localhost:3333/src/components/button/test/basic.html'); - return page.navigate(); - }); -}); diff --git a/packages/core/src/components/button/test/basic.html b/packages/core/src/components/button/test/basic.html deleted file mode 100644 index 1a60bcbf8d..0000000000 --- a/packages/core/src/components/button/test/basic.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Ionic Buttons - - - - - - - - Test button - - Test button - - Test button w/ class - - - Alert button - - - - Alert button w/ class & role - - - Anchor Button - Anchor Link - -

Colors

- Default - Secondary - Danger - Light - Dark - -

Shapes

- Full Button - Block Button - Round Button - -

Outlines

- Outline + Full + No Color - Outline + Full - Outline + Block - Outline + Round - -

Clear

- Clear + Full + No Color - Clear + Full - Clear + Block - Clear + Round - -

Icons

- - - - Left Icon - - - - Right Icon - - - - - - - -

Sizes

- Large - Default - Small - -

States

- Large - Large - - - - - diff --git a/packages/core/src/components/button/test/basic/e2e.js b/packages/core/src/components/button/test/basic/e2e.js new file mode 100644 index 0000000000..96ee600e87 --- /dev/null +++ b/packages/core/src/components/button/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('button: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/button/test/basic')); + +}); diff --git a/packages/core/src/components/button/test/basic/index.html b/packages/core/src/components/button/test/basic/index.html new file mode 100644 index 0000000000..07e1c85fc0 --- /dev/null +++ b/packages/core/src/components/button/test/basic/index.html @@ -0,0 +1,30 @@ + + + + + Button - Basic + + + + + + + + + Button - Basic + + + + +

Default

+

Primary

+

Secondary

+

Danger

+

Light

+

Dark

+

Disabled

+ + + + + diff --git a/packages/core/src/components/button/test/button.spec.ts b/packages/core/src/components/button/test/button.spec.ts deleted file mode 100644 index 0dd4cf839f..0000000000 --- a/packages/core/src/components/button/test/button.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { flush, render } from '@stencil/core/testing'; -import { Button } from '../button'; - - -describe('button', () => { - - it('should render button inner text', async () => { - const root = await render({ - components: [Button], - html: 'Button Inner Text' - }); - - expect(root.textContent).toBe('Button Inner Text'); - expect(root.querySelector('button').hasAttribute('disabled')).toBe(false); - - root.disabled = true; - await flush(root); - - expect(root.querySelector('button').hasAttribute('disabled')).toBe(true); - }); - - it('should default itemButton to false', () => { - const btn = new Button(); - expect(btn.itemButton).toBe(false); - }); - -}); diff --git a/packages/core/src/components/button/test/toolbar.e2e-spec.js b/packages/core/src/components/button/test/toolbar.e2e-spec.js deleted file mode 100644 index 17003b793a..0000000000 --- a/packages/core/src/components/button/test/toolbar.e2e-spec.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -const register = require('../../../../scripts/e2e-test-runner').register; -const E2ETestPage = require('../../../../scripts/E2ETestPage'); - -describe('button: toolbar', () => { - register('navigates', (driver) => { - const page = new E2ETestPage(driver, 'http://localhost:3333/src/components/button/test/toolbar.html'); - return page.navigate(); - }); -}); diff --git a/packages/core/src/components/button/test/toolbar/e2e.js b/packages/core/src/components/button/test/toolbar/e2e.js new file mode 100644 index 0000000000..5fd283f32f --- /dev/null +++ b/packages/core/src/components/button/test/toolbar/e2e.js @@ -0,0 +1,5 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('button: toolbar', () => { + register('navigates', navigate('http://localhost:3333/src/components/button/test/toolbar')); +}); diff --git a/packages/core/src/components/button/test/toolbar.html b/packages/core/src/components/button/test/toolbar/index.html similarity index 97% rename from packages/core/src/components/button/test/toolbar.html rename to packages/core/src/components/button/test/toolbar/index.html index e72f811401..e0551a96eb 100644 --- a/packages/core/src/components/button/test/toolbar.html +++ b/packages/core/src/components/button/test/toolbar/index.html @@ -2,13 +2,19 @@ - Ionic Toolbar Buttons + Button - Toolbar + + + Button - Toolbar + + + This should have no padding @@ -204,7 +210,7 @@ - + @@ -216,7 +222,7 @@ - + diff --git a/packages/core/src/components/card/test/basic/e2e.js b/packages/core/src/components/card/test/basic/e2e.js new file mode 100644 index 0000000000..6f8c7d9a57 --- /dev/null +++ b/packages/core/src/components/card/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('card: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/card/test/basic')); + +}); diff --git a/packages/core/src/components/card/test/basic.html b/packages/core/src/components/card/test/basic/index.html similarity index 97% rename from packages/core/src/components/card/test/basic.html rename to packages/core/src/components/card/test/basic/index.html index 9e5f4ea363..0b3a664b2c 100644 --- a/packages/core/src/components/card/test/basic.html +++ b/packages/core/src/components/card/test/basic/index.html @@ -3,7 +3,7 @@ - Ionic Cards + Card - Basic @@ -11,12 +11,18 @@ + + + Card - Basic + + + - + diff --git a/packages/core/src/components/checkbox/test/basic.html b/packages/core/src/components/checkbox/test/basic.html deleted file mode 100644 index f3b4607b43..0000000000 --- a/packages/core/src/components/checkbox/test/basic.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - - Ionic Checkbox - - - - - - - - - Checkboxes - - - - - - - Apple - - - - - Banana - - - - - Cherry, disabled - - - - - Grape, checked, disabled - - - - - Kiwi, (ionChange) Secondary color - - - - - Strawberry, (ionChange) checked="true" - - - - - Checkbox right, checked, really long text that should ellipsis - - - - - Checkbox right side - - - - - Button w/ right side default icon, really long text that should ellipsis - - - - - - - - -

- - Stand-alone checkbox: -

- - - - - - - Checkbox / Toggle - - - - - Checked - - - - - Disabled - - - - - - - - - - - - - - - diff --git a/packages/core/src/components/checkbox/test/basic/e2e.js b/packages/core/src/components/checkbox/test/basic/e2e.js new file mode 100644 index 0000000000..de80596418 --- /dev/null +++ b/packages/core/src/components/checkbox/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('checkbox: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/checkbox/test/basic')); + +}); diff --git a/packages/core/src/components/checkbox/test/basic/index.html b/packages/core/src/components/checkbox/test/basic/index.html new file mode 100644 index 0000000000..d1777a4867 --- /dev/null +++ b/packages/core/src/components/checkbox/test/basic/index.html @@ -0,0 +1,55 @@ + + + + + Checkbox - Basic + + + + + + + + + Checkbox - Basic + + + + + + Default + + + + Primary + + + + Secondary + + + + Danger + + + + Light + + + + Dark + + + + Disabled + + + + + + + + + + + diff --git a/packages/core/src/components/chip/test/basic/e2e.js b/packages/core/src/components/chip/test/basic/e2e.js new file mode 100644 index 0000000000..02043c3f77 --- /dev/null +++ b/packages/core/src/components/chip/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('chip: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/chip/test/basic')); + +}); diff --git a/packages/core/src/components/chip/test/basic.html b/packages/core/src/components/chip/test/basic/index.html similarity index 98% rename from packages/core/src/components/chip/test/basic.html rename to packages/core/src/components/chip/test/basic/index.html index 7de32f75f6..3cecc7e62d 100644 --- a/packages/core/src/components/chip/test/basic.html +++ b/packages/core/src/components/chip/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Chips + Chip - Basic @@ -11,7 +11,7 @@ - Header + Chip - Basic diff --git a/packages/core/src/components/content/test/basic/e2e.js b/packages/core/src/components/content/test/basic/e2e.js new file mode 100644 index 0000000000..8a8752da50 --- /dev/null +++ b/packages/core/src/components/content/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('content: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/content/test/basic')); + +}); diff --git a/packages/core/src/components/content/test/basic.html b/packages/core/src/components/content/test/basic/index.html similarity index 96% rename from packages/core/src/components/content/test/basic.html rename to packages/core/src/components/content/test/basic/index.html index e28085a541..3e715879d6 100644 --- a/packages/core/src/components/content/test/basic.html +++ b/packages/core/src/components/content/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Chips + Content - Basic @@ -11,10 +11,10 @@ - Header + Content - Basic diff --git a/packages/core/src/components/datetime/test/basic/e2e.js b/packages/core/src/components/datetime/test/basic/e2e.js new file mode 100644 index 0000000000..b9722c2495 --- /dev/null +++ b/packages/core/src/components/datetime/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('datetime: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/datetime/test/basic')); + +}); diff --git a/packages/core/src/components/datetime/test/basic.html b/packages/core/src/components/datetime/test/basic/index.html similarity index 98% rename from packages/core/src/components/datetime/test/basic.html rename to packages/core/src/components/datetime/test/basic/index.html index c95561f47c..6b3f98fecc 100644 --- a/packages/core/src/components/datetime/test/basic.html +++ b/packages/core/src/components/datetime/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Datetime + Datetime - Basic @@ -11,7 +11,7 @@ - Datetime + Datetime - Basic diff --git a/packages/core/src/components/fab/test/basic/e2e.js b/packages/core/src/components/fab/test/basic/e2e.js new file mode 100644 index 0000000000..40517de650 --- /dev/null +++ b/packages/core/src/components/fab/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('fab: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/fab/test/basic')); + +}); diff --git a/packages/core/src/components/fab/test/basic.html b/packages/core/src/components/fab/test/basic/index.html similarity index 98% rename from packages/core/src/components/fab/test/basic.html rename to packages/core/src/components/fab/test/basic/index.html index 73514218ed..0c60429111 100644 --- a/packages/core/src/components/fab/test/basic.html +++ b/packages/core/src/components/fab/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic FAB + Floating Action Button - Basic @@ -11,7 +11,7 @@ - Floating Action Buttons + Floating Action Button - Basic diff --git a/packages/core/src/components/grid/test/basic/e2e.js b/packages/core/src/components/grid/test/basic/e2e.js new file mode 100644 index 0000000000..ebc217a806 --- /dev/null +++ b/packages/core/src/components/grid/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('grid: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/grid/test/basic')); + +}); diff --git a/packages/core/src/components/grid/test/basic.html b/packages/core/src/components/grid/test/basic/index.html similarity index 97% rename from packages/core/src/components/grid/test/basic.html rename to packages/core/src/components/grid/test/basic/index.html index 6211ed5726..f77ff2ad7f 100644 --- a/packages/core/src/components/grid/test/basic.html +++ b/packages/core/src/components/grid/test/basic/index.html @@ -2,13 +2,19 @@ - Ionic Grid + Grid - Basic + + + Grid - Basic + + + diff --git a/packages/core/src/components/icon/test/basic.html b/packages/core/src/components/icon/test/basic.html deleted file mode 100644 index 132eb0fcb4..0000000000 --- a/packages/core/src/components/icon/test/basic.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - Ionic Icons - - - - - - - - - Icon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/core/src/components/icon/test/basic/e2e.js b/packages/core/src/components/icon/test/basic/e2e.js new file mode 100644 index 0000000000..fe47629c3b --- /dev/null +++ b/packages/core/src/components/icon/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('icon: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/icon/test/basic')); + +}); diff --git a/packages/core/src/components/icon/test/basic/index.html b/packages/core/src/components/icon/test/basic/index.html new file mode 100644 index 0000000000..e5ea0f3bae --- /dev/null +++ b/packages/core/src/components/icon/test/basic/index.html @@ -0,0 +1,92 @@ + + + + + Icon - Basic + + + + + + + + + Icon - Basic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/core/src/components/icon/test/items/e2e.js b/packages/core/src/components/icon/test/items/e2e.js new file mode 100644 index 0000000000..7c845e0282 --- /dev/null +++ b/packages/core/src/components/icon/test/items/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('icon: items', () => { + + register('navigates', navigate('http://localhost:3333/src/components/icon/test/items')); + +}); diff --git a/packages/core/src/components/icon/test/items.html b/packages/core/src/components/icon/test/items/index.html similarity index 98% rename from packages/core/src/components/icon/test/items.html rename to packages/core/src/components/icon/test/items/index.html index d552e6f24e..3c9a3b7c27 100644 --- a/packages/core/src/components/icon/test/items.html +++ b/packages/core/src/components/icon/test/items/index.html @@ -1,9 +1,8 @@ - - Ionic + Icon - Items - - - - - - Icons + Icon - Items - - - diff --git a/packages/core/src/components/infinite-scroll/test/basic/e2e.js b/packages/core/src/components/infinite-scroll/test/basic/e2e.js new file mode 100644 index 0000000000..bf81ca449f --- /dev/null +++ b/packages/core/src/components/infinite-scroll/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('inifinite-scroll: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/infinite-scroll/test/basic')); + +}); diff --git a/packages/core/src/components/infinite-scroll/test/basic.html b/packages/core/src/components/infinite-scroll/test/basic/index.html similarity index 95% rename from packages/core/src/components/infinite-scroll/test/basic.html rename to packages/core/src/components/infinite-scroll/test/basic/index.html index 487e32ca28..9042e2e979 100644 --- a/packages/core/src/components/infinite-scroll/test/basic.html +++ b/packages/core/src/components/infinite-scroll/test/basic/index.html @@ -3,7 +3,7 @@ - Ionic Infinite Scroll + Infinite Scroll - Basic @@ -14,7 +14,7 @@ - Ionic CDN demo + Infinite Scroll - Basic diff --git a/packages/core/src/components/input/test/basic/e2e.js b/packages/core/src/components/input/test/basic/e2e.js new file mode 100644 index 0000000000..ec5e0a7c37 --- /dev/null +++ b/packages/core/src/components/input/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('input: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/input/test/basic')); + +}); diff --git a/packages/core/src/components/input/test/basic.html b/packages/core/src/components/input/test/basic/index.html similarity index 97% rename from packages/core/src/components/input/test/basic.html rename to packages/core/src/components/input/test/basic/index.html index 467ddd67ad..df22e6d747 100644 --- a/packages/core/src/components/input/test/basic.html +++ b/packages/core/src/components/input/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Inputs + Input - Basic @@ -11,7 +11,7 @@ - Basic Form + Input - Basic diff --git a/packages/core/src/components/input/test/textarea/e2e.js b/packages/core/src/components/input/test/textarea/e2e.js new file mode 100644 index 0000000000..3f74a9e413 --- /dev/null +++ b/packages/core/src/components/input/test/textarea/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('input: textarea', () => { + + register('navigates', navigate('http://localhost:3333/src/components/input/test/textarea')); + +}); diff --git a/packages/core/src/components/input/test/textarea.html b/packages/core/src/components/input/test/textarea/index.html similarity index 97% rename from packages/core/src/components/input/test/textarea.html rename to packages/core/src/components/input/test/textarea/index.html index 37feeb1082..84f1bdf312 100644 --- a/packages/core/src/components/input/test/textarea.html +++ b/packages/core/src/components/input/test/textarea/index.html @@ -2,7 +2,7 @@ - Ionic Textareas + Input - Textarea @@ -11,7 +11,7 @@ - Textareas + Input - Textarea diff --git a/packages/core/src/components/item-sliding/test/basic/e2e.js b/packages/core/src/components/item-sliding/test/basic/e2e.js new file mode 100644 index 0000000000..ce8c6d46ea --- /dev/null +++ b/packages/core/src/components/item-sliding/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('item-sliding: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/item-sliding/test/basic')); + +}); diff --git a/packages/core/src/components/item-sliding/test/basic.html b/packages/core/src/components/item-sliding/test/basic/index.html similarity index 99% rename from packages/core/src/components/item-sliding/test/basic.html rename to packages/core/src/components/item-sliding/test/basic/index.html index b537d55548..8a59cb3bde 100644 --- a/packages/core/src/components/item-sliding/test/basic.html +++ b/packages/core/src/components/item-sliding/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Item Sliding + Item Sliding - Basic @@ -11,7 +11,7 @@ - Sliding Items + Item Sliding - Basic Dynamic diff --git a/packages/core/src/components/item/test/basic/e2e.js b/packages/core/src/components/item/test/basic/e2e.js new file mode 100644 index 0000000000..0b77d8f329 --- /dev/null +++ b/packages/core/src/components/item/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('item: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/item/test/basic')); + +}); diff --git a/packages/core/src/components/item/test/basic.html b/packages/core/src/components/item/test/basic/index.html similarity index 97% rename from packages/core/src/components/item/test/basic.html rename to packages/core/src/components/item/test/basic/index.html index 9b2b293334..8f6e1ec00b 100644 --- a/packages/core/src/components/item/test/basic.html +++ b/packages/core/src/components/item/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Slides Basic + Item - Basic @@ -11,7 +11,7 @@ - Button Icons + Item - Basic Default diff --git a/packages/core/src/components/item/test/buttons/e2e.js b/packages/core/src/components/item/test/buttons/e2e.js new file mode 100644 index 0000000000..588f4b03dd --- /dev/null +++ b/packages/core/src/components/item/test/buttons/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('item: buttons', () => { + + register('navigates', navigate('http://localhost:3333/src/components/item/test/buttons')); + +}); diff --git a/packages/core/src/components/item/test/buttons.html b/packages/core/src/components/item/test/buttons/index.html similarity index 96% rename from packages/core/src/components/item/test/buttons.html rename to packages/core/src/components/item/test/buttons/index.html index cf4b322a63..64ba69cd4b 100644 --- a/packages/core/src/components/item/test/buttons.html +++ b/packages/core/src/components/item/test/buttons/index.html @@ -2,7 +2,7 @@ - Ionic Slides Basic + Item - Buttons @@ -11,7 +11,7 @@ - Button Icons + Item - Buttons Default diff --git a/packages/core/src/components/list/test/basic/e2e.js b/packages/core/src/components/list/test/basic/e2e.js new file mode 100644 index 0000000000..11530cacc1 --- /dev/null +++ b/packages/core/src/components/list/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('list: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/list/test/basic')); + +}); diff --git a/packages/core/src/components/list/test/basic/index.html b/packages/core/src/components/list/test/basic/index.html new file mode 100644 index 0000000000..9d3941bb7a --- /dev/null +++ b/packages/core/src/components/list/test/basic/index.html @@ -0,0 +1,45 @@ + + + + + List - Basic + + + + + + + + + List - Basic + + + + + + Pokémon Yellow + Super Metroid + Mega Man X + The Legend of Zelda + Pac-Man + Super Mario World + Street Fighter II + Half Life + Portal + Final Fantasy VII + Star Fox + Tetris + Donkey Kong III + Goldeneye 007 + Doom + Fallout + GTA + Halo + + + + + + + + diff --git a/packages/core/src/components/menu/test/basic/e2e.js b/packages/core/src/components/menu/test/basic/e2e.js new file mode 100644 index 0000000000..5f37a61a34 --- /dev/null +++ b/packages/core/src/components/menu/test/basic/e2e.js @@ -0,0 +1,17 @@ +const { register, navigate, Page } = require('../../../../../scripts/e2e'); +const testPageURL = 'http://localhost:3333/src/components/menu/test/basic'; + +describe('menu: basic', () => { + + register('navigates', navigate(testPageURL)); + + describe('present', () => { + + register('shows left menu', driver => { + const page = new Page(driver, testPageURL); + return page.present('.e2eOpenLeftMenu', { waitFor: '.e2eLeftMenu' }) + }); + + }); + +}); diff --git a/packages/core/src/components/menu/test/basic.html b/packages/core/src/components/menu/test/basic/index.html similarity index 93% rename from packages/core/src/components/menu/test/basic.html rename to packages/core/src/components/menu/test/basic/index.html index f548bfe1fc..7fd77a56ee 100644 --- a/packages/core/src/components/menu/test/basic.html +++ b/packages/core/src/components/menu/test/basic/index.html @@ -3,14 +3,14 @@ - Ionic Menu + Menu - Basic - + @@ -59,13 +59,13 @@ - Ionic CDN demo + Menu - Basic

- Open left menu + Open left menu Open right menu

diff --git a/packages/core/src/components/modal/test/basic/e2e.js b/packages/core/src/components/modal/test/basic/e2e.js new file mode 100644 index 0000000000..27742ddbfe --- /dev/null +++ b/packages/core/src/components/modal/test/basic/e2e.js @@ -0,0 +1,17 @@ +const { register, navigate, Page } = require('../../../../../scripts/e2e'); +const testPageURL = 'http://localhost:3333/src/components/modal/test/basic'; + +describe('modal: basic', () => { + + register('navigates', navigate(testPageURL)); + + describe('present', () => { + + register('shows modal', driver => { + const page = new Page(driver, testPageURL); + return page.present('.e2ePresentModal', { waitFor: 'ion-modal' }); + }); + + }); + +}); diff --git a/packages/core/src/components/modal/test/basic/index.html b/packages/core/src/components/modal/test/basic/index.html new file mode 100644 index 0000000000..8a496e5ba5 --- /dev/null +++ b/packages/core/src/components/modal/test/basic/index.html @@ -0,0 +1,42 @@ + + + + + + Modal - Basic + + + + + + + + + + Modal - Basic + + + + + +

+ Present modal +

+ + + + + + + diff --git a/packages/core/src/components/nav/test/basic/e2e.js b/packages/core/src/components/nav/test/basic/e2e.js new file mode 100644 index 0000000000..ae031807cf --- /dev/null +++ b/packages/core/src/components/nav/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('nav: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/nav/test/basic')); + +}); diff --git a/packages/core/src/components/nav/test/basic.html b/packages/core/src/components/nav/test/basic/index.html similarity index 100% rename from packages/core/src/components/nav/test/basic.html rename to packages/core/src/components/nav/test/basic/index.html diff --git a/packages/core/src/components/popover/test/basic/e2e.js b/packages/core/src/components/popover/test/basic/e2e.js new file mode 100644 index 0000000000..8327f05b20 --- /dev/null +++ b/packages/core/src/components/popover/test/basic/e2e.js @@ -0,0 +1,18 @@ +const { register, navigate, Page } = require('../../../../../scripts/e2e'); +const testPageURL = 'http://localhost:3333/src/components/popover/test/basic'; + + +describe('popover: basic', () => { + + register('navigates', navigate(testPageURL)); + + describe('present', () => { + + register('shows modal', driver => { + const page = new Page(driver, testPageURL); + return page.present('.e2eShowPopover', { waitFor: 'ion-popover' }); + }); + + }); + +}); diff --git a/packages/core/src/components/popover/test/basic.html b/packages/core/src/components/popover/test/basic/index.html similarity index 93% rename from packages/core/src/components/popover/test/basic.html rename to packages/core/src/components/popover/test/basic/index.html index 2ebdcd660e..26876b4e6b 100644 --- a/packages/core/src/components/popover/test/basic.html +++ b/packages/core/src/components/popover/test/basic/index.html @@ -3,7 +3,7 @@ - Ionic Popover + Popover - Basic @@ -18,12 +18,12 @@ - Popover + Popover - Basic - Show Popover + Show Popover Show Long List Popover No Event Popover diff --git a/packages/core/src/components/radio/test/basic/e2e.js b/packages/core/src/components/radio/test/basic/e2e.js new file mode 100644 index 0000000000..439bd942d6 --- /dev/null +++ b/packages/core/src/components/radio/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('radio: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/radio/test/basic')); + +}); diff --git a/packages/core/src/components/radio/test/basic.html b/packages/core/src/components/radio/test/basic/index.html similarity index 98% rename from packages/core/src/components/radio/test/basic.html rename to packages/core/src/components/radio/test/basic/index.html index 15cfd92381..19efea4f5f 100644 --- a/packages/core/src/components/radio/test/basic.html +++ b/packages/core/src/components/radio/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Radio + Radio - Basic @@ -11,7 +11,7 @@ - Radios + Radio - Basic diff --git a/packages/core/src/components/range/test/basic/e2e.js b/packages/core/src/components/range/test/basic/e2e.js new file mode 100644 index 0000000000..7a778f55bd --- /dev/null +++ b/packages/core/src/components/range/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('range: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/range/test/basic')); + +}); diff --git a/packages/core/src/components/range/test/basic.html b/packages/core/src/components/range/test/basic/index.html similarity index 97% rename from packages/core/src/components/range/test/basic.html rename to packages/core/src/components/range/test/basic/index.html index 947c85fbae..e017b369f2 100644 --- a/packages/core/src/components/range/test/basic.html +++ b/packages/core/src/components/range/test/basic/index.html @@ -3,7 +3,7 @@ - Ionic Range + Range - Basic @@ -13,7 +13,7 @@ - Range + Range - Basic diff --git a/packages/core/src/components/reorder/test/basic/e2e.js b/packages/core/src/components/reorder/test/basic/e2e.js new file mode 100644 index 0000000000..3207a62d3b --- /dev/null +++ b/packages/core/src/components/reorder/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('reorder: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/reorder/test/basic')); + +}); diff --git a/packages/core/src/components/reorder/test/basic.html b/packages/core/src/components/reorder/test/basic/index.html similarity index 96% rename from packages/core/src/components/reorder/test/basic.html rename to packages/core/src/components/reorder/test/basic/index.html index df7ec33b6c..980df3a089 100644 --- a/packages/core/src/components/reorder/test/basic.html +++ b/packages/core/src/components/reorder/test/basic/index.html @@ -3,7 +3,7 @@ - Ionic Reorder + Reorder - Basic @@ -13,7 +13,7 @@ - Item Reorder + Reorder - Basic Toggle diff --git a/packages/core/src/components/searchbar/test/basic/e2e.js b/packages/core/src/components/searchbar/test/basic/e2e.js new file mode 100644 index 0000000000..2b51f7ac78 --- /dev/null +++ b/packages/core/src/components/searchbar/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('searchbar: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/searchbar/test/basic')); + +}); diff --git a/packages/core/src/components/searchbar/test/basic.html b/packages/core/src/components/searchbar/test/basic/index.html similarity index 95% rename from packages/core/src/components/searchbar/test/basic.html rename to packages/core/src/components/searchbar/test/basic/index.html index d2a0a121b9..d8c38f0d5f 100644 --- a/packages/core/src/components/searchbar/test/basic.html +++ b/packages/core/src/components/searchbar/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Searchbar + Searchbar - Basic @@ -11,13 +11,7 @@ - - Basic Searchbar - - - - - + Searchbar - Basic diff --git a/packages/core/src/components/segment/test/basic/e2e.js b/packages/core/src/components/segment/test/basic/e2e.js new file mode 100644 index 0000000000..e265026f7f --- /dev/null +++ b/packages/core/src/components/segment/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('segment: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/segment/test/basic')); + +}); diff --git a/packages/core/src/components/segment/test/basic.html b/packages/core/src/components/segment/test/basic/index.html similarity index 96% rename from packages/core/src/components/segment/test/basic.html rename to packages/core/src/components/segment/test/basic/index.html index e336335e1a..7b8664a184 100644 --- a/packages/core/src/components/segment/test/basic.html +++ b/packages/core/src/components/segment/test/basic/index.html @@ -2,13 +2,19 @@ - Ionic Segment + Segment - Basic + + + Segment - Basic + + + diff --git a/packages/core/src/components/select/test/basic/e2e.js b/packages/core/src/components/select/test/basic/e2e.js new file mode 100644 index 0000000000..250c406d85 --- /dev/null +++ b/packages/core/src/components/select/test/basic/e2e.js @@ -0,0 +1,17 @@ +const { register, navigate, Page } = require('../../../../../scripts/e2e'); +const testPageURL = 'http://localhost:3333/src/components/select/test/basic'; + +describe('select: basic', () => { + + register('navigates', navigate(testPageURL)); + + describe('present', () => { + + register('shows selector', driver => { + const page = new Page(driver, testPageURL); + return page.present('.e2eSelectGender > button', { waitFor: 'ion-alert' }); + }); + + }); + +}); diff --git a/packages/core/src/components/select/test/basic.html b/packages/core/src/components/select/test/basic/index.html similarity index 98% rename from packages/core/src/components/select/test/basic.html rename to packages/core/src/components/select/test/basic/index.html index 231384613a..048cb7cb5f 100644 --- a/packages/core/src/components/select/test/basic.html +++ b/packages/core/src/components/select/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Select + Select - Basic @@ -11,7 +11,7 @@ - Select + Select - Basic @@ -21,7 +21,7 @@ Gender - + Female Male diff --git a/packages/core/src/components/slides/test/basic/e2e.js b/packages/core/src/components/slides/test/basic/e2e.js new file mode 100644 index 0000000000..674e8444e5 --- /dev/null +++ b/packages/core/src/components/slides/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('slides: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/slides/test/basic')); + +}); diff --git a/packages/core/src/components/slides/test/basic.html b/packages/core/src/components/slides/test/basic/index.html similarity index 65% rename from packages/core/src/components/slides/test/basic.html rename to packages/core/src/components/slides/test/basic/index.html index e418f65ba5..55858adfa9 100644 --- a/packages/core/src/components/slides/test/basic.html +++ b/packages/core/src/components/slides/test/basic/index.html @@ -2,18 +2,13 @@ - Ionic Slides Basic + Slides - Basic - +

Slide 1

diff --git a/packages/core/src/components/spinner/test/basic/e2e.js b/packages/core/src/components/spinner/test/basic/e2e.js new file mode 100644 index 0000000000..f9fee45d25 --- /dev/null +++ b/packages/core/src/components/spinner/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('spinner: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/spinner/test/basic')); + +}); diff --git a/packages/core/src/components/spinner/test/basic.html b/packages/core/src/components/spinner/test/basic/index.html similarity index 90% rename from packages/core/src/components/spinner/test/basic.html rename to packages/core/src/components/spinner/test/basic/index.html index a6d5fb57a8..5733a6b575 100644 --- a/packages/core/src/components/spinner/test/basic.html +++ b/packages/core/src/components/spinner/test/basic/index.html @@ -2,13 +2,19 @@ - Ionic Spinners + Spinner - Basic + + + Spinner - Basic + + + diff --git a/packages/core/src/components/spinner/test/color.html b/packages/core/src/components/spinner/test/color.html deleted file mode 100644 index 7368d1c9c3..0000000000 --- a/packages/core/src/components/spinner/test/color.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - Spinners - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Platform Default - -
ios - -
ios-small - -
bubbles - -
circles - -
crescent - -
dots - -
- - Toggle Paused - - diff --git a/packages/core/src/components/spinner/test/color/e2e.js b/packages/core/src/components/spinner/test/color/e2e.js new file mode 100644 index 0000000000..c7aed0056b --- /dev/null +++ b/packages/core/src/components/spinner/test/color/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('spinner: color', () => { + + register('navigates', navigate('http://localhost:3333/src/components/spinner/test/color')); + +}); diff --git a/packages/core/src/components/spinner/test/color/index.html b/packages/core/src/components/spinner/test/color/index.html new file mode 100644 index 0000000000..b939e5d7a1 --- /dev/null +++ b/packages/core/src/components/spinner/test/color/index.html @@ -0,0 +1,60 @@ + + + + + Spinner - Color + + + + + + + + + Spinner - Color + + + + + + + Spinner Loading Indicators + + + + Show Default Spinner + + + + Show Lines (Primary) + + + + Show Lines Small (Secondary) + + + + Show Dots (Danger) + + + + Show Bubbles (Light) + + + + Show Circles (Dark) + + + + Show Crescent (Primary) + + + + Show Paused Default Spinner (Secondary) + + + + + + + diff --git a/packages/core/src/components/split-pane/test/basic/e2e.js b/packages/core/src/components/split-pane/test/basic/e2e.js new file mode 100644 index 0000000000..76f7c6eaed --- /dev/null +++ b/packages/core/src/components/split-pane/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('split-pane: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/split-pane/test/basic')); + +}); diff --git a/packages/core/src/components/split-pane/test/basic.html b/packages/core/src/components/split-pane/test/basic/index.html similarity index 98% rename from packages/core/src/components/split-pane/test/basic.html rename to packages/core/src/components/split-pane/test/basic/index.html index 3b013b8905..9cbe370eeb 100644 --- a/packages/core/src/components/split-pane/test/basic.html +++ b/packages/core/src/components/split-pane/test/basic/index.html @@ -3,7 +3,7 @@ - Ionic Split Pane + Split Pane - Basic diff --git a/packages/core/src/components/tabs/test/basic/e2e.js b/packages/core/src/components/tabs/test/basic/e2e.js new file mode 100644 index 0000000000..1c7fa47a84 --- /dev/null +++ b/packages/core/src/components/tabs/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('tabs: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/tabs/test/basic')); + +}); diff --git a/packages/core/src/components/tabs/test/basic.html b/packages/core/src/components/tabs/test/basic/index.html similarity index 96% rename from packages/core/src/components/tabs/test/basic.html rename to packages/core/src/components/tabs/test/basic/index.html index 2a551a4558..9c1ccf3a63 100644 --- a/packages/core/src/components/tabs/test/basic.html +++ b/packages/core/src/components/tabs/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Spinners + Tab - Basic diff --git a/packages/core/src/components/toast/test/basic/e2e.js b/packages/core/src/components/toast/test/basic/e2e.js new file mode 100644 index 0000000000..0710ab6bb1 --- /dev/null +++ b/packages/core/src/components/toast/test/basic/e2e.js @@ -0,0 +1,17 @@ +const { register, navigate, Page } = require('../../../../../scripts/e2e'); +const testPageURL = 'http://localhost:3333/src/components/toast/test/basic'; + +describe('toast: basic', () => { + + register('navigates', navigate(testPageURL)); + + describe('present', () => { + + register('shows bottom toast', driver => { + const page = new Page(driver, testPageURL); + return page.present('.e2eShowBottomToast', { waitFor: 'ion-toast' }); + }); + + }); + +}); diff --git a/packages/core/src/components/toast/test/basic.html b/packages/core/src/components/toast/test/basic/index.html similarity index 89% rename from packages/core/src/components/toast/test/basic.html rename to packages/core/src/components/toast/test/basic/index.html index 0c572e721c..03faf66c89 100644 --- a/packages/core/src/components/toast/test/basic.html +++ b/packages/core/src/components/toast/test/basic/index.html @@ -3,7 +3,7 @@ - Ionic Toast + Toast - Basic @@ -12,13 +12,13 @@ - - Toast + + Toast - Basic - Show Toast Bottom + Show Toast Bottom Show Toast Top Show Toast Middle Show Toast with long message diff --git a/packages/core/src/components/toast/toast.ios.scss b/packages/core/src/components/toast/toast.ios.scss index 27493e7fff..c09ae08b61 100644 --- a/packages/core/src/components/toast/toast.ios.scss +++ b/packages/core/src/components/toast/toast.ios.scss @@ -8,7 +8,7 @@ $toast-ios-background: rgba(237, 237, 239, 1) !default; /// @prop - Border radius of the toast wrapper -$toast-ios-border-radius: 16px !default; +$toast-ios-border-radius: 14px !default; /// @prop - Color of the toast title $toast-ios-title-color: rgba(71, 71, 71, 1) !default; diff --git a/packages/core/src/components/toggle/test/basic/e2e.js b/packages/core/src/components/toggle/test/basic/e2e.js new file mode 100644 index 0000000000..c388aa3c82 --- /dev/null +++ b/packages/core/src/components/toggle/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('toggle: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/toggle/test/basic')); + +}); diff --git a/packages/core/src/components/toggle/test/basic.html b/packages/core/src/components/toggle/test/basic/index.html similarity index 97% rename from packages/core/src/components/toggle/test/basic.html rename to packages/core/src/components/toggle/test/basic/index.html index b009c87771..7e8d118e11 100644 --- a/packages/core/src/components/toggle/test/basic.html +++ b/packages/core/src/components/toggle/test/basic/index.html @@ -2,7 +2,7 @@ - Ionic Toggle + Toggle - Basic @@ -11,7 +11,7 @@ - Toggles + Toggle - Basic diff --git a/packages/core/src/components/toolbar/test/basic/e2e.js b/packages/core/src/components/toolbar/test/basic/e2e.js new file mode 100644 index 0000000000..107a368521 --- /dev/null +++ b/packages/core/src/components/toolbar/test/basic/e2e.js @@ -0,0 +1,7 @@ +const { register, navigate } = require('../../../../../scripts/e2e'); + +describe('toolbar: basic', () => { + + register('navigates', navigate('http://localhost:3333/src/components/toolbar/test/basic')); + +}); diff --git a/packages/core/src/components/toolbar/test/basic/index.html b/packages/core/src/components/toolbar/test/basic/index.html new file mode 100644 index 0000000000..df2ec7dbba --- /dev/null +++ b/packages/core/src/components/toolbar/test/basic/index.html @@ -0,0 +1,31 @@ + + + + + Toolbar - Basic + + + + + + + + + Toolbar - Basic + + + + + + + + Footer Toolbar + + + + + + + + +