Simplify

Author: t3chguy

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

@@ -178,9 +178,9 @@ jobs:
 
             # We skip tests tagged with @mergequeue when running on PRs, but run them in MQ and everywhere else
             - name: Run Playwright tests
+              working-directory: apps/web
               run: |
                   pnpm playwright test \
-                      --config apps/web/playwright.config.ts \
                       --shard "$SHARD" \
                       --project="${{ matrix.project }}" \
                       ${{ (github.event_name == 'pull_request' && matrix.runAllTests == false ) && '--grep-invert @mergequeue' || '' }}
@@ -289,7 +289,10 @@ jobs:
 
             - name: Merge into HTML Report
               if: inputs.skip != true
-              run: pnpm playwright merge-reports --config=playwright-merge.config.ts ./all-blob-reports
+              run: |
+                  pnpm playwright merge-reports \
+                      --reporter=html,./packages/playwright-common/flaky-reporter.ts,@element-hq/element-web-playwright-common/lib/stale-screenshot-reporter.js \
+                      ./all-blob-reports
               env:
                   # Only pass creds to the flaky-reporter on main branch runs
                   GITHUB_TOKEN: ${{ github.ref_name == 'develop' && secrets.ELEMENT_BOT_TOKEN || '' }}

.github/workflows/build_desktop_test.yaml

@@ -54,16 +54,18 @@ jobs:
             - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
               with:
                   name: ${{ inputs.artifact }}
-                  path: dist
+                  path: apps/desktop/dist
 
             - name: Prepare for tests
+              working-directory: apps/desktop
               # This is set by the caller of the reusable workflow, they have the ability to run the command they specify
               # directly without our help so this is fine.
               run: ${{ inputs.prepare_cmd }} # zizmor: ignore[template-injection]
               if: inputs.prepare_cmd
 
             - name: Expand executable path
               id: executable
+              working-directory: apps/desktop
               shell: bash
               env:
                   EXECUTABLE: ${{ inputs.executable }}
@@ -75,6 +77,7 @@ jobs:
             # it to be enabled to test Electron apps, so turn it back on.
             - name: Set EnableNodeCliInspectArguments fuse enabled
               run: $RUN_AS npx @electron/fuses write --app "$EXECUTABLE" EnableNodeCliInspectArguments=on
+              working-directory: apps/desktop
               shell: bash
               env:
                   # We need sudo on Linux as it is installed in /opt/
@@ -85,7 +88,7 @@ jobs:
               uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
               timeout-minutes: 20
               with:
-                  run: pnpm playwright test --config apps/desktop/playwright.config.ts ${{ runner.os != 'Linux' && '--ignore-snapshots' || '' }} ${{ inputs.blob_report == false && '--reporter=html' || '' }} ${{ inputs.args }}
+                  run: pnpm -C apps/desktop playwright test ${{ runner.os != 'Linux' && '--ignore-snapshots' || '' }} ${{ inputs.blob_report == false && '--reporter=html' || '' }} ${{ inputs.args }}
               env:
                   PW_TAG: ${{ inputs.project }}
                   ELEMENT_DESKTOP_EXECUTABLE: ${{ steps.executable.outputs.path }}

knip.ts

@@ -7,6 +7,10 @@ export default {
     workspaces: {
         "packages/shared-components": {},
         "packages/playwright-common": {
+            ignore: [
+                // Used in build-and-test playwright merge-reports
+                "flaky-reporter.ts",
+            ],
             ignoreDependencies: [
                 // Used in playwright-screenshots.sh
                 "wait-on",

package.json

@@ -45,6 +45,7 @@
         "@nx-tools/nx-container": "^7.2.1",
         "@nx/jest": "^22.5.0",
         "@types/node": "22",
+        "@playwright/test": "catalog:",
         "cronstrue": "^3.0.0",
         "eslint-plugin-matrix-org": "^3.0.0",
         "husky": "^9.0.0",

playwright/flaky-reporter.ts …ages/playwright-common/flaky-reporter.tsplaywright/flaky-reporter.ts renamed to packages/playwright-common/flaky-reporter.ts playwright/flaky-reporter.ts renamed to packages/playwright-common/flaky-reporter.ts

@@ -26,7 +26,7 @@ type PaginationLinks = {
 
 // We see quite a few test flakes which are caused by the app exploding
 // so we have some magic strings we check the logs for to better track the flake with its cause
-const SPECIAL_CASES = {
+const SPECIAL_CASES: Record<string, string> = {
     "ChunkLoadError": "ChunkLoadError",
     "Unreachable code should not be executed": "Rust crypto panic",
     "Out of bounds memory access": "Rust crypto memory error",
@@ -37,7 +37,7 @@ class FlakyReporter implements Reporter {
 
     public onTestEnd(test: TestCase): void {
         // Ignores flakes on Dendrite and Pinecone as they have their own flakes we do not track
-        if (["Dendrite", "Pinecone"].includes(test.parent.project()?.name)) return;
+        if (["Dendrite", "Pinecone"].includes(test.parent.project()!.name!)) return;
         let failures = [`${test.location.file.split("playwright/e2e/")[1]}: ${test.title}`];
         if (test.outcome() === "flaky") {
             const timedOutRuns = test.results.filter((result) => result.status === "timedOut");
@@ -46,7 +46,7 @@ class FlakyReporter implements Reporter {
             );
             // If a test failed due to a systemic fault then the test is not flaky, the app is, record it as such.
             const specialCases = Object.keys(SPECIAL_CASES).filter((log) =>
-                pageLogs.some((attachment) => attachment.name.startsWith("page-") && attachment.body.includes(log)),
+                pageLogs.some((attachment) => attachment.name.startsWith("page-") && attachment.body?.includes(log)),
             );
             if (specialCases.length > 0) {
                 failures = specialCases.map((specialCase) => SPECIAL_CASES[specialCase]);
@@ -56,7 +56,7 @@ class FlakyReporter implements Reporter {
                 if (!this.flakes.has(title)) {
                     this.flakes.set(title, []);
                 }
-                this.flakes.get(title).push(test);
+                this.flakes.get(title)!.push(test);
             }
         }
     }
@@ -76,8 +76,8 @@ class FlakyReporter implements Reporter {
         if (!link) return map;
         const matches = link.matchAll(/(<(?<link>.+?)>; rel="(?<type>.+?)")/g);
         for (const match of matches) {
-            const { link, type } = match.groups;
-            map[type] = link;
+            const { link, type } = match.groups!;
+            map[type as keyof PaginationLinks] = link;
         }
         return map;
     }
@@ -102,9 +102,9 @@ class FlakyReporter implements Reporter {
             issues.push(...fetchedIssues);
 
             // Get the next link for fetching more results
-            const linkHeader = issuesResponse.headers.get("Link");
+            const linkHeader = issuesResponse.headers.get("Link")!;
             const parsed = this.parseLinkHeader(linkHeader);
-            url = parsed.next;
+            url = parsed.next!;
         }
         return issues;
     }