Skip to content

Commit dd1a1c9

Browse files
authored
Merge branch 'ionic-team:main' into main
2 parents fedefa3 + d36283e commit dd1a1c9

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.github/workflows/actions/test-core-screenshot/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ runs:
4949
# which is why we not using the upload-archive
5050
# composite step here.
5151
run: |
52-
npm run test.e2e.docker.ci ${{ inputs.component }} -- --shard=${{ inputs.shard }}/${{ inputs.totalShards }} --update-snapshots
52+
npm run test.e2e.docker.ci ${{ inputs.component }} -- --shard=${{ inputs.shard }}/${{ inputs.totalShards }} --update-snapshots='changed'
5353
git add src/\*.png --force
5454
mkdir updated-screenshots
5555
cd ../ && rsync -R --progress $(git diff --name-only --cached) core/updated-screenshots

core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@
9393
"test": "npm run test.spec && npm run test.e2e",
9494
"test.spec": "stencil test --spec --max-workers=2",
9595
"test.e2e": "npx playwright test",
96-
"test.e2e.update-snapshots": "npm run test.e2e -- --update-snapshots",
96+
"test.e2e.update-snapshots": "npm run test.e2e -- --update-snapshots='changed'",
9797
"test.watch": "jest --watch --no-cache",
9898
"test.treeshake": "node scripts/treeshaking.js dist/index.js",
9999
"validate": "npm run lint && npm run test && npm run build && npm run test.treeshake",
100100
"docker.build": "docker build -t ionic-playwright .",
101101
"test.e2e.docker": "npm run docker.build && node ./scripts/docker.mjs",
102-
"test.e2e.docker.update-snapshots": "npm run test.e2e.docker -- --update-snapshots",
102+
"test.e2e.docker.update-snapshots": "npm run test.e2e.docker -- --update-snapshots='changed'",
103103
"test.e2e.docker.ci": "npm run docker.build && CI=true node ./scripts/docker.mjs",
104104
"test.e2e.script": "node scripts/testing/e2e-script.mjs"
105105
},

core/src/components/infinite-scroll/test/top/infinite-scroll.e2e.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import { configs, test } from '@utils/test/playwright';
33

44
configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
55
test.describe(title('infinite-scroll: top'), () => {
6-
test('should load more items when scrolled to the top', async ({ page }) => {
6+
test('should load more items when scrolled to the top', async ({ page, skip }) => {
7+
// TODO(FW-6394): remove once flaky issue is resolved
8+
skip.browser('webkit', 'Safari is flaky on CI');
9+
710
await page.goto('/src/components/infinite-scroll/test/top', config);
811

912
const ionInfiniteComplete = await page.spyOnEvent('ionInfiniteComplete');

0 commit comments

Comments
 (0)