Iterate

Author: t3chguy

.github/workflows/build_desktop_test.yaml

@@ -54,18 +54,16 @@ jobs:
             - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
               with:
                   name: ${{ inputs.artifact }}
-                  path: apps/desktop/dist
+                  path: 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 }}
@@ -77,7 +75,6 @@ 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/
@@ -88,8 +85,9 @@ jobs:
               uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
               timeout-minutes: 20
               with:
-                  run: pnpm playwright test --config apps/desktop/playwright.config.ts --project=${{ inputs.project }} ${{ runner.os != 'Linux' && '--ignore-snapshots' || '' }} ${{ inputs.blob_report == false && '--reporter=html' || '' }} ${{ inputs.args }}
+                  run: pnpm playwright test --config apps/desktop/playwright.config.ts ${{ 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 }}
 
             - name: Upload blob report

apps/desktop/playwright.config.ts

@@ -19,8 +19,13 @@ const projects = [
     "linux-arm64-sqlcipher-static",
 ];
 
+const tag = ["@desktop"];
+if (process.env.PW_TAG) {
+    tag.push(process.env.PW_TAG);
+}
+
 export default defineConfig({
-    tag: "@desktop",
+    tag,
     // Allows the GitHub action to specify a project name (OS + arch) for the combined report to make sense
     // workaround for https://github.com/microsoft/playwright/issues/33521
     projects: process.env.CI

apps/web/playwright/e2e/voip/element-call.spec.ts

@@ -15,13 +15,16 @@ import { test, expect } from "../../element-web-test";
 import type { Credentials } from "../../plugins/homeserver";
 import { Bot } from "../../pages/bot";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
+import { dirname, join } from "node:path";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // Load a copy of our fake Element Call app, and the latest widget API.
 // The fake call app does *just* enough to convince Element Web that a call is ongoing
 // and functions like PiP work. It does not actually do anything though, to limit the
 // surface we test.
 const widgetApi = readFile(fileURLToPath(import.meta.resolve("matrix-widget-api/dist/api.min.js")), "utf-8");
-const fakeCallClient = readFile("playwright/sample-files/fake-element-call.html", "utf-8");
+const fakeCallClient = readFile(join(__dirname, "..", "..", "sample-files", "fake-element-call.html"), "utf-8");
 
 function assertCommonCallParameters(
     url: URLSearchParams,