From 30b0630c88ecdee0c42943bf9ef37b0b483a29c9 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 10 Feb 2025 07:50:06 +0100 Subject: [PATCH] test: refs #6695 e2e fix network --- Jenkinsfile | 2 ++ cypress.config.js | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e162cb023..00470d851 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -110,6 +110,7 @@ pipeline { // sh "git clone https://gitea.verdnatura.es/verdnatura/salix.git" // } sh "pnpm exec cypress install" + sh "docker network create ${env.NETWORK}|| true" } // sh 'rm -rf salix' // sh 'git clone dev https://gitea.verdnatura.es/verdnatura/salix.git' @@ -201,5 +202,6 @@ def cleanDockerE2E() { // sh 'docker rm -f vn-database || true' // sh 'docker rm -f salix_e2e || true' sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true" + sh "docker network rm ${env.NETWORK} || true" } } diff --git a/cypress.config.js b/cypress.config.js index 113a96e5d..8ba6ce74d 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -23,9 +23,9 @@ export default defineConfig({ downloadsFolder: 'test/cypress/downloads', video: false, specPattern: [ - // 'test/cypress/integration/entry/stockBought.spec.js', - // 'test/cypress/integration/invoiceOut/invoiceOutNegativeBases.js', - // 'test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js', + 'test/cypress/integration/entry/stockBought.spec.js', + 'test/cypress/integration/invoiceOut/invoiceOutNegativeBases.js', + 'test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js', 'test/cypress/integration/item/itemTag.spec.js', // 'test/cypress/integration/route/routeList.spec.js', // 'test/cypress/integration/ticket/ticketList.spec.js',