update integration test

Author: swelborn

.github/workflows/integration.yml

@@ -46,9 +46,39 @@ jobs:
         with:
           python-version: '3.11'
 
-      - name: Run integration test suite
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: npm
+          cache-dependency-path: frontend/interactEM/package-lock.json
+
+      - name: Install frontend dependencies
+        working-directory: frontend/interactEM
+        run: npm ci
+
+      - name: Install Playwright browsers (with system deps)
+        working-directory: frontend/interactEM
+        run: npx playwright install --with-deps
+
+      - name: Setup env and run docker compose
+        run: make setup && make docker-up
+
+      - name: Run integration tests
         run: make integration-test
 
+      - name: Upload Playwright report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-report
+          path: frontend/interactEM/playwright-report
+          if-no-files-found: ignore
+
+      - name: Stop containers
+        if: always()
+        run: make docker-down
+
       - name: Show docker compose logs on failure
         if: failure()
         run: docker compose logs --no-color

Makefile

@@ -3,6 +3,7 @@ SCRIPTS_DIR := ./scripts
 DOCKER_DIR := ./docker
 FRONTEND_DIR := ./frontend/interactEM
 OPERATORS_DIR := ./operators
+ROOT_DIR := $(shell pwd)
 
 # Makefile configuration
 .PHONY: help setup setup-docker-registry services docker-up docker-down clean lint operators check-docker-permission integration-test
@@ -144,15 +145,15 @@ test: ## Run tests
 	$(call success,Tests complete)
 
 integration-test: ## Run integration tests against the docker-compose stack using the configured marker
-	$(call section,Starting services for integration tests...)
-	$(MAKE) setup
-	$(MAKE) docker-up
 	$(call section,Running integration tests...)
 	@status=0; \
-	trap '$(MAKE) docker-down' EXIT; \
+	set -a; if [ -f .env ]; then . ./.env; fi; set +a; \
 	uv run pytest tests -m "$(INTEGRATION_MARKER)" || status=$$?; \
 	if [ $$status -eq 5 ]; then \
-	echo "No tests collected for marker '$(INTEGRATION_MARKER)'; skipping."; \
-	status=0; \
+		echo "No tests collected for marker '$(INTEGRATION_MARKER)'; skipping."; \
+		status=0; \
+	fi; \
+	if [ $$status -eq 0 ]; then \
+		cd $(FRONTEND_DIR) && npm run test:e2e || status=$$?; \
 	fi; \
 	exit $$status