fix: refs #6695 fix e2e's
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2025-02-10 12:41:42 +01:00
parent 93197b7bd2
commit 69fb218b21
9 changed files with 28 additions and 53 deletions

View File

@ -1,4 +0,0 @@
FROM mariadb:10.11.6
ENV TZ Europe/Madrid
COPY --from=mariadb-with-data /data /var/lib/mysql
CMD ["mysqld"]

2
Jenkinsfile vendored
View File

@ -130,7 +130,7 @@ pipeline {
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml logs back"
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml logs vn-database"
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml logs front"
def containerId = sh(script: "docker-compose -f docker-compose.e2e.yml ps -q e2e", returnStdout: true).trim()
def containerId = sh(script: "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml ps -q e2e", returnStdout: true).trim()
if (containerId) {
def exitCode = sh(script: "docker inspect -f '{{.State.ExitCode}}' ${containerId}", returnStdout: true).trim()
sh "docker cp ${containerId}:/app/test/cypress/reports ./test/cypress/"

View File

@ -19,18 +19,7 @@ export default defineConfig({
videosFolder: 'test/cypress/videos',
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/item/itemTag.spec.js',
'test/cypress/integration/route/routeList.spec.js',
'test/cypress/integration/ticket/ticketList.spec.js',
'test/cypress/integration/ticket/ticketSale.spec.js',
'test/cypress/integration/vnComponent/UserPanel.spec.js',
'test/cypress/integration/vnComponent/VnLocation.spec.js',
'test/cypress/integration/worker/workerNotificationsManager.spec.js',
],
specPattern: 'test/cypress/integration/route/routeList.spec.js',
experimentalRunAllSpecs: true,
watchForFileChanges: true,
reporter: 'cypress-mochawesome-reporter',

11
db.sh
View File

@ -1,11 +0,0 @@
npx myt run -t
docker exec -it vn-database sh
cp -r /var/lib/mysql /data
exit
docker commit vn-database vn_db
# FROM mariadb:latest
# COPY --from=vn_db /data /var/lib/mysql
# CMD ["mysqld"]
docker build -t vn_db .

View File

@ -16,19 +16,23 @@ services:
volumes:
- .:/app
working_dir: /app
# ports:
# - '9000:9000'
environment:
- TZ=Europe/Madrid
ports:
- '9000:9000'
e2e:
image: alexmorenovn/vndev:latest
# command: pnpm exec cypress run --browser chromium
command: sh -c "pnpm exec cypress install && pnpm exec cypress run --browser chromium"
environment:
- TZ=Europe/Madrid
volumes:
- .:/app
working_dir: /app
vn-database:
image: alexmorenovn/vn_db:latest
# ports:
# - '3306:3306'
ports:
- '3306:3306'
# e2e:
# command: npx cypress run --browser chromium

View File

@ -1,18 +1,4 @@
FROM node:lts-bookworm
ENV SHELL bash
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN npm install -g pnpm@8.15.1
RUN pnpm setup
RUN apt install libkrb5-dev libssl-dev
RUN npm i -g pnpm
WORKDIR /salix
COPY salix/db db
COPY salix/myt.config.yml .
COPY salix/.git .git
# COPY node_modules node_modules
RUN pnpm i @verdnatura/myt
FROM mariadb:10.11.6
ENV TZ Europe/Madrid
COPY --from=mariadb-with-data /data /var/lib/mysql
CMD ["mysqld"]

13
test/cypress/db/db.sh Normal file
View File

@ -0,0 +1,13 @@
# npx myt run -t
# docker exec -it vn-database sh
# cp -r /var/lib/mysql /data
# exit
# FROM mariadb:latest
# COPY --from=vn_db /data /var/lib/mysql
# CMD ["mysqld"]
docker commit vn-database vn_db
docker build -t vn_db .
docker tag vn_db alexmorenovn/vn_db:latest
docker push alexmorenovn/vn_db:latest

View File

@ -9,7 +9,6 @@ describe('Item tag', () => {
});
it('should throw an error adding an existent tag', () => {
cy.get('.q-page-sticky > div').click();
cy.get('.q-page-sticky > div').click();
cy.selectOption(':nth-child(8) > .q-select', 'Tallos');
cy.get(':nth-child(8) > [label="Value"]').type('1');
@ -18,7 +17,6 @@ describe('Item tag', () => {
});
it('should add a new tag', () => {
cy.get('.q-page-sticky > div').click();
cy.get('.q-page-sticky > div').click();
cy.selectOption(':nth-child(8) > .q-select', 'Ancho de la base');
cy.get(':nth-child(8) > [label="Value"]').type('50');

View File

@ -10,7 +10,7 @@ describe('Route', () => {
it('Route list create route', () => {
cy.addBtnClick();
cy.get('input[name="description"]').type('routeTestOne{enter}');
cy.get('.q-card input[name="description"]').type('routeTestOne{enter}');
cy.get('.q-notification__message').should('have.text', 'Data created');
cy.url().should('include', '/summary');
});