Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8626-addTestCasesInRouteListTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jose Antonio Tubau 2025-03-13 13:18:53 +01:00
commit 18fe420021
5 changed files with 25 additions and 10 deletions

View File

@ -1,5 +1,5 @@
/// <reference types="cypress" />
describe('ClaimPhoto', () => {
describe.skip('ClaimPhoto', () => {
const carrouselClose =
'.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon';
beforeEach(() => {

View File

@ -1,4 +1,4 @@
describe('AgencyWorkCenter', () => {
describe.skip('AgencyWorkCenter', () => {
const selectors = {
workCenter: 'workCenter_select',
popupSave: 'FormModelPopup_save',

View File

@ -1,4 +1,4 @@
describe('RouteAutonomous', () => {
describe.skip('RouteAutonomous', () => {
const getLinkSelector = (colField) =>
`tr:first-child > [data-col-field="${colField}"] > .no-padding > .link`;

View File

@ -1,4 +1,4 @@
describe('ZoneLocations', () => {
describe.skip('ZoneLocations', () => {
const data = {
Warehouse: { val: 'Warehouse One', type: 'select' },
};

View File

@ -1,24 +1,39 @@
#!/bin/bash
salix_dir="${1:-$HOME/Projects/salix}"
salix_dir=$(eval echo "$salix_dir")
echo "$salix_dir"
current_dir=$(pwd)
cleanup() {
if [[ -z "$ended" ]]; then
ended=true
docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml down -v
fi
docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml down -v
}
trap cleanup SIGINT
#CLEAN
# CLEAN
rm -rf test/cypress/screenshots
rm -f test/cypress/results/*
rm -f test/cypress/reports/*
rm -f junit/e2e-*.xml
#RUN
# RUN
export CI=true
export TZ=Europe/Madrid
# IMAGES
docker build -t registry.verdnatura.es/salix-back:dev -f "$salix_dir/back/Dockerfile" "$salix_dir"
cd "$salix_dir" && npx myt run -t
docker exec vn-database sh -c "rm -rf /mysql-template"
docker exec vn-database sh -c "cp -a /var/lib/mysql /mysql-template"
docker commit vn-database registry.verdnatura.es/salix-db:dev
docker rm -f vn-database
cd "$current_dir"
docker build -f ./docs/Dockerfile.dev -t lilium-dev .
# END IMAGES
docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml up -d
docker run -it --rm \