solidify integration test runs

Author: itsMapleLeaf

.github/workflows/test.yml

@@ -7,32 +7,23 @@ on:
     branches: [main]
   workflow_dispatch:
 
-# env:
-#   DEBUG: pw:*
-
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
-    env:
-      SKIP_INTEGRATION: ${{ matrix.os != 'ubuntu-latest' }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
           # https://github.com/actions/setup-node#supported-version-syntax
           node-version: "lts/*"
-      - run: npm i -g pnpm
-      - run: pnpm i
-
-      - name: Run Xvfb
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: |
-          export DISPLAY=':99.0'
-          Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+      - run: npm install --global pnpm
+      - run: pnpm install
 
       - name: Test
-        run: pnpm test
+        uses: GabrielBB/xvfb-action@v1
+        with:
+          run: pnpm test

tests/build.test.ts

@@ -6,28 +6,27 @@ import { afterAll, beforeAll, expect, test } from "vitest"
 import { defineIntegration } from "./define-integration"
 
 defineIntegration(() => {
+  if (process.platform !== "linux") {
+    console.info("Skipping build test on non-linux platform")
+    return
+  }
+
   const appFolder = join(__dirname, "../template")
 
   let electronApp: ElectronApplication
   let window: Page
 
   beforeAll(async () => {
-    await execa("pnpm", ["build", "--", "--dir"], {
+    await execa("pnpm", ["run", "build", "--", "--dir"], {
       cwd: appFolder,
     })
 
     electronApp = await electron.launch({
-      cwd: appFolder,
-      args: ["."],
+      // TODO: figure out what the executablePath is for other platforms
       executablePath: join(
         appFolder,
         "dist/linux-unpacked/remix-electron-template",
       ),
-
-      // this fixes a failure to launch on linux
-      env: {
-        DISPLAY: process.env.DISPLAY!,
-      },
     })
 
     window = await electronApp.firstWindow()

tests/integration.test.ts

@@ -19,11 +19,6 @@ defineIntegration(() => {
     electronApp = await electron.launch({
       cwd: appFolder,
       args: ["."],
-
-      // this fixes a failure to launch on linux
-      env: {
-        DISPLAY: process.env.DISPLAY!,
-      },
     })
 
     window = await electronApp.firstWindow()