diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ecfa84f0..d37258eb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -225,30 +225,10 @@ jobs: 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" \ - -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" + EDGE_GATEWAY_E2E_BASE_URL="${EDGE_GATEWAY_E2E_BASE_URL:-http://localhost:18080/api}" \ + EDGE_GATEWAY_E2E_COMPOSE_PROJECT="$compose_project" \ + EDGE_GATEWAY_E2E_COPY_CONFIG="true" \ + node scripts/edge-gateway-e2e.mjs - name: Tear down local stack if: always() diff --git a/services/nginx/app/tests/Unit/Replication/SuperuserReplicationRouteWiringTest.php b/services/nginx/app/tests/Unit/Replication/SuperuserReplicationRouteWiringTest.php index 59e6b78e..896fe8f9 100644 --- a/services/nginx/app/tests/Unit/Replication/SuperuserReplicationRouteWiringTest.php +++ b/services/nginx/app/tests/Unit/Replication/SuperuserReplicationRouteWiringTest.php @@ -46,6 +46,6 @@ it('rejects subuser sessions before checking replication permissions', function expect($content)->toContain("Subuser sessions cannot manage replication."); expect($content)->toContain("\$response->error('Subuser sessions cannot manage replication.', 403);"); expect($content)->toContain('return $this->requirePermission($permission);'); - expect(preg_match_all("/requireClassicSuperuserPermission\\('superuser_replication_/", $content))->toBe(10); + expect(preg_match_all("/requireClassicSuperuserPermission\\('superuser_replication_/", $content))->toBe(11); expect($content)->not->toContain("requirePermission('superuser_replication_"); });