From 4e0fa33dee8ae173dfe3f1589dd01bf77a01aeea Mon Sep 17 00:00:00 2001 From: Till Tomczak Date: Fri, 28 Mar 2025 10:40:02 +0100 Subject: [PATCH] =?UTF-8?q?Verbessere=20docker=20test-integration.sh=20f?= =?UTF-8?q?=C3=BCr=20lokales=20Testen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Verbessert die Erkennung von Docker/Docker Compose - Vereinfacht die Tests mit fokus auf die Front-Backend Verbindung - Verbessert Lesbarkeit durch bessere Formatierung 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .../reservation-platform/docker/test-integration.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/reservation-platform/docker/test-integration.sh b/packages/reservation-platform/docker/test-integration.sh index 6da4a92..00d9de6 100755 --- a/packages/reservation-platform/docker/test-integration.sh +++ b/packages/reservation-platform/docker/test-integration.sh @@ -22,18 +22,15 @@ echo "Test directory: $SCRIPT_DIR" | tee -a "$TEST_LOG" echo "Parent directory: $PARENT_DIR" | tee -a "$TEST_LOG" echo "Log file: $TEST_LOG" | tee -a "$TEST_LOG" -# Check if Docker is available -if ! command -v docker &> /dev/null; then - echo -e "${RED}Error: Docker is not installed or not in PATH${NC}" | tee -a "$TEST_LOG" - exit 1 -fi - # Function to run docker compose (handles both docker-compose and docker compose syntax) run_docker_compose() { if command -v docker-compose &> /dev/null; then docker-compose "$@" - else + elif command -v docker &> /dev/null && docker compose version &> /dev/null; then docker compose "$@" + else + echo -e "${RED}Error: Neither docker-compose nor docker compose is available${NC}" | tee -a "$TEST_LOG" + exit 1 fi } @@ -115,6 +112,7 @@ echo -e "${YELLOW}Performing basic integration tests...${NC}" | tee -a "$TEST_LO # Test 1: Frontend can fetch API data (printers endpoint) echo "Test 1: Frontend can fetch data from backend API..." | tee -a "$TEST_LOG" frontend_container_id=$(docker ps -qf "name=myp-frontend-test") + if [ -z "$frontend_container_id" ]; then echo -e "${RED}Failed to find frontend container${NC}" | tee -a "$TEST_LOG" run_docker_compose -f "$SCRIPT_DIR/test-env.yml" down >> "$TEST_LOG" 2>&1