Merge branch 'dev' into 8440-createVehicleNotes

Jenkinsfile

@@ -120,6 +120,8 @@ pipeline {
                             def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
 
                             sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
+                            sh "docker-compose ${env.COMPOSE_PARAMS} pull back"
+                            sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
 
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {

README.md

@@ -32,6 +32,18 @@ pnpm run test:front
 pnpm run test:e2e
 ```
 
+### Run e2e parallel
+
+```bash
+pnpm run test:e2e:parallel
+```
+
+### View e2e parallel report
+
+```bash
+pnpm run test:e2e:summary
+```
+
 ### Build the app for production
 
 ```bash

package.json

@@ -13,7 +13,7 @@
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
         "test:e2e": "cypress open",
         "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
-        "test:e2e:parallel": "bash ./test/cypress/cypressParallel.sh",
+        "test:e2e:parallel": "bash ./test/cypress/run.sh",
         "test:e2e:summary": "bash ./test/cypress/summary.sh",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:front": "vitest",
@@ -56,6 +56,7 @@
         "eslint-plugin-cypress": "^4.1.0",
         "eslint-plugin-vue": "^9.32.0",
         "husky": "^8.0.0",
+        "junit-merge": "^2.0.0",
         "mocha": "^11.1.0",
         "postcss": "^8.4.23",
         "prettier": "^3.4.2",

src/pages/Ticket/Card/TicketSale.vue

@@ -176,12 +176,10 @@ const getSaleTotal = (sale) => {
 
 const getRowUpdateInputEvents = (sale) => {
     return {
-        'keyup.enter': (evt) => {
+        'keyup.enter': () => {
-            console.error(evt);
             changeQuantity(sale);
         },
-        blur: (evt) => {
+        blur: () => {
-            console.error(evt);
             changeQuantity(sale);
         },
     };

test/cypress/integration/outLogin/logout.spec.js

@@ -24,12 +24,21 @@ describe('Logout', () => {
                     },
                 },
                 statusMessage: 'AUTHORIZATION_REQUIRED',
-            });
+            }).as('badRequest');
         });
 
         it('when token not exists', () => {
+            const exceptionHandler = (err) => {
+                if (err.code === 'AUTHORIZATION_REQUIRED') return;
+            };
+            Cypress.on('uncaught:exception', exceptionHandler);
+
             cy.get('.q-list').first().should('be.visible').click();
+            cy.wait('@badRequest');
+
             cy.checkNotification('Authorization Required');
+
+            Cypress.off('uncaught:exception', exceptionHandler);
         });
     });
 });

test/cypress/integration/ticket/ticketSale.spec.js

@@ -23,7 +23,7 @@ describe('TicketSale', () => {
 
             cy.get('[data-col-field="price"]')
                 .find('.q-btn > .q-btn__content')
-                .should('have.text', `€${price}`);
+                .should('contain.text', `€${price}`);
         });
         it('update discount', () => {
             const discount = Math.floor(Math.random() * 100) + 1;
@@ -152,22 +152,6 @@ describe('TicketSale', () => {
             cy.checkNotification('Future ticket date not allowed');
         });
 
-        it('marks row as reserved', () => {
-            selectFirstRow();
-            cy.dataCy('ticketSaleMoreActionsDropdown').click();
-            cy.waitForElement('[data-cy="markAsReservedItem"]');
-            cy.dataCy('markAsReservedItem').click();
-            cy.dataCy('ticketSaleReservedIcon').should('exist');
-        });
-
-        it('unmarks row as reserved', () => {
-            selectFirstRow();
-            cy.dataCy('ticketSaleMoreActionsDropdown').click();
-            cy.waitForElement('[data-cy="unmarkAsReservedItem"]');
-            cy.dataCy('unmarkAsReservedItem').click();
-            cy.dataCy('ticketSaleReservedIcon').should('not.exist');
-        });
-
         it('refunds row with warehouse', () => {
             selectFirstRow();
             cy.dataCy('ticketSaleMoreActionsDropdown').click();

test/cypress/support/index.js

@@ -40,6 +40,11 @@ style.innerHTML = `
 `;
 document.head.appendChild(style);
 
+// FIXME: https://redmine.verdnatura.es/issues/8771
+Cypress.on('uncaught:exception', (err) => {
+    if (err.code === 'ERR_CANCELED') return false;
+});
+
 const waitForApiReady = (url, maxRetries = 20, delay = 1000) => {
     let retries = 0;