From b85b7c6b9ddde03b77812e443dff48843bb5cefd Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 12 Jun 2019 11:41:26 -0400 Subject: [PATCH 1/4] fix(test): rsolve race conditions with toast and item --- core/src/components/item/test/inputs/e2e.ts | 9 ++++++--- core/src/components/toast/test/test.utils.ts | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/src/components/item/test/inputs/e2e.ts b/core/src/components/item/test/inputs/e2e.ts index 6775677cf7..971e1dc41d 100644 --- a/core/src/components/item/test/inputs/e2e.ts +++ b/core/src/components/item/test/inputs/e2e.ts @@ -15,8 +15,10 @@ test('item: inputs', async () => { expect(compare).toMatchScreenshot(); // Disable everything - await page.click('#btnDisabled'); - await page.waitFor(500); + const disableToggle = await page.find('#btnDisabled'); + await disableToggle.waitForVisible(); + await disableToggle.click(); + await page.waitFor(100); // check form await page.click('#submit'); @@ -28,7 +30,7 @@ test('item: inputs', async () => { expect(compare).toMatchScreenshot(); // Reenable and set some value - await page.click('#btnDisabled'); + await disableToggle.click(); await page.click('#btnSomeValue'); await page.waitFor(100); @@ -64,5 +66,6 @@ test('item: inputs', async () => { async function checkFormResult(page: E2EPage, content: string) { const div = await page.find('#form-result'); + expect(div.textContent).toEqual(content); } diff --git a/core/src/components/toast/test/test.utils.ts b/core/src/components/toast/test/test.utils.ts index b7df07e3a3..918a2d71b0 100644 --- a/core/src/components/toast/test/test.utils.ts +++ b/core/src/components/toast/test/test.utils.ts @@ -16,10 +16,12 @@ export async function testToast( const screenshotCompares = []; - await page.click(selector); - await page.waitForSelector(selector); + const button = await page.find(selector); + await button.waitForVisible(); + await button.click(); let toast = await page.find('ion-toast'); + await toast.waitForVisible(); expect(toast).not.toBe(null); await toast.waitForVisible(); From 36fd78281c01a0635ad554fb5ba1f8dc406e4a9f Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 12 Jun 2019 12:16:52 -0400 Subject: [PATCH 2/4] fix(test): avoid more race conditions --- core/src/components/datetime/test/basic/e2e.ts | 1 + core/src/components/item/test/inputs/e2e.ts | 2 +- core/src/components/toast/test/test.utils.ts | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/components/datetime/test/basic/e2e.ts b/core/src/components/datetime/test/basic/e2e.ts index dc85a43cfa..99279a9205 100644 --- a/core/src/components/datetime/test/basic/e2e.ts +++ b/core/src/components/datetime/test/basic/e2e.ts @@ -9,6 +9,7 @@ test('datetime: basic', async () => { expect(compare).toMatchScreenshot(); const datetime = await page.find('#customPickerOptions'); + await datetime.waitForVisible(); await datetime.click(); const picker = await page.find('ion-picker'); diff --git a/core/src/components/item/test/inputs/e2e.ts b/core/src/components/item/test/inputs/e2e.ts index 971e1dc41d..e05f5f8121 100644 --- a/core/src/components/item/test/inputs/e2e.ts +++ b/core/src/components/item/test/inputs/e2e.ts @@ -18,7 +18,7 @@ test('item: inputs', async () => { const disableToggle = await page.find('#btnDisabled'); await disableToggle.waitForVisible(); await disableToggle.click(); - await page.waitFor(100); + await page.waitFor(300); // check form await page.click('#submit'); diff --git a/core/src/components/toast/test/test.utils.ts b/core/src/components/toast/test/test.utils.ts index 918a2d71b0..9319374500 100644 --- a/core/src/components/toast/test/test.utils.ts +++ b/core/src/components/toast/test/test.utils.ts @@ -19,7 +19,9 @@ export async function testToast( const button = await page.find(selector); await button.waitForVisible(); await button.click(); - + + await page.waitFor(250); + let toast = await page.find('ion-toast'); await toast.waitForVisible(); From 8b8bbb8a8d1dda055d9a33bd00001641881d4437 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 12 Jun 2019 12:24:08 -0400 Subject: [PATCH 3/4] chore(): run linter --- core/src/components/toast/test/test.utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/components/toast/test/test.utils.ts b/core/src/components/toast/test/test.utils.ts index 9319374500..dfc81a63dd 100644 --- a/core/src/components/toast/test/test.utils.ts +++ b/core/src/components/toast/test/test.utils.ts @@ -19,9 +19,9 @@ export async function testToast( const button = await page.find(selector); await button.waitForVisible(); await button.click(); - + await page.waitFor(250); - + let toast = await page.find('ion-toast'); await toast.waitForVisible(); From 0f242fd956f8cf0143ef36e9cadb1f8dac62cadd Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 12 Jun 2019 12:43:33 -0400 Subject: [PATCH 4/4] 4.5.0 --- CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++ angular/package.json | 4 ++-- core/README.md | 4 ++-- core/package.json | 2 +- docs/package.json | 2 +- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c23ab302d9..b5c014115a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,39 @@ +# [4.5.0](https://github.com/ionic-team/ionic/compare/v4.4.2...v4.5.0) (2019-06-12) + + +### Bug Fixes + +* **angular:** ensure all NavigationExtras values are preserved when navigating ([#18468](https://github.com/ionic-team/ionic/issues/18468)) ([7610787](https://github.com/ionic-team/ionic/commit/7610787)), closes [#18469](https://github.com/ionic-team/ionic/issues/18469) +* **button:** set opacity on the host element for disabled button ([#18509](https://github.com/ionic-team/ionic/issues/18509)) ([320719b](https://github.com/ionic-team/ionic/commit/320719b)), closes [#16965](https://github.com/ionic-team/ionic/issues/16965) +* **button:** use correct border-radius on menu and back button ([#18501](https://github.com/ionic-team/ionic/issues/18501)) ([055e125](https://github.com/ionic-team/ionic/commit/055e125)), closes [#17624](https://github.com/ionic-team/ionic/issues/17624) +* **button:** use correct size on a dynamic button in an item ([#18395](https://github.com/ionic-team/ionic/issues/18395)) ([a3e23fc](https://github.com/ionic-team/ionic/commit/a3e23fc)), closes [#18085](https://github.com/ionic-team/ionic/issues/18085) +* **card:** remove white space from bottom of card ([#18328](https://github.com/ionic-team/ionic/issues/18328)) ([d53e7aa](https://github.com/ionic-team/ionic/commit/d53e7aa)) +* **content:** prevent ion-searchbar from receiving padding adjustment when keyboard is open ([#18008](https://github.com/ionic-team/ionic/issues/18008)) ([b2290a6](https://github.com/ionic-team/ionic/commit/b2290a6)), closes [#18007](https://github.com/ionic-team/ionic/issues/18007) +* **datetime:** recalculate time columns on change ([#18380](https://github.com/ionic-team/ionic/issues/18380)) ([292b24a](https://github.com/ionic-team/ionic/commit/292b24a)) +* **item:** start align the content under stacked and floating labels ([#18379](https://github.com/ionic-team/ionic/issues/18379)) ([f0af707](https://github.com/ionic-team/ionic/commit/f0af707)), closes [#16375](https://github.com/ionic-team/ionic/issues/16375) +* **item:** inherit overflow to allow better customization ([#18502](https://github.com/ionic-team/ionic/issues/18502)) ([8d2a47e](https://github.com/ionic-team/ionic/commit/8d2a47e)), closes [#17670](https://github.com/ionic-team/ionic/issues/17670) +* **item:** use a step color if the activated background is not set ([#18450](https://github.com/ionic-team/ionic/issues/18450)) ([1899c13](https://github.com/ionic-team/ionic/commit/1899c13)), closes [#18449](https://github.com/ionic-team/ionic/issues/18449) +* **item-sliding:** use the correct gesture direction and side for rtl ([#18366](https://github.com/ionic-team/ionic/issues/18366)) ([4545100](https://github.com/ionic-team/ionic/commit/4545100)), closes [#17012](https://github.com/ionic-team/ionic/issues/17012) +* **label:** include the ion-text-wrap class styles for larger font ([#18374](https://github.com/ionic-team/ionic/issues/18374)) ([4bba540](https://github.com/ionic-team/ionic/commit/4bba540)) +* **platform:** prevent error with Platform.is on Android 4.4 ([#18387](https://github.com/ionic-team/ionic/issues/18387)) ([54bdb36](https://github.com/ionic-team/ionic/commit/54bdb36)) +* **react:** ensure element exists in controller before dismissing it ([0fd3e5d](https://github.com/ionic-team/ionic/commit/0fd3e5d)) +* **slides:** resolve issue where double tap to zoom was enabled by default ([10de1da](https://github.com/ionic-team/ionic/commit/10de1da)), closes [#18035](https://github.com/ionic-team/ionic/issues/18035) +* **tabs:** allow selection on enter and spacebar press ([#18381](https://github.com/ionic-team/ionic/issues/18381)) ([11cde99](https://github.com/ionic-team/ionic/commit/11cde99)), closes [#18363](https://github.com/ionic-team/ionic/issues/18363) +* **textarea:** inherit white-space for better customization ([#18508](https://github.com/ionic-team/ionic/issues/18508)) ([a583902](https://github.com/ionic-team/ionic/commit/a583902)), closes [#18495](https://github.com/ionic-team/ionic/issues/18495) +* **virtual-scroll:** do not crash with an empty cell list ([#17799](https://github.com/ionic-team/ionic/issues/17799)) ([20c146e](https://github.com/ionic-team/ionic/commit/20c146e)) + + +### Features + +* **back-button:** add variables and support for focused and hover states ([#18451](https://github.com/ionic-team/ionic/issues/18451)) ([58672fb](https://github.com/ionic-team/ionic/commit/58672fb)), closes [#18465](https://github.com/ionic-team/ionic/issues/18465) +* **button:** add variables for customizing hover state ([#18499](https://github.com/ionic-team/ionic/issues/18499)) ([5c5934b](https://github.com/ionic-team/ionic/commit/5c5934b)), closes [#17974](https://github.com/ionic-team/ionic/issues/17974) +* **item-divider:** add inner padding CSS variables ([#18490](https://github.com/ionic-team/ionic/issues/18490)) ([35c143a](https://github.com/ionic-team/ionic/commit/35c143a)), closes [#18484](https://github.com/ionic-team/ionic/issues/18484) +* **menu-button:** add variables for hover and focused states ([#18434](https://github.com/ionic-team/ionic/issues/18434)) ([5ba0aa9](https://github.com/ionic-team/ionic/commit/5ba0aa9)), closes [#18279](https://github.com/ionic-team/ionic/issues/18279) +* **searchbar:** add cancel button options ([b959e0b](https://github.com/ionic-team/ionic/commit/b959e0b)) +* **toast:** allow html content ([#18423](https://github.com/ionic-team/ionic/issues/18423)) ([c8104a2](https://github.com/ionic-team/ionic/commit/c8104a2)) + + + ## [4.4.2](https://github.com/ionic-team/ionic/compare/v4.4.1...v4.4.2) (2019-05-22) diff --git a/angular/package.json b/angular/package.json index e1e24d3ca3..fcaa9f8cf2 100644 --- a/angular/package.json +++ b/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "4.4.2", + "version": "4.5.0", "description": "Angular specific wrappers for @ionic/core", "keywords": [ "ionic", @@ -45,7 +45,7 @@ "css/" ], "dependencies": { - "@ionic/core": "4.4.2", + "@ionic/core": "4.5.0", "tslib": "^1.9.3" }, "peerDependencies": { diff --git a/core/README.md b/core/README.md index be7f328f5f..c2950293ae 100644 --- a/core/README.md +++ b/core/README.md @@ -23,8 +23,8 @@ The Ionic Core package contains the Web Components that make up the reusable UI Easiest way to start using Ionic Core is by adding a script tag to the CDN: ```html - - + + ``` Any Ionic component added to the webpage will automatically load. This includes writing the component tag directly in HTML, or using JavaScript such as `document.createElement('ion-toggle')`. diff --git a/core/package.json b/core/package.json index 3d921ca7dd..9fd7f511bb 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "4.4.2", + "version": "4.5.0", "description": "Base components for Ionic", "keywords": [ "ionic", diff --git a/docs/package.json b/docs/package.json index a4577227da..e01ec136c7 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "4.4.2", + "version": "4.5.0", "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "files": [