From da42e9ea7759a82e71520548d31647fd13892aa5 Mon Sep 17 00:00:00 2001 From: eric-intuitem <71850047+eric-intuitem@users.noreply.github.com> Date: Tue, 20 Feb 2024 22:04:05 +0100 Subject: [PATCH] try fixing startup tests --- docker-compose.sh | 2 +- docker-compose.yml | 2 -- frontend/playwright.config.ts | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker-compose.sh b/docker-compose.sh index dfb7b8539..47d6d5ada 100755 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -9,6 +9,6 @@ else docker compose exec backend python manage.py migrate echo "initialize your superuser account..." docker compose exec backend python manage.py createsuperuser - echo "connect to ciso assistant on http://localhost:3000" + echo "connect to ciso assistant on https://localhost:8443" echo "for successive runs you can now use docker compose up" fi diff --git a/docker-compose.yml b/docker-compose.yml index 66d1033f8..8c99f6caa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,8 +20,6 @@ services: build: ./frontend depends_on: - backend - ports: - - 3000:3000 caddy: container_name: caddy diff --git a/frontend/playwright.config.ts b/frontend/playwright.config.ts index a09d1cfca..7122edec7 100644 --- a/frontend/playwright.config.ts +++ b/frontend/playwright.config.ts @@ -4,7 +4,7 @@ import { devices } from '@playwright/test'; const config: PlaywrightTestConfig = { webServer: { command: process.env.COMPOSE_TEST ? 'echo "The docker compose frontend server didn\'t start correctly"' : 'npm run build && npm run preview', - port: process.env.COMPOSE_TEST ? 3000 : 4173, + url: process.env.COMPOSE_TEST ? "https://localhost:8443" : "http://localhost:4173", reuseExistingServer: process.env.COMPOSE_TEST }, testDir: 'tests',