Skip to content

Commit 7604a6c

Browse files
committed
Iterate
1 parent d89f672 commit 7604a6c

5 files changed

Lines changed: 29 additions & 9 deletions

File tree

.github/workflows/build-and-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ jobs:
291291
if: inputs.skip != true
292292
run: |
293293
pnpm playwright merge-reports \
294-
--reporter=html,./packages/playwright-common/flaky-reporter.ts,@element-hq/element-web-playwright-common/lib/stale-screenshot-reporter.js \
294+
--config=playwright-merge.config.ts \
295295
./all-blob-reports
296296
env:
297297
# Only pass creds to the flaky-reporter on main branch runs

knip.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ export default {
77
workspaces: {
88
"packages/shared-components": {},
99
"packages/playwright-common": {
10-
ignore: [
11-
// Used in build-and-test playwright merge-reports
12-
"flaky-reporter.ts",
13-
],
1410
ignoreDependencies: [
1511
// Used in playwright-screenshots.sh
1612
"wait-on",

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"devDependencies": {
4343
"@action-validator/cli": "^0.6.0",
4444
"@action-validator/core": "^0.6.0",
45+
"@element-hq/element-web-playwright-common": "catalog:",
4546
"@nx-tools/nx-container": "^7.2.1",
4647
"@nx/jest": "^22.5.0",
4748
"@types/node": "22",

playwright-merge.config.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
Copyright 2026 Element Creations Ltd.
3+
4+
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
5+
Please see LICENSE files in the repository root for full details.
6+
*/
7+
8+
import { defineConfig } from "@playwright/test";
9+
10+
export default defineConfig({
11+
// Playwright only supports merging using a single testDir, specifying web here
12+
// means that some parts of the report for Desktop will be incorrect, but this is minor.
13+
// https://github.com/microsoft/playwright/issues/39855
14+
testDir: "apps/web/playwright/e2e",
15+
reporter: [
16+
["html", { open: "never" }],
17+
["./packages/playwright-common/flaky-reporter.ts"],
18+
["@element-hq/element-web-playwright-common/lib/stale-screenshot-reporter.js"],
19+
],
20+
});

pnpm-lock.yaml

Lines changed: 7 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)