From 1524891b2ff7bf44a7b67e68f4ebba6da437e5b1 Mon Sep 17 00:00:00 2001 From: Zhi Date: Sat, 14 Mar 2026 13:21:11 +0000 Subject: [PATCH 1/5] chore: remove credentials from submodule urls --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 361273b..ebca9ef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "HarborForge.Backend.Test"] path = HarborForge.Backend.Test - url = https://zhi:rT5Wjw24mV4all38fIoNQfl2@git.hangman-lab.top/zhi/HarborForge.Backend.Test.git + url = https://git.hangman-lab.top/zhi/HarborForge.Backend.Test.git [submodule "HarborForge.Frontend.Test"] path = HarborForge.Frontend.Test - url = https://zhi:rT5Wjw24mV4all38fIoNQfl2@git.hangman-lab.top/zhi/HarborForge.Frontend.Test.git + url = https://git.hangman-lab.top/zhi/HarborForge.Frontend.Test.git From 4c45a57649db2e1cbc0a2f6dd708fd74bd505be9 Mon Sep 17 00:00:00 2001 From: river Date: Sun, 15 Mar 2026 12:48:12 +0000 Subject: [PATCH 2/5] fix: always rebuild frontend with correct VITE_API_BASE --- run-test-frontend.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/run-test-frontend.sh b/run-test-frontend.sh index 99c5efc..7a05dcf 100755 --- a/run-test-frontend.sh +++ b/run-test-frontend.sh @@ -58,6 +58,10 @@ echo "๐Ÿ“ฆ Using compose file: $COMPOSE_FILE" echo "๐Ÿงน Cleaning up previous containers..." docker compose -f "$COMPOSE_FILE" down -v 2>/dev/null || true +# Build frontend with correct API base URL +echo "๐Ÿ”จ Building frontend..." +docker compose -f "$COMPOSE_FILE" build --build-arg VITE_API_BASE=http://backend:8000 frontend + # Start services echo "๐Ÿ“ฆ Starting services..." docker compose -f "$COMPOSE_FILE" up -d From 3591ef2c84e89250342ee3a589cbd9e45fa46973 Mon Sep 17 00:00:00 2001 From: river Date: Sun, 15 Mar 2026 12:57:40 +0000 Subject: [PATCH 3/5] fix: add --no-cache to ensure frontend rebuilds with correct API base --- run-test-frontend.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-test-frontend.sh b/run-test-frontend.sh index 7a05dcf..56229a6 100755 --- a/run-test-frontend.sh +++ b/run-test-frontend.sh @@ -58,9 +58,9 @@ echo "๐Ÿ“ฆ Using compose file: $COMPOSE_FILE" echo "๐Ÿงน Cleaning up previous containers..." docker compose -f "$COMPOSE_FILE" down -v 2>/dev/null || true -# Build frontend with correct API base URL +# Build frontend with correct API base URL (force no cache) echo "๐Ÿ”จ Building frontend..." -docker compose -f "$COMPOSE_FILE" build --build-arg VITE_API_BASE=http://backend:8000 frontend +docker compose -f "$COMPOSE_FILE" build --no-cache --build-arg VITE_API_BASE=http://backend:8000 frontend # Start services echo "๐Ÿ“ฆ Starting services..." From cf4b9f406bfcde65025ac1796eb9cf257ded3619 Mon Sep 17 00:00:00 2001 From: river Date: Sun, 15 Mar 2026 13:36:32 +0000 Subject: [PATCH 4/5] fix: run tests with 1 worker to avoid race conditions --- run-test-frontend.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/run-test-frontend.sh b/run-test-frontend.sh index 56229a6..0ea4759 100755 --- a/run-test-frontend.sh +++ b/run-test-frontend.sh @@ -58,8 +58,9 @@ echo "๐Ÿ“ฆ Using compose file: $COMPOSE_FILE" echo "๐Ÿงน Cleaning up previous containers..." docker compose -f "$COMPOSE_FILE" down -v 2>/dev/null || true -# Build frontend with correct API base URL (force no cache) +# Build frontend with correct API base URL (force no cache, remove image first) echo "๐Ÿ”จ Building frontend..." +docker rmi harborforge-test-frontend:dev 2>/dev/null || true docker compose -f "$COMPOSE_FILE" build --no-cache --build-arg VITE_API_BASE=http://backend:8000 frontend # Start services @@ -87,7 +88,7 @@ echo "โœ… Services ready!" # Run test echo "๐Ÿงช Running test..." -docker compose -f "$COMPOSE_FILE" run --rm test +docker compose -f "$COMPOSE_FILE" run --rm -e WORKERS=1 test TEST_EXIT_CODE=$? # Cleanup decision based on expose-port From 524a4a5b46661662ced972595f10fbc601a38091 Mon Sep 17 00:00:00 2001 From: river Date: Sun, 15 Mar 2026 13:40:50 +0000 Subject: [PATCH 5/5] Update submodule to latest test files --- HarborForge.Frontend.Test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HarborForge.Frontend.Test b/HarborForge.Frontend.Test index e8ffed4..3b30119 160000 --- a/HarborForge.Frontend.Test +++ b/HarborForge.Frontend.Test @@ -1 +1 @@ -Subproject commit e8ffed41eeb0e387c9f65875fb3ae0b6b2d7499e +Subproject commit 3b30119317e93242b855f6d9c7b4c4f6aaf0c49c