From 145728996983400ee3c407d438832c600160cf89 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 6 Mar 2025 11:34:43 +0100 Subject: [PATCH 1/2] feat: refs #6695 update Cypress parallel test execution to use 3 instances --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dc5acc84e..bb608c93a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -123,7 +123,7 @@ pipeline { sh "docker-compose ${env.COMPOSE_PARAMS} up -d" image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") { - sh 'sh test/cypress/cypressParallel.sh 2' + sh 'sh test/cypress/cypressParallel.sh 3' } } } From a8a1fcea43580483d2ab82512dd5d01da365b091 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 7 Mar 2025 08:06:58 +0100 Subject: [PATCH 2/2] test: fix orderList e2e, unestables --- .../integration/order/orderList.spec.js | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/test/cypress/integration/order/orderList.spec.js b/test/cypress/integration/order/orderList.spec.js index 649aa9ff8..8b8852a02 100644 --- a/test/cypress/integration/order/orderList.spec.js +++ b/test/cypress/integration/order/orderList.spec.js @@ -1,5 +1,9 @@ /// describe('OrderList', () => { + const clientCreateSelect = '#formModel [data-cy="Client_select"]'; + const addressCreateSelect = '#formModel [data-cy="Address_select"]'; + const agencyCreateSelect = '#formModel [data-cy="Agency_select"]'; + beforeEach(() => { cy.login('developer'); cy.viewport(1920, 1080); @@ -8,15 +12,14 @@ describe('OrderList', () => { it('create order', () => { cy.get('[data-cy="vnTableCreateBtn"]').click(); - cy.selectOption('[data-cy="Client_select"]', 1101); - cy.get('[data-cy="Address_select"]').click(); + cy.selectOption(clientCreateSelect, 1101); + cy.get(addressCreateSelect).click(); cy.get( '.q-menu > div> div.q-item:nth-child(1) >div.q-item__section--avatar > i', ).should('have.text', 'star'); - cy.get('.q-menu > div> .q-item:nth-child(1)').click(); cy.dataCy('landedDate').find('input').type('06/01/2001'); - cy.get('.q-card [data-cy="Agency_select"]').click(); - cy.get('.q-menu > div> .q-item:nth-child(1)').click(); + cy.selectOption(agencyCreateSelect, 1); + cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale'); cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click(); cy.wait('@orderSale'); @@ -31,7 +34,7 @@ describe('OrderList', () => { cy.dataCy('Customer ID_input').type('1101{enter}'); cy.dataCy('vnTableCreateBtn').click(); cy.dataCy('landedDate').find('input').type('06/01/2001'); - cy.get('.q-card [data-cy="Agency_select"]').click(); + cy.get(agencyCreateSelect).click(); cy.get('.q-menu > div> .q-item:nth-child(1)').click(); cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale'); cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click(); @@ -53,10 +56,11 @@ describe('OrderList', () => { `[href="#/order/list?createForm={%22clientFk%22:${clientId},%22addressId%22:1}"] > .q-btn__content > .q-icon`, ).click(); cy.dataCy('vnTableCreateBtn').click(); - cy.get('[data-cy="Client_select"]').should('have.value', 'Bruce Wayne'); - cy.get('[data-cy="Address_select"]').should('have.value', 'Bruce Wayne'); + + cy.get(clientCreateSelect).should('have.value', 'Bruce Wayne'); + cy.get(addressCreateSelect).should('have.value', 'Bruce Wayne'); cy.dataCy('landedDate').find('input').type('06/01/2001'); - cy.get('.q-card [data-cy="Agency_select"]').click(); + cy.get(agencyCreateSelect).click(); cy.get('.q-menu > div> .q-item:nth-child(1)').click(); cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale'); cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();