From 9ac6db2c5db1abfb83b7c476b1768b9d830219ae Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 26 Feb 2025 12:13:26 +0100
Subject: [PATCH] fix: refs #6695 update Cypress configuration and test result
 paths

---
 .gitignore        |  1 +
 Jenkinsfile       |  4 ++--
 cypress.config.js | 11 ++++++-----
 package.json      |  1 +
 pnpm-lock.yaml    |  3 +++
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8c2586de6..2f91bb7dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ yarn-error.log*
 # Cypress directories and files
 /test/cypress/videos
 /test/cypress/screenshots
+/junit
 
 # VitePress directories and files
 /docs/.vitepress/cache
diff --git a/Jenkinsfile b/Jenkinsfile
index da12b18fb..dc8a10850 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -116,7 +116,7 @@ pipeline {
                             def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
-                                sh 'cypress run'
+                                sh 'cypress run --browser chromium || true'
                                 // sh '''
                                 //     find test/cypress/integration -name "*.spec.js" | xargs -n 1 -P 2 -I {} sh -c "xvfb-run -a cypress run --headless --browser chromium --spec '{}'"
                                 //     wait
@@ -128,7 +128,7 @@ pipeline {
                         always {
                             sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
                             junit(
-                                testResults: 'test/cypress/results/junit-*.xml',
+                                testResults: 'junit/e2e-*.xml',
                                 allowEmptyResults: true
                             )
                         }
diff --git a/cypress.config.js b/cypress.config.js
index a5402fb16..7f430c743 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -1,6 +1,6 @@
 import { defineConfig } from 'cypress';
 
-let urlHost, reporter, reporterOptions;
+let urlHost, reporter, reporterOptions, defaultCommandTimeout;
 
 if (process.env.CI) {
     urlHost = 'front';
@@ -8,7 +8,7 @@ if (process.env.CI) {
     reporterOptions = {
         reporterEnabled: 'mocha-junit-reporter, mochawesome',
         mochaJunitReporterReporterOptions: {
-            mochaFile: 'test/cypress/results/junit-[hash].xml',
+            mochaFile: 'junit/e2e-[hash].xml',
         },
         mochawesomeReporterOptions: {
             reportDir: 'test/cypress/results',
@@ -17,6 +17,7 @@ if (process.env.CI) {
             json: false,
         },
     };
+    defaultCommandTimeout = 30000;
 } else {
     urlHost = 'localhost';
     reporter = 'cypress-mochawesome-reporter';
@@ -28,13 +29,14 @@ if (process.env.CI) {
         reportDir: 'test/cypress/reports',
         inlineAssets: true,
     };
+    defaultCommandTimeout = 10000;
 }
 
 export default defineConfig({
     e2e: {
         baseUrl: `http://${urlHost}:9000`,
         experimentalStudio: false,
-        defaultCommandTimeout: 10000,
+        defaultCommandTimeout,
         trashAssetsBeforeRuns: false,
         requestTimeout: 10000,
         responseTimeout: 30000,
@@ -59,7 +61,6 @@ export default defineConfig({
         viewportWidth: 1280,
         viewportHeight: 720,
     },
-    experimentalMemoryManagement: true,
-    defaultCommandTimeout: 10000,
+    defaultCommandTimeout,
     numTestsKeptInMemory: 0,
 });
diff --git a/package.json b/package.json
index bc9244350..b1c9e8455 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
         "eslint-plugin-cypress": "^4.1.0",
         "eslint-plugin-vue": "^9.32.0",
         "husky": "^8.0.0",
+        "mocha": "^11.1.0",
         "mocha-junit-reporter": "^2.2.1",
         "mocha-multi-reporters": "^1.5.1",
         "mochawesome": "^7.1.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 84db8ab1a..20b483e68 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -91,6 +91,9 @@ devDependencies:
   husky:
     specifier: ^8.0.0
     version: 8.0.3
+  mocha:
+    specifier: ^11.1.0
+    version: 11.1.0
   mocha-junit-reporter:
     specifier: ^2.2.1
     version: 2.2.1(mocha@11.1.0)