From f0f6b39dfd18a42427132ca8042ec0321e4e5bf6 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Tue, 20 Dec 2022 18:04:44 -0500 Subject: [PATCH 1/5] chore(): start holiday triage 2022 (#26521) --- .github/ionic-issue-bot.yml | 7 ++++++- .github/workflows/nightly.yml | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/ionic-issue-bot.yml b/.github/ionic-issue-bot.yml index c62a98b9e5..8cebb760c4 100644 --- a/.github/ionic-issue-bot.yml +++ b/.github/ionic-issue-bot.yml @@ -1,10 +1,15 @@ triage: - label: triage + label: "holiday triage" removeLabelWhenProjectAssigned: true dryRun: false comment: labels: + - label: "holiday triage" + message: > + Thanks for the issue! This issue has been labeled as `holiday triage`. With the winter holidays quickly approaching, much of the Ionic Team will soon be taking time off. During this time, issue triaging and PR review will be delayed until the team begins to return. After this period, we will work to ensure that all new issues are properly triaged and that new PRs are reviewed. + In the meantime, please read our [Winter Holiday Triage Guide](https://github.com/ionic-team/ionic-framework/issues/22699) for information on how to ensure that your issue is triaged correctly. + Thank you! - label: "help wanted" message: > This issue has been labeled as `help wanted`. This label is added to issues diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e69b5d107a..3aa2d5ef14 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,11 +1,5 @@ name: 'Ionic Nightly Build' -on: - schedule: - # Run every Monday-Friday - # at 6:00 UTC (6:00 am UTC) - - cron: '00 06 * * 1-5' - jobs: create-nightly-hash: runs-on: ubuntu-latest From 9503f0b3f4181e30d5ee970ee9a5fafa30bf6285 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 08:30:46 -0500 Subject: [PATCH 2/5] chore(deps-dev): bump @playwright/test from 1.29.0 to 1.29.1 in /core (#26528) Bumps [@playwright/test](https://github.com/Microsoft/playwright) from 1.29.0 to 1.29.1. - [Release notes](https://github.com/Microsoft/playwright/releases) - [Commits](https://github.com/Microsoft/playwright/compare/v1.29.0...v1.29.1) --- updated-dependencies: - dependency-name: "@playwright/test" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/package-lock.json | 64 +++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/core/package-lock.json b/core/package-lock.json index ee6b957b52..161e0f2302 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -1513,13 +1513,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.29.0.tgz", - "integrity": "sha512-gp5PVBenxTJsm2bATWDNc2CCnrL5OaA/MXQdJwwkGQtqTjmY+ZOqAdLqo49O9MLTDh2vYh+tHWDnmFsILnWaeA==", + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.29.1.tgz", + "integrity": "sha512-iQxk2DX5U9wOGV3+/Jh9OHPsw5H3mleUL2S4BgQuwtlAfK3PnKvn38m4Rg9zIViGHVW24opSm99HQm/UFLEy6w==", "dev": true, "dependencies": { "@types/node": "*", - "playwright-core": "1.29.0" + "playwright-core": "1.29.1" }, "bin": { "playwright": "cli.js" @@ -8351,9 +8351,9 @@ } }, "node_modules/playwright-core": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.29.0.tgz", - "integrity": "sha512-pboOm1m0RD6z1GtwAbEH60PYRfF87vKdzOSRw2RyO0Y0a7utrMyWN2Au1ojGvQr4umuBMODkKTv607YIRypDSQ==", + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.29.1.tgz", + "integrity": "sha512-20Ai3d+lMkWpI9YZYlxk8gxatfgax5STW8GaMozAHwigLiyiKQrdkt7gaoT9UQR8FIVDg6qVXs9IoZUQrDjIIg==", "dev": true, "bin": { "playwright": "cli.js" @@ -11477,7 +11477,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/@ionic/prettier-config/-/prettier-config-2.0.0.tgz", "integrity": "sha512-ageMx54B9qqS1scnFW3kQW2NW8HyXwUM/p9c1YSWFKr6Yct7YVNbJFY3EcFapaNTiDnwo+GLlPRt+wST6E8AfA==", - "dev": true + "dev": true, + "requires": {} }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", @@ -11913,13 +11914,13 @@ } }, "@playwright/test": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.29.0.tgz", - "integrity": "sha512-gp5PVBenxTJsm2bATWDNc2CCnrL5OaA/MXQdJwwkGQtqTjmY+ZOqAdLqo49O9MLTDh2vYh+tHWDnmFsILnWaeA==", + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.29.1.tgz", + "integrity": "sha512-iQxk2DX5U9wOGV3+/Jh9OHPsw5H3mleUL2S4BgQuwtlAfK3PnKvn38m4Rg9zIViGHVW24opSm99HQm/UFLEy6w==", "dev": true, "requires": { "@types/node": "*", - "playwright-core": "1.29.0" + "playwright-core": "1.29.1" } }, "@rollup/plugin-node-resolve": { @@ -11941,7 +11942,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-2.0.3.tgz", "integrity": "sha512-pw6ziJcyjZtntQ//bkad9qXaBx665SgEL8C8KI5wO8G5iU5MPxvdWrQyVaAvjojGm9tJoS8M9Z/EEepbqieYmw==", - "dev": true + "dev": true, + "requires": {} }, "@rollup/pluginutils": { "version": "3.1.0", @@ -11976,7 +11978,8 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/@stencil/angular-output-target/-/angular-output-target-0.4.0.tgz", "integrity": "sha512-zauaj0za46IWoPgv2IanDp3tiljwDRDNk4jB7WII6KeL66dkk7ffeqYZ0CgySTU5W2FjnKR6JEKbAnwUxjGIsA==", - "dev": true + "dev": true, + "requires": {} }, "@stencil/core": { "version": "2.18.0", @@ -11987,19 +11990,22 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/@stencil/react-output-target/-/react-output-target-0.2.1.tgz", "integrity": "sha512-A6ut+ua3s9UPVXHmAco8g6phvRsr8Db1wM6Mws2bdSAawzc1n49afS+FbTMUMcjqKAGShMp5lsM0/QA0jx5SdQ==", - "dev": true + "dev": true, + "requires": {} }, "@stencil/sass": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-2.0.0.tgz", "integrity": "sha512-Be7Tz7YJnMzloot0aG3m2wTVt9Dg0rjOU+ZVx49ts9+hyeW+NEmvSWPv6bhypblRXbSGik2Cc3AYboTma4Qpgg==", - "dev": true + "dev": true, + "requires": {} }, "@stencil/vue-output-target": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/@stencil/vue-output-target/-/vue-output-target-0.6.2.tgz", "integrity": "sha512-Oh7SLFbOUchCSCbGe/Dqal2xSYPKCFQiVKnvzvS0dsHP/XS7rfHqp3qptW6JCp9lBoo3wmmBurHfldqxhLlnag==", - "dev": true + "dev": true, + "requires": {} }, "@stylelint/postcss-css-in-js": { "version": "0.37.2", @@ -12494,7 +12500,8 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "dev": true, + "requires": {} }, "acorn-walk": { "version": "7.2.0", @@ -13906,7 +13913,8 @@ "version": "8.5.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", - "dev": true + "dev": true, + "requires": {} }, "eslint-import-resolver-node": { "version": "0.3.6", @@ -15680,7 +15688,8 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", - "dev": true + "dev": true, + "requires": {} }, "jest-regex-util": { "version": "27.5.1", @@ -17003,14 +17012,15 @@ "version": "8.4.2", "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz", "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==", - "dev": true + "dev": true, + "requires": {} } } }, "playwright-core": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.29.0.tgz", - "integrity": "sha512-pboOm1m0RD6z1GtwAbEH60PYRfF87vKdzOSRw2RyO0Y0a7utrMyWN2Au1ojGvQr4umuBMODkKTv607YIRypDSQ==", + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.29.1.tgz", + "integrity": "sha512-20Ai3d+lMkWpI9YZYlxk8gxatfgax5STW8GaMozAHwigLiyiKQrdkt7gaoT9UQR8FIVDg6qVXs9IoZUQrDjIIg==", "dev": true }, "postcss": { @@ -17175,7 +17185,8 @@ "version": "0.36.2", "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz", "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==", - "dev": true + "dev": true, + "requires": {} }, "postcss-value-parser": { "version": "4.1.0", @@ -18738,7 +18749,8 @@ "version": "7.4.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", - "dev": true + "dev": true, + "requires": {} }, "xml-name-validator": { "version": "3.0.0", From 1917c712350604ec5a1cba85de23cb39e015f563 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 4 Jan 2023 09:28:28 -0500 Subject: [PATCH 3/5] test(datetime): resolve flaky tests as year changes (#26561) --- .../datetime/test/locale/datetime.e2e.ts | 7 +++---- .../test/prefer-wheel/datetime.e2e.ts | 21 +++++++++++++++---- .../datetime/test/presentation/index.html | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/core/src/components/datetime/test/locale/datetime.e2e.ts b/core/src/components/datetime/test/locale/datetime.e2e.ts index 42f04f0c46..8863197f64 100644 --- a/core/src/components/datetime/test/locale/datetime.e2e.ts +++ b/core/src/components/datetime/test/locale/datetime.e2e.ts @@ -121,11 +121,9 @@ test.describe('ar-EG', () => { `); await page.waitForSelector('.datetime-ready'); - const datetimeYears = page.locator('ion-datetime .year-column .picker-item:not(.picker-item-empty)'); + const datetimeYear = page.locator('ion-datetime .year-column .picker-item[data-value="2022"]'); - await expect(datetimeYears.nth(0)).toHaveText('٢٠٢٢'); - await expect(datetimeYears.nth(1)).toHaveText('٢٠٢١'); - await expect(datetimeYears.nth(2)).toHaveText('٢٠٢٠'); + await expect(datetimeYear).toHaveText('٢٠٢٢'); }); }); @@ -147,6 +145,7 @@ class DatetimeLocaleFixture { locale="${this.locale}" presentation="${presentation}" value="2022-04-19T04:20:00" + max="2022" > `); diff --git a/core/src/components/datetime/test/prefer-wheel/datetime.e2e.ts b/core/src/components/datetime/test/prefer-wheel/datetime.e2e.ts index 647b56dd59..ec4279714c 100644 --- a/core/src/components/datetime/test/prefer-wheel/datetime.e2e.ts +++ b/core/src/components/datetime/test/prefer-wheel/datetime.e2e.ts @@ -17,14 +17,14 @@ test.describe('datetime: prefer wheel', () => { test.describe('datetime: wheel rendering', () => { test('should not have visual regressions for date wheel', async ({ page }) => { await page.setContent(` - + `); expect(await page.screenshot()).toMatchSnapshot(`datetime-wheel-date-diff-${page.getSnapshotSettings()}.png`); }); test('should not have visual regressions for date-time wheel', async ({ page }) => { await page.setContent(` - + `); expect(await page.screenshot()).toMatchSnapshot( @@ -33,7 +33,7 @@ test.describe('datetime: prefer wheel', () => { }); test('should not have visual regressions for time-date wheel', async ({ page }) => { await page.setContent(` - + `); expect(await page.screenshot()).toMatchSnapshot( @@ -42,7 +42,7 @@ test.describe('datetime: prefer wheel', () => { }); test('should render a condense header when specified', async ({ page }) => { await page.setContent(` -
My Custom Title
 +
My Custom Title
 `); await page.waitForSelector('.datetime-ready'); @@ -131,6 +131,19 @@ test.describe('datetime: prefer wheel', () => { presentation="date" prefer-wheel="true" > + + `); await page.waitForSelector('.datetime-ready'); diff --git a/core/src/components/datetime/test/presentation/index.html b/core/src/components/datetime/test/presentation/index.html index 74c3303444..2ed3c59e01 100644 --- a/core/src/components/datetime/test/presentation/index.html +++ b/core/src/components/datetime/test/presentation/index.html @@ -35,7 +35,7 @@ - +