From 1772c3104700f659167b5a0b2b6fc801fc14be30 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 18 Feb 2025 14:20:31 +0100 Subject: [PATCH] perf: refs #6695 only necessary --- cypress.config.js | 3 +-- docker-compose.e2e.local.yml | 18 +----------------- test/cypress/.gitignore | 1 + test/cypress/docker/run/main.sh | 5 +++++ test/cypress/docker/run/run_group.sh | 4 ++-- 5 files changed, 10 insertions(+), 21 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index d56b1cff1..ae3cb3f00 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -17,10 +17,9 @@ export default defineConfig({ screenshotsFolder: 'test/cypress/screenshots', supportFile: 'test/cypress/support/index.js', videosFolder: 'test/cypress/videos', - // downloadsFolder: 'test/cypress/downloads', + downloadsFolder: 'test/cypress/downloads', video: false, specPattern: 'test/cypress/integration/**/*.spec.js', - // specPattern: 'test/cypress/integration/client/clientList.spec.js', experimentalRunAllSpecs: true, watchForFileChanges: true, reporter: 'cypress-mochawesome-reporter', diff --git a/docker-compose.e2e.local.yml b/docker-compose.e2e.local.yml index 04781d7e7..c0bb149b4 100644 --- a/docker-compose.e2e.local.yml +++ b/docker-compose.e2e.local.yml @@ -2,26 +2,20 @@ version: '3.7' services: back: image: registry.verdnatura.es/salix-back:dev - # image: back_try volumes: - ./test/cypress/storage:/salix/storage - ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json depends_on: - vn-database - # ports: - # - '3000:3000' front: image: alexmorenovn/vndev:latest command: quasar dev volumes: - - .:/app:delegated + - .:/app working_dir: /app environment: - TZ=Europe/Madrid - DOCKER=true - # ports: - # - '9000:9000' - e2e: image: cypress-setup:latest command: sh -c "while [ ! -d node_modules/cypress ]; do sleep 1; done && pnpm exec cypress run --browser chromium --spec ${CYPRESS_SPEC:?}" @@ -31,15 +25,5 @@ services: volumes: - .:/app working_dir: /app - cypress-setup: - image: cypress-setup:latest - build: - context: . - dockerfile: ./test/cypress/Dockerfile - command: sh -c "pnpm install --frozen-lockfile && pnpm exec cypress install" - volumes: - - .:/app:delegated vn-database: image: registry.verdnatura.es/salix-db:dev - # ports: - # - '3306:3306' diff --git a/test/cypress/.gitignore b/test/cypress/.gitignore index 7ccbe8fa1..3a1fcbf37 100644 --- a/test/cypress/.gitignore +++ b/test/cypress/.gitignore @@ -1,6 +1,7 @@ reports/* videos/* screenshots/* +downloads/* storage/* reports/* docker/logs/* diff --git a/test/cypress/docker/run/main.sh b/test/cypress/docker/run/main.sh index 6cbe70678..4fdb06a4c 100644 --- a/test/cypress/docker/run/main.sh +++ b/test/cypress/docker/run/main.sh @@ -9,7 +9,12 @@ source "$(dirname "$0")/summary.sh" # Manejo de señales para limpiar si se interrumpe el script trap cleanup SIGINT # docker-compose -p lilium-e2e -f docker-compose.e2e.local.yml build cypress-setup >/dev/null 2>&1 +echo "💿 Construyendo CypressSetup" docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile . >/dev/null 2>&1 +echo "💿 Descargando imagenes actualizadas" +docker-compose -f docker-compose.e2e.yml pull back front vn-database +echo "📀 Actualizadas" + # Ejecutar grupos en paralelo y almacenar PIDs for i in "${!groups[@]}"; do run_group "${groups[$i]}" "$((i+1))" & # Ejecutar en segundo plano diff --git a/test/cypress/docker/run/run_group.sh b/test/cypress/docker/run/run_group.sh index 7980a07f6..b8311265b 100644 --- a/test/cypress/docker/run/run_group.sh +++ b/test/cypress/docker/run/run_group.sh @@ -43,7 +43,7 @@ run_group() { folderName=$(basename "$testFolder" | tr -cd 'a-zA-Z0-9_-') uniqueName="${NETWORK}_${folderName}_${parallelIndex}_${groupIndex}" - echo "🔹 $folderName (Grupo: $parallelIndex, Índice: $groupIndex) - Up" + echo "🔹 $folderName (Grupo: $parallelIndex, Índice: $groupIndex) - Levantado" export CYPRESS_SPEC="test/cypress/integration/${folderName}/**/*.spec.js" @@ -53,7 +53,7 @@ run_group() { # 🔹 Esperar a que la API en /api/Applications/status devuelva { "status": true } wait_for_api_ready "Aplicación" "front" 9000 "/api/Applications/status" "${uniqueName}_default" - echo "🌐 $folderName (Grupo: $parallelIndex, Índice: $groupIndex) - Connected" + echo "🌐 $folderName (Grupo: $parallelIndex, Índice: $groupIndex) - Conectado" # 🚀 Ejecutar pruebas en modo detach docker-compose -p "$uniqueName" -f docker-compose.e2e.local.yml up -d e2e >/dev/null 2>&1