From 80fec12f9fc42a9b7b467a1fa2d92ae75b869da4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 13 Mar 2025 12:36:32 +0100
Subject: [PATCH 1/4] fix: workerDescriptorMenu_i18n
---
src/pages/Worker/Card/WorkerDescriptor.vue | 6 ------
src/pages/Worker/Card/WorkerDescriptorMenu.vue | 5 +++++
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 20653c97f..966e2caf8 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -190,9 +190,3 @@ const handlePhotoUpdated = (evt = false) => {
white-space: nowrap;
}
</style>
-
-<i18n>
-es:
- Click to allow the user to be disabled: Marcar para deshabilitar
- Click to exclude the user from getting disabled: Marcar para no deshabilitar
-</i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptorMenu.vue b/src/pages/Worker/Card/WorkerDescriptorMenu.vue
index 0dcb4fd71..3b6b144d6 100644
--- a/src/pages/Worker/Card/WorkerDescriptorMenu.vue
+++ b/src/pages/Worker/Card/WorkerDescriptorMenu.vue
@@ -63,3 +63,8 @@ const showChangePasswordDialog = () => {
</QItemSection>
</QItem>
</template>
+<i18n>
+ es:
+ Click to allow the user to be disabled: Marcar para deshabilitar
+ Click to exclude the user from getting disabled: Marcar para no deshabilitar
+ </i18n>
From 9fcd1477e5ce798efafd9031f80f6399604209f3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 13 Mar 2025 12:39:18 +0100
Subject: [PATCH 2/4] ci: update Cypress slowTestThreshold argument
---
cypress.config.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/cypress.config.js b/cypress.config.js
index d9cdbe728..222d14acb 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -44,6 +44,7 @@ export default defineConfig({
supportFile: 'test/cypress/support/index.js',
videosFolder: 'test/cypress/videos',
downloadsFolder: 'test/cypress/downloads',
+ slowTestThreshold: 20000,
video: false,
specPattern: 'test/cypress/integration/**/*.spec.js',
experimentalRunAllSpecs: true,
From ed6c2dc6d151c8b4ede15bcec2f14a786fa255fb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 16 Mar 2025 13:57:51 +0100
Subject: [PATCH 3/4] chore: remove slowTestThreshold from Cypress
configuration
---
cypress.config.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/cypress.config.js b/cypress.config.js
index 222d14acb..d9cdbe728 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -44,7 +44,6 @@ export default defineConfig({
supportFile: 'test/cypress/support/index.js',
videosFolder: 'test/cypress/videos',
downloadsFolder: 'test/cypress/downloads',
- slowTestThreshold: 20000,
video: false,
specPattern: 'test/cypress/integration/**/*.spec.js',
experimentalRunAllSpecs: true,
From 88407463f55520994da2c6955a22dde69493a3f6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 21 Mar 2025 09:49:00 +0100
Subject: [PATCH 4/4] fix: reduce parallelism in Cypress tests to improve
stability
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7f4144a54..05ef34791 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -126,7 +126,7 @@ pipeline {
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
- sh 'sh test/cypress/cypressParallel.sh 2'
+ sh 'sh test/cypress/cypressParallel.sh 1'
}
}
}