try fix tests

gorilla-devs · Dec 23, 2024 · 6d5f0cd · 6d5f0cd
1 parent 9fc74a6
commit 6d5f0cd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/all_os.yml b/.github/workflows/all_os.yml
@@ -63,7 +63,9 @@ jobs:
           USER_AGENT_PREFIX: ${{ vars.USER_AGENT_PREFIX }}
           CURSEFORGE_API_KEY: "${{ vars.CURSEFORGE_API_KEY }}"
           CURSEFORGE_API_BASE: ${{ vars.CURSEFORGE_API_BASE }}
-        run: pnpm test
+        run: |
+          pnpm test
+          cargo test
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4
         if: always()
@@ -136,7 +138,9 @@ jobs:
           USER_AGENT_PREFIX: ${{ vars.USER_AGENT_PREFIX }}
           CURSEFORGE_API_KEY: "${{ vars.CURSEFORGE_API_KEY }}"
           CURSEFORGE_API_BASE: ${{ vars.CURSEFORGE_API_BASE }}
-        run: pnpm test
+        run: |
+          xvfb-run --auto-servernum --server-args='-screen 0 1280x960x24' -- pnpm test
+          cargo test
       - name: Upload Playwright report
         if: always()
         uses: actions/upload-artifact@v4
@@ -224,7 +228,9 @@ jobs:
           CURSEFORGE_API_KEY: "${{ vars.CURSEFORGE_API_KEY }}"
           CURSEFORGE_API_BASE: ${{ vars.CURSEFORGE_API_BASE }}
           CARGO_NET_GIT_FETCH_WITH_CLI: true
-        run: pnpm test
+        run: |
+          pnpm test
+          cargo test
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4
         if: always()

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -11,7 +11,7 @@
   "main": "dist/main/index.cjs",
   "scripts": {
     "dev": "node scripts/watch.mjs",
-    "test": "cross-env-shell DEBUG=pw:browser* xvfb-run playwright test",
+    "test": "cross-env-shell DEBUG=pw:browser* playwright test",
     "build-vite": "node scripts/build.mjs",
     "patch-version": "node scripts/monkeypatchVersion.mjs",
     "build-electron": "cross-env-shell DEBUG=electron-builder ow-electron-builder --config .electron-builder.config.cjs",

diff --git a/package.json b/package.json
@@ -32,8 +32,7 @@
     "------divider-utils------": "------divider------",
     "lint": "turbo run lint --filter @gd/desktop --filter @gd/ui",
     "lint-fix": "turbo run lint-fix --filter @gd/desktop --filter @gd/ui",
-    "test": "turbo run test && cargo test",
-    "test-prod": "turbo run test --filter @gd/desktop",
+    "test": "turbo run test",
     "rspc-bindings:generate": "cargo run -p carbon_app -- --generate-ts-bindings",
     "------divider-prisma-generate-normal------": "------divider------",
     "prisma:generate": "cargo run -p prisma-cli -- generate --schema=./crates/carbon_app/prisma/schema.prisma",