From 41ed5c0e230b6476554d27ac5fa7f7e6d45d1e0b Mon Sep 17 00:00:00 2001
From: cupcakearmy <hi@nicco.io>
Date: Tue, 15 Nov 2022 12:17:52 +0100
Subject: [PATCH] ci

---
 .github/workflows/test.yaml | 31 ++-----------------------------
 package.json                |  5 ++---
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 30820f1..2535f66 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -14,17 +14,13 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: "16"
-      # - uses: pnpm/action-setup@v2
-      #   with:
-      #     version: 7
 
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
         with:
           install: true
-      - name: Build
-        run: |
-          npm run test:docker
+      - name: Build docker image
+        run: npm run test:prepare
 
       - name: Prepare
         run: |
@@ -38,26 +34,3 @@ jobs:
         with:
           name: test-results
           path: test-results
-  # test:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: actions/setup-node@v2
-  #       with:
-  #         node-version: "16"
-  #     - uses: pnpm/action-setup@v2
-  #       with:
-  #         version: 7
-  #     - name: Prepare
-  #       run: |
-  #         pnpm install
-  #         pnpm run test:docker
-  #     - name: Install Playwright
-  #       run: npx playwright install --with-deps
-  #     - name: Run your tests
-  #       run: pnpm run test:run
-  #     - name: Upload test results
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #         name: test-results
-  #         path: test-results
diff --git a/package.json b/package.json
index 9cc5a72..49f5180 100644
--- a/package.json
+++ b/package.json
@@ -6,9 +6,8 @@
     "dev": "run-p dev:*",
     "test:run": "playwright test --project chrome firefox safari",
     "test:local": "playwright test --project local",
-    "test:server": "pnpm --parallel run test:server",
-    "test:prepare": "pnpm --parallel run test:prepare",
-    "test:docker": "docker compose -f docker-compose.dev.yaml build"
+    "test:server": "docker compose -f docker-compose.dev.yaml up",
+    "test:prepare": "docker compose -f docker-compose.dev.yaml build"
   },
   "devDependencies": {
     "@playwright/test": "^1.25.1",