verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 87 Releases Wiki Activity

Merge branch 'dev' into 7587-addClaimedTicketRefToRefundTicket
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jose Antonio Tubau 2025-03-05 13:44:36 +00:00
parent b4e3653453 d5cd3aee2d
commit f8f527cc52
4 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -108,6 +108,7 @@ pipeline {
} }
stage('E2E') { stage('E2E') {
environment { environment {
CREDS = credentials('docker-registry')
COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}" COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ." COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
} }
@ -115,9 +116,10 @@ pipeline {
script { script {
sh 'rm junit/e2e-*.xml || true' sh 'rm junit/e2e-*.xml || true'
env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
withDockerRegistry([credentialsId: 'docker-registry', url: "https://${env.REGISTRY}" ]) {
sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
sh "docker-compose ${env.COMPOSE_PARAMS} up -d" sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
}
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") { image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
sh 'cypress run --browser chromium || true' sh 'cypress run --browser chromium || true'

2
src/components/common/VnInput.vue
View File

@ -143,7 +143,7 @@ const handleUppercase = () => {
:rules="mixinRules" :rules="mixinRules"
:lazy-rules="true" :lazy-rules="true"
hide-bottom-space hide-bottom-space
:data-cy="$attrs['data-cy'] ?? $attrs.label + '_input'" :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_input'"
> >
<template #prepend v-if="$slots.prepend"> <template #prepend v-if="$slots.prepend">
<slot name="prepend" /> <slot name="prepend" />

3
src/pages/Zone/Card/ZoneBasicData.vue
View File

@ -120,11 +120,10 @@ const setFilteredAddresses = (data) => {
option-label="nickname" option-label="nickname"
:options="addresses" :options="addresses"
:fields="['id', 'nickname']" :fields="['id', 'nickname']"
sort-by="id" sort-by="nickname ASC"
hide-selected hide-selected
map-options map-options
:rules="validate('data.addressFk')" :rules="validate('data.addressFk')"
:filter-options="['id']"
/> />
</VnRow> </VnRow>
<VnRow> <VnRow>

45
test/cypress/integration/vnComponent/VnAccountNumber.spec.js
View File

@ -1,4 +1,5 @@
describe('VnAccountNumber', () => { describe('VnAccountNumber', () => {
const accountInput = 'input[data-cy="supplierFiscalDataAccount_input"]';
beforeEach(() => { beforeEach(() => {
cy.login('developer'); cy.login('developer');
cy.viewport(1920, 1080); cy.viewport(1920, 1080);
@ -7,44 +8,30 @@ describe('VnAccountNumber', () => {
describe('VnInput handleInsertMode()', () => { describe('VnInput handleInsertMode()', () => {
it('should replace character at cursor position in insert mode', () => { it('should replace character at cursor position in insert mode', () => {
cy.get('input[data-cy="supplierFiscalDataAccount"]').type( cy.get(accountInput).type('{selectall}4100000001');
'{selectall}4100000001', cy.get(accountInput).type('{movetostart}');
); cy.get(accountInput).type('999');
cy.get('input[data-cy="supplierFiscalDataAccount"]').type('{movetostart}'); cy.get(accountInput).should('have.value', '9990000001');
cy.get('input[data-cy="supplierFiscalDataAccount"]').type('999');
cy.get('input[data-cy="supplierFiscalDataAccount"]').should(
'have.value',
'9990000001',
);
}); });
it('should replace character at cursor position in insert mode', () => { it('should replace character at cursor position in insert mode', () => {
cy.get('input[data-cy="supplierFiscalDataAccount"]').clear(); cy.get(accountInput).clear();
cy.get('input[data-cy="supplierFiscalDataAccount"]').type('4100000001'); cy.get(accountInput).type('4100000001');
cy.get('input[data-cy="supplierFiscalDataAccount"]').type('{movetostart}'); cy.get(accountInput).type('{movetostart}');
cy.get('input[data-cy="supplierFiscalDataAccount"]').type('999'); cy.get(accountInput).type('999');
cy.get('input[data-cy="supplierFiscalDataAccount"]').should( cy.get(accountInput).should('have.value', '9990000001');
'have.value',
'9990000001',
);
}); });
it('should respect maxlength prop', () => { it('should respect maxlength prop', () => {
cy.get('input[data-cy="supplierFiscalDataAccount"]').clear(); cy.get(accountInput).clear();
cy.get('input[data-cy="supplierFiscalDataAccount"]').type('123456789012345'); cy.get(accountInput).type('123456789012345');
cy.get('input[data-cy="supplierFiscalDataAccount"]').should( cy.get(accountInput).should('have.value', '1234567890');
'have.value',
'1234567890',
);
}); });
}); });
it('should convert short account number to standard format', () => { it('should convert short account number to standard format', () => {
cy.get('input[data-cy="supplierFiscalDataAccount"]').clear(); cy.get(accountInput).clear();
cy.get('input[data-cy="supplierFiscalDataAccount"]').type('123.'); cy.get(accountInput).type('123.');
cy.get('input[data-cy="supplierFiscalDataAccount"]').should( cy.get(accountInput).should('have.value', '1230000000');
'have.value',
'1230000000',
);
}); });
}); });