diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index c955626eb..a00b06787 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -171,8 +171,9 @@ jobs: ELEMENT_DESKTOP_EXECUTABLE: ${{ matrix.executable }} - name: Upload HTML report + if: always() uses: actions/upload-artifact@v4 with: name: ${{ matrix.artifact }}-test - path: playwright-report + path: playwright/html-report retention-days: 14 diff --git a/package.json b/package.json index dea998595..ebdb8875d 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "app-builder-lib": "24.13.3", "chokidar": "^3.5.2", "detect-libc": "^2.0.0", - "electron": "^28.0.0", + "electron": "^29.0.0", "electron-builder": "24.13.3", "electron-builder-squirrel-windows": "24.13.3", "electron-devtools-installer": "^3.2.0", diff --git a/playwright/e2e/launch/launch.spec.ts b/playwright/e2e/launch/launch.spec.ts index 68a239ea4..216dd9f9b 100644 --- a/playwright/e2e/launch/launch.spec.ts +++ b/playwright/e2e/launch/launch.spec.ts @@ -17,6 +17,7 @@ limitations under the License. import { test, expect } from "../../element-desktop-test"; test.describe("App launch", () => { + test.slow(); test("should launch and render the welcome view successfully", async ({ page }) => { await page.locator("#matrixchat").waitFor(); await page.locator(".mx_Welcome").waitFor(); diff --git a/playwright/element-desktop-test.ts b/playwright/element-desktop-test.ts index e79286b3b..ec40cab25 100644 --- a/playwright/element-desktop-test.ts +++ b/playwright/element-desktop-test.ts @@ -33,7 +33,7 @@ export const test = base.extend<{ app: ElectronApplication; tmpDir: string }>({ const executablePath = process.env["ELEMENT_DESKTOP_EXECUTABLE"]; if (!executablePath) { // Unpackaged mode testing - args.unshift("./lib/electron-main.js"); + args.unshift(path.join(__dirname, "..", "lib", "electron-main.js")); } const app = await electron.launch({ @@ -42,6 +42,9 @@ export const test = base.extend<{ app: ElectronApplication; tmpDir: string }>({ args, }); + app.process().stdout.pipe(process.stdout); + app.process().stderr.pipe(process.stderr); + await app.firstWindow(); await use(app); }, diff --git a/playwright/snapshots/launch/launch.spec.ts/App-launch-should-launch-and-render-the-welcome-view-successfully-1-linux.png b/playwright/snapshots/launch/launch.spec.ts/App-launch-should-launch-and-render-the-welcome-view-successfully-1-linux.png index a720cd272..3f70bda71 100644 Binary files a/playwright/snapshots/launch/launch.spec.ts/App-launch-should-launch-and-render-the-welcome-view-successfully-1-linux.png and b/playwright/snapshots/launch/launch.spec.ts/App-launch-should-launch-and-render-the-welcome-view-successfully-1-linux.png differ diff --git a/yarn.lock b/yarn.lock index d7497cd3b..f0721abac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1806,7 +1806,7 @@ "@types/node" "*" form-data "^4.0.0" -"@types/node@*", "@types/node@18.19.21", "@types/node@^17.0.36", "@types/node@^18.11.18": +"@types/node@*", "@types/node@18.19.21", "@types/node@^17.0.36", "@types/node@^20.9.0": version "18.19.21" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.21.tgz#f4ca1ac8ffb05ee4b89163c2d6fac9a1a59ee149" integrity sha512-2Q2NeB6BmiTFQi4DHBzncSoq/cJMLDdhPaAoJFnFCyD9a8VPZRf7a1GAwp1Edb7ROaZc5Jz/tnZyL6EsWMRaqw== @@ -3189,13 +3189,13 @@ electron-window-state@^5.0.3: jsonfile "^4.0.0" mkdirp "^0.5.1" -electron@^28.0.0: - version "28.2.5" - resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.5.tgz#d8e85306e8c51456042223a51f560f6ada565dc8" - integrity sha512-qlvQkDNVAzN647NpiJJw7GYJqE0NwK4+1evkhrQ0Xv6Qgab1EtN50G4oDr4/x/+O5pGUG2P5d3isXu+37O3RDw== +electron@^29.0.0: + version "29.1.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-29.1.0.tgz#37f0e4915226db3c87bc54b187795272bf61fc39" + integrity sha512-giJVIm0sWVp+8V1GXrKqKTb+h7no0P3ooYqEd34AD9wMJzGnAeL+usj+R0155/0pdvvP1mgydnA7lcaFA2M9lw== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^18.11.18" + "@types/node" "^20.9.0" extract-zip "^2.0.1" emoji-regex@^8.0.0: