Compare commits
33 Commits
1524891b2f
...
dev-2026-0
| Author | SHA1 | Date | |
|---|---|---|---|
| ef8a4ae994 | |||
| 4c54503a81 | |||
| 62d339b58c | |||
| 23cad37e03 | |||
| 779fb7b387 | |||
| 48c54c2f32 | |||
| f5294f5290 | |||
| 11d0865fd3 | |||
| 14f4fb8d16 | |||
| cc2d4aea5c | |||
| 5a45a72dcf | |||
| ba3909ec68 | |||
| 805dc2fe32 | |||
| 81fe00bfb8 | |||
| 4707f0614c | |||
| c76c25fb5b | |||
| 1bb11ca92b | |||
| 4844b63c16 | |||
| 8b1edf53f0 | |||
| 3aaffd2e67 | |||
| 62ca6bd32b | |||
| 15859b9f28 | |||
| d3c5f6df8c | |||
| a4620b9604 | |||
| b0d6a0bdd7 | |||
| ebdac827c1 | |||
| 2424ec33e0 | |||
| 1047110de5 | |||
| 95a6354fc3 | |||
| 524a4a5b46 | |||
| cf4b9f406b | |||
| 3591ef2c84 | |||
| 4c45a57649 |
Submodule HarborForge.Backend.Test updated: ae9bdd687a...b505fa7b35
Submodule HarborForge.Frontend.Test updated: e8ffed41ee...df05820a95
@@ -74,6 +74,9 @@ services:
|
|||||||
restart: "no"
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
VITE_API_BASE_URL: http://backend:${BACKEND_PORT:-8000}
|
VITE_API_BASE_URL: http://backend:${BACKEND_PORT:-8000}
|
||||||
|
VITE_WIZARD_PORT: ${WIZARD_PORT:-8080}
|
||||||
|
FRONTEND_DEV_MODE: ${FRONTEND_DEV_MODE:-1}
|
||||||
|
NODE_ENV: development
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:${FRONTEND_PORT:-3000}:${FRONTEND_PORT:-3000}"
|
- "127.0.0.1:${FRONTEND_PORT:-3000}:${FRONTEND_PORT:-3000}"
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -91,13 +94,16 @@ services:
|
|||||||
restart: "no"
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
# Use internal service name for test to reach frontend
|
# Use internal service name for test to reach frontend
|
||||||
BASE_URL: http://frontend:${FRONTEND_PORT:-3000}
|
BASE_URL: http://127.0.0.1:${FRONTEND_PORT:-3000}
|
||||||
FRONTEND_URL: http://frontend:${FRONTEND_PORT:-3000}
|
FRONTEND_URL: http://127.0.0.1:${FRONTEND_PORT:-3000}
|
||||||
WEB_SERVER_URL: http://frontend:${FRONTEND_PORT:-3000}
|
WEB_SERVER_URL: http://127.0.0.1:${FRONTEND_PORT:-3000}
|
||||||
WIZARD_URL: http://wizard:${WIZARD_PORT:-8080}/wizard
|
WIZARD_URL: http://127.0.0.1:${WIZARD_PORT:-8080}/wizard
|
||||||
WIZARD_API_URL: http://wizard:${WIZARD_PORT:-8080}
|
WIZARD_API_URL: http://127.0.0.1:${WIZARD_PORT:-8080}
|
||||||
WIZARD_HOST: wizard
|
WIZARD_HOST: wizard
|
||||||
WIZARD_PORT: ${WIZARD_PORT:-8080}
|
WIZARD_PORT: ${WIZARD_PORT:-8080}
|
||||||
|
BACKEND_URL: http://127.0.0.1:${BACKEND_PORT:-8000}
|
||||||
|
BACKEND_HOST: backend
|
||||||
|
FRONTEND_HOST: frontend
|
||||||
CHROME_DEBUGGING_PORT: 9222
|
CHROME_DEBUGGING_PORT: 9222
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|||||||
@@ -54,6 +54,9 @@ services:
|
|||||||
SECRET_KEY: ${SECRET_KEY:-change_me_in_production}
|
SECRET_KEY: ${SECRET_KEY:-change_me_in_production}
|
||||||
LOG_LEVEL: ${LOG_LEVEL:-INFO}
|
LOG_LEVEL: ${LOG_LEVEL:-INFO}
|
||||||
DATABASE_URL: mysql+pymysql://harborforge:harborforge_pass@mysql:${MYSQL_PORT:-3306}/harborforge
|
DATABASE_URL: mysql+pymysql://harborforge:harborforge_pass@mysql:${MYSQL_PORT:-3306}/harborforge
|
||||||
|
depends_on:
|
||||||
|
mysql:
|
||||||
|
condition: service_healthy
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|
||||||
@@ -69,6 +72,9 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
# Use internal service name
|
# Use internal service name
|
||||||
VITE_API_BASE_URL: http://backend:${BACKEND_PORT:-8000}
|
VITE_API_BASE_URL: http://backend:${BACKEND_PORT:-8000}
|
||||||
|
VITE_WIZARD_PORT: ${WIZARD_PORT:-8080}
|
||||||
|
FRONTEND_DEV_MODE: ${FRONTEND_DEV_MODE:-1}
|
||||||
|
NODE_ENV: development
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Run frontend test with optional port exposure
|
# Run frontend test with optional port exposure
|
||||||
# Usage: ./run-test-frontend.sh [--expose-port {on|off}]
|
# Usage: ./run-test-frontend.sh [--expose-port {on|off}]
|
||||||
# Default: off
|
# Default:
|
||||||
#
|
# --expose-port off: Auto cleanup after test
|
||||||
# --expose-port on: Keep services running after test (manual cleanup required)
|
|
||||||
# --expose-port off: Auto cleanup after test (default)
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
@@ -54,13 +52,44 @@ fi
|
|||||||
|
|
||||||
echo "📦 Using compose file: $COMPOSE_FILE"
|
echo "📦 Using compose file: $COMPOSE_FILE"
|
||||||
|
|
||||||
|
run_quiet() {
|
||||||
|
local label="$1"
|
||||||
|
shift
|
||||||
|
local log_file
|
||||||
|
log_file=$(mktemp)
|
||||||
|
if "$@" >"$log_file" 2>&1; then
|
||||||
|
rm -f "$log_file"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
echo "❌ ${label} failed"
|
||||||
|
echo "--- ${label} log ---"
|
||||||
|
tail -n 200 "$log_file"
|
||||||
|
rm -f "$log_file"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
# Clean any previous containers first
|
# Clean any previous containers first
|
||||||
echo "🧹 Cleaning up previous containers..."
|
echo "🧹 Cleaning up previous containers..."
|
||||||
docker compose -f "$COMPOSE_FILE" down -v 2>/dev/null || true
|
docker compose -f "$COMPOSE_FILE" down -v >/dev/null 2>&1 || true
|
||||||
|
|
||||||
|
# Build frontend with correct API base URL (force no cache, remove image first)
|
||||||
|
echo "🔨 Building frontend..."
|
||||||
|
docker rmi harborforge-test-frontend:dev >/dev/null 2>&1 || true
|
||||||
|
run_quiet "frontend build" docker compose -f "$COMPOSE_FILE" build --no-cache --build-arg VITE_API_BASE=http://backend:8000 frontend
|
||||||
|
|
||||||
|
# Build backend (force no cache, remove image first)
|
||||||
|
echo "🔨 Building backend..."
|
||||||
|
docker rmi harborforge-test-backend:dev >/dev/null 2>&1 || true
|
||||||
|
run_quiet "backend build" docker compose -f "$COMPOSE_FILE" build --no-cache backend
|
||||||
|
|
||||||
|
# Build test runner (force no cache, remove image first)
|
||||||
|
echo "🔨 Building test runner..."
|
||||||
|
docker rmi harborforge-test-runner:dev >/dev/null 2>&1 || true
|
||||||
|
run_quiet "test runner build" docker compose -f "$COMPOSE_FILE" build --no-cache test
|
||||||
|
|
||||||
# Start services
|
# Start services
|
||||||
echo "📦 Starting services..."
|
echo "📦 Starting services..."
|
||||||
docker compose -f "$COMPOSE_FILE" up -d
|
run_quiet "service startup" docker compose -f "$COMPOSE_FILE" up -d
|
||||||
|
|
||||||
# Wait for frontend to be ready
|
# Wait for frontend to be ready
|
||||||
echo "⏳ Waiting for services..."
|
echo "⏳ Waiting for services..."
|
||||||
@@ -81,9 +110,9 @@ fi
|
|||||||
|
|
||||||
echo "✅ Services ready!"
|
echo "✅ Services ready!"
|
||||||
|
|
||||||
# Run test
|
# Run test using the image default CMD so proxy startup stays inside Frontend.Test Dockerfile
|
||||||
echo "🧪 Running 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=$?
|
TEST_EXIT_CODE=$?
|
||||||
|
|
||||||
# Cleanup decision based on expose-port
|
# Cleanup decision based on expose-port
|
||||||
@@ -93,7 +122,7 @@ if [[ "$EXPOSE_PORT" == "on" ]]; then
|
|||||||
echo " Use './run-test-frontend.sh --expose-port on' to cleanup"
|
echo " Use './run-test-frontend.sh --expose-port on' to cleanup"
|
||||||
echo " Or manually: docker compose -f $COMPOSE_FILE down -v"
|
echo " Or manually: docker compose -f $COMPOSE_FILE down -v"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
if [ $TEST_EXIT_CODE -eq 0 ]; then
|
if [ $TEST_EXIT_CODE -eq 0 ]; then
|
||||||
echo "✅ Test passed!"
|
echo "✅ Test passed!"
|
||||||
else
|
else
|
||||||
@@ -103,7 +132,7 @@ else
|
|||||||
echo ""
|
echo ""
|
||||||
echo "🧹 Cleaning up containers and volumes..."
|
echo "🧹 Cleaning up containers and volumes..."
|
||||||
docker compose -f "$COMPOSE_FILE" down -v
|
docker compose -f "$COMPOSE_FILE" down -v
|
||||||
|
|
||||||
if [ $TEST_EXIT_CODE -eq 0 ]; then
|
if [ $TEST_EXIT_CODE -eq 0 ]; then
|
||||||
echo "✅ Test passed!"
|
echo "✅ Test passed!"
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user