From d17b7e7aa9967b4984d1f82244f4ba3b0f96a2f7 Mon Sep 17 00:00:00 2001
From: Dominik Stahl <dominik@samdj.de>
Date: Tue, 13 May 2025 10:23:58 +0200
Subject: [PATCH 1/2] fix(tests): start server for e2e tests

---
 .github/workflows/container-scan.yml | 1 +
 .github/workflows/docker-build.yml   | 1 +
 .github/workflows/tests.yml          | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/.github/workflows/container-scan.yml b/.github/workflows/container-scan.yml
index 74e791a..04a48ed 100644
--- a/.github/workflows/container-scan.yml
+++ b/.github/workflows/container-scan.yml
@@ -32,6 +32,7 @@ jobs:
           path: trivy-report.json
 
       - name: Clean up Docker
+        if: always()
         run: |
           docker system prune -af --filter "until=24h"
           docker volume prune -f
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 3f43c92..5554e31 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -65,6 +65,7 @@ jobs:
           cache-to: type=registry,ref=git.dominikstahl.dev/${{ env.REPO }}:buildcache,mode=max
 
       - name: Clean up Docker
+        if: always()
         run: |
           docker system prune -af --filter "until=24h"
           docker volume prune -f
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c090f8e..49271e8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,6 +21,11 @@ jobs:
 
       - name: Cypress run (e2e)
         uses: https://github.com/cypress-io/github-action@v6
+        with:
+          build: yarn run build
+          start: yarn cypress:start_server
+          e2e: true
+          wait-on: 'http://localhost:3000'
 
       - name: Cypress run (component)
         uses: https://github.com/cypress-io/github-action@v6
@@ -30,6 +35,7 @@ jobs:
           component: true
 
       - name: Clean up Docker
+        if: always()
         run: |
           docker system prune -af --filter "until=24h"
           docker volume prune -f

From 5c638d19204364ca4406ae4368534ce224ca1c01 Mon Sep 17 00:00:00 2001
From: Dominik Stahl <dominik@samdj.de>
Date: Tue, 13 May 2025 10:23:58 +0200
Subject: [PATCH 2/2] fix(tests): start server for e2e tests

---
 .env.test                            |  1 +
 .github/workflows/container-scan.yml |  1 +
 .github/workflows/docker-build.yml   |  1 +
 .github/workflows/tests.yml          | 10 +++++-----
 package.json                         |  2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.env.test b/.env.test
index 4e566a0..996599e 100644
--- a/.env.test
+++ b/.env.test
@@ -1,4 +1,5 @@
 AUTH_SECRET="auth_secret"
 AUTH_URL="http://localhost:3000"
+HOSTNAME=0.0.0.0
 DATABASE_URL="file:./dev.db"
 AUTH_AUTHENTIK_ISSUER="auth_issuer"
\ No newline at end of file
diff --git a/.github/workflows/container-scan.yml b/.github/workflows/container-scan.yml
index 74e791a..04a48ed 100644
--- a/.github/workflows/container-scan.yml
+++ b/.github/workflows/container-scan.yml
@@ -32,6 +32,7 @@ jobs:
           path: trivy-report.json
 
       - name: Clean up Docker
+        if: always()
         run: |
           docker system prune -af --filter "until=24h"
           docker volume prune -f
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 3f43c92..5554e31 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -65,6 +65,7 @@ jobs:
           cache-to: type=registry,ref=git.dominikstahl.dev/${{ env.REPO }}:buildcache,mode=max
 
       - name: Clean up Docker
+        if: always()
         run: |
           docker system prune -af --filter "until=24h"
           docker volume prune -f
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c090f8e..085d927 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,6 +21,11 @@ jobs:
 
       - name: Cypress run (e2e)
         uses: https://github.com/cypress-io/github-action@v6
+        with:
+          build: yarn run build
+          start: yarn cypress:start_server
+          e2e: true
+          wait-on: 'http://localhost:3000'
 
       - name: Cypress run (component)
         uses: https://github.com/cypress-io/github-action@v6
@@ -28,8 +33,3 @@ jobs:
           build: yarn run build
           start: yarn cypress:start_server
           component: true
-
-      - name: Clean up Docker
-        run: |
-          docker system prune -af --filter "until=24h"
-          docker volume prune -f
diff --git a/package.json b/package.json
index b6b9548..4e881dc 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "start": "node .next/standalone/server.js",
     "lint": "next lint",
     "format": "prettier --write .",
-    "cypress:start_server": "cp .next/static/ .next/standalone/.next/ -r && dotenv -e .env.test -- node .next/standalone/server.js",
+    "cypress:start_server": "cp public .next/standalone/ -r && cp .next/static/ .next/standalone/.next/ -r && dotenv -e .env.test -- node .next/standalone/server.js",
     "cypress:open": "cypress open",
     "cypress:run": "cypress run"
   },