From 95a8c0c3d0e5c2d577884a3688074ab4af1805c0 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 10 Feb 2025 10:29:23 +0100 Subject: [PATCH] fix: refs #6695 e2e stockBought --- Jenkinsfile | 20 +++++++++++++++---- .../integration/entry/stockBought.spec.js | 5 +++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6c874e1041..4d8c5cf4fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -117,10 +117,22 @@ pipeline { } } stage('Up') { - steps { - // sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d db" - sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d back" - sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d front" + parallel{ + stage('Database') { + steps { + sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d vn-database" + } + } + stage('Backend') { + steps { + sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d back" + } + } + stage('Frontend') { + steps { + sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d front" + } + } } } stage('Run E2E') { diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js index 6d7030f93b..f43211b89d 100644 --- a/test/cypress/integration/entry/stockBought.spec.js +++ b/test/cypress/integration/entry/stockBought.spec.js @@ -14,8 +14,9 @@ describe('EntryStockBought', () => { cy.addBtnClick(); cy.get('input[aria-label="Reserve"]').type('1'); cy.get('input[aria-label="Date"]').eq(1).clear(); - cy.get('input[aria-label="Date"]').eq(1).type('01-01'); - cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}'); + cy.get('input[aria-label="Date"]').eq(1).type('01-01-2001'); + cy.selectOption('input[aria-label="Buyer"]', 'buyerboss'); + cy.get('#formModel button[title="Save"]').click(); cy.get('.q-notification__message').should('have.text', 'Data created'); }); it('Should check detail for the buyer', () => {