From 1f47843699e1fed141110d2385fede9dbfc76900 Mon Sep 17 00:00:00 2001
From: Jeppe Bundgaard <jb@truckwash.dk>
Date: Wed, 1 Jul 2026 10:33:56 +0200
Subject: [PATCH] Fix edge expected state CI coverage

---
 .github/workflows/tests.yml                   | 34 ++++---------------
 .../EdgeGatewayExpectedRelayStatesApiTest.php |  5 ++-
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f2f7aed8..1ee23b89 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -246,34 +246,12 @@ jobs:
           vendor/bin/pest tests/Integration/EdgeGateway --colors=always"
 
       - name: Run edge gateway E2E smoke
-        run: |
-          set -euo pipefail
-          compose_project="${COMPOSE_PROJECT_NAME:-$(basename "$PWD")}"
-          runner="edge-e2e-runner-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
-          docker rm -f "$runner" >/dev/null 2>&1 || true
-          trap 'docker rm -f "$runner" >/dev/null 2>&1 || true' EXIT
-          docker create \
-            --name "$runner" \
-            --network "${compose_project}_default" \
-            -e COMPOSE_FILE="$COMPOSE_FILE" \
-            -e COMPOSE_PROJECT_NAME="$compose_project" \
-            -e TRAEFIK_WEB_PORT="${TRAEFIK_WEB_PORT:-18080}" \
-            -e TRAEFIK_WEBSECURE_PORT="${TRAEFIK_WEBSECURE_PORT:-18443}" \
-            -e TRAEFIK_WEBSECURE_STAGING_PORT="${TRAEFIK_WEBSECURE_STAGING_PORT:-18433}" \
-            -e TRAEFIK_METRICS_PORT="${TRAEFIK_METRICS_PORT:-19100}" \
-            -e EDGE_GATEWAY_E2E_BASE_URL="http://caddy" \
-            -e EDGE_GATEWAY_E2E_COMPOSE_PROJECT="$compose_project" \
-            -e EDGE_GATEWAY_E2E_COPY_CONFIG="true" \
-            -e EDGE_GATEWAY_E2E_SKIP_COMPOSE_UP="true" \
-            -v /var/run/docker.sock:/var/run/docker.sock \
-            -w /workspace \
-            node:22-alpine \
-            sh -lc "apk add --no-cache docker-cli docker-cli-compose >/dev/null && node scripts/edge-gateway-e2e.mjs"
-          docker cp . "$runner:/workspace"
-          docker start "$runner" >/dev/null
-          docker logs -f "$runner"
-          exit_code="$(docker wait "$runner")"
-          exit "$exit_code"
+        env:
+          EDGE_GATEWAY_E2E_BASE_URL: http://localhost:18080/api
+          EDGE_GATEWAY_E2E_COPY_CONFIG: "true"
+          EDGE_GATEWAY_E2E_SKIP_COMPOSE_UP: "true"
+          EDGE_GATEWAY_E2E_COMPOSE_PROJECT: ${{ env.COMPOSE_PROJECT_NAME }}
+        run: node scripts/edge-gateway-e2e.mjs
 
       - name: Tear down local stack
         if: always()
diff --git a/services/nginx/app/tests/Api/EdgeGatewayExpectedRelayStatesApiTest.php b/services/nginx/app/tests/Api/EdgeGatewayExpectedRelayStatesApiTest.php
index 796c020e..aa660897 100644
--- a/services/nginx/app/tests/Api/EdgeGatewayExpectedRelayStatesApiTest.php
+++ b/services/nginx/app/tests/Api/EdgeGatewayExpectedRelayStatesApiTest.php
@@ -19,7 +19,10 @@ it('serves whole-department expected relay states and records successful physica
     ]);
     $departmentId = (int)$scenario['department']['id'];
     $laneId = (int)$scenario['lane']['id'];
-    $session = api_fixtures()->createEdgeOperatorSession($departmentId);
+    $session = api_fixtures()->createEdgeOperatorSession($departmentId, [
+        'modules_selfserve_lane_relay_machine_status_set',
+        'modules_selfserve_lane_relay_machine_cleaner_status_set',
+    ]);
     $gateway = api_fixtures()->createClaimedEdgeGateway([
         'department_id' => $departmentId,
         'label' => 'Expected State Gateway',