From c966660a098b17ae00351d30726c8203dee3e4b5 Mon Sep 17 00:00:00 2001
From: Sander Declerck <sander@sdsoftware.be>
Date: Wed, 30 Jul 2025 16:43:11 +0200
Subject: [PATCH] Remove e2e workflow

---
 .github/workflows/e2e.yml        | 37 --------------------------------
 .github/workflows/test-on-pr.yml | 32 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 37 deletions(-)
 delete mode 100644 .github/workflows/e2e.yml

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
deleted file mode 100644
index 47c4d6f..0000000
--- a/.github/workflows/e2e.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: E2E Tests
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  e2e-tests:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "24"
-          cache: "npm"
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run unit tests
-        run: npm test
-
-      - name: Run E2E tests
-        run: npm run test:e2e
-
-      - name: Clean up Docker resources
-        if: always()
-        run: |
-          # Clean up any remaining containers and images
-          docker ps -aq --filter "name=safe-chain-e2e-test" | xargs -r docker rm -f
-          docker images -q safe-chain-e2e-test | xargs -r docker rmi -f
diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/test-on-pr.yml
index 8744a19..a68c07b 100644
--- a/.github/workflows/test-on-pr.yml
+++ b/.github/workflows/test-on-pr.yml
@@ -31,3 +31,35 @@ jobs:
 
       - name: Run ESLint
         run: npm run lint
+
+  e2e-tests:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: test/e2e
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "24"
+          cache: "npm"
+
+  #     - name: Install dependencies
+  #       run: npm ci
+
+  #     - name: Run unit tests
+  #       run: npm test
+
+  #     - name: Run E2E tests
+  #       run: npm run test:e2e
+
+  #     - name: Clean up Docker resources
+  #       if: always()
+  #       run: |
+  #         # Clean up any remaining containers and images
+  #         docker ps -aq --filter "name=safe-chain-e2e-test" | xargs -r docker rm -f
+  #         docker images -q safe-chain-e2e-test | xargs -r docker rmi -f