From 8d015fdca32a0f99a205bc6ad3f1cf880370e17a Mon Sep 17 00:00:00 2001
From: Sander Declerck <sander@sdsoftware.be>
Date: Fri, 5 Sep 2025 11:33:08 +0200
Subject: [PATCH] Add e2e tests to workspace

---
 .github/workflows/test-on-pr.yml |  9 +++------
 package.json                     | 12 ++++++++----
 test/e2e/Dockerfile              |  4 ++--
 test/e2e/package.json            |  1 +
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/test-on-pr.yml
index e291a50..10d3ceb 100644
--- a/.github/workflows/test-on-pr.yml
+++ b/.github/workflows/test-on-pr.yml
@@ -33,9 +33,6 @@ jobs:
     name: Run E2E tests
 
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: "test/e2e"
 
     steps:
       - name: Checkout code
@@ -46,11 +43,11 @@ jobs:
         with:
           node-version: "lts/*"
 
-      - name: Install dependencies
+      - name: Install dependencies (root)
         run: npm ci
 
-      - name: Run unit tests
-        run: npm test
+      - name: Run E2E tests
+        run: npm run test --workspace=test/e2e
 
       - name: Clean up Docker resources
         if: always()
diff --git a/package.json b/package.json
index ec26a3e..d3ca8e1 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,14 @@
 {
-  "name": "aikido-safe-chain-workspace", 
+  "name": "aikido-safe-chain-workspace",
   "private": true,
   "type": "module",
-  "workspaces": ["packages/*"],
+  "workspaces": [
+    "packages/*",
+    "test/e2e"
+  ],
   "scripts": {
     "test": "npm run test --workspace=packages/safe-chain",
+    "test:e2e": "npm run test --workspace=test/e2e",
     "lint": "npm run lint --workspace=packages/safe-chain"
   },
   "repository": {
@@ -16,11 +20,11 @@
   "devDependencies": {
     "@eslint/js": "^9.26.0",
     "eslint": "^9.26.0",
-    "eslint-plugin-import": "^2.31.0", 
+    "eslint-plugin-import": "^2.31.0",
     "globals": "^16.1.0",
     "typescript-eslint": "^8.32.0"
   },
   "overrides": {
     "brace-expansion@<=2.0.2": "2.0.2"
   }
-}
\ No newline at end of file
+}
diff --git a/test/e2e/Dockerfile b/test/e2e/Dockerfile
index 4d919ef..be4249e 100644
--- a/test/e2e/Dockerfile
+++ b/test/e2e/Dockerfile
@@ -6,13 +6,13 @@ ENV CI=true
 WORKDIR /app
 
 # Copy package files first for better caching
-COPY package*.json ./
+COPY packages/safe-chain/package*.json ./
 
 # Install dependencies
 RUN npm install
 
 # Copy the rest of the application
-COPY . .
+COPY packages/safe-chain ./
 
 # Build the application
 RUN npm --no-git-tag-version version 1.0.0 --allow-same-version
diff --git a/test/e2e/package.json b/test/e2e/package.json
index 4748762..1dc6e8a 100644
--- a/test/e2e/package.json
+++ b/test/e2e/package.json
@@ -1,5 +1,6 @@
 {
   "name": "@aikidosec/safe-chain-e2e-tests",
+  "private": true,
   "version": "1.0.0",
   "description": "End-to-end tests for the Aikido Safe Chain",
   "scripts": {