From cb034dc40637000a6e7c7ab74a60bcec9386fb73 Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 26 Feb 2025 12:29:17 +0100 Subject: [PATCH 1/2] fix: refs #6943 e2e clientList, formModel --- src/components/FormModel.vue | 9 +-------- src/components/ui/CardDescriptor.vue | 2 +- .../integration/client/clientList.spec.js | 7 ++++--- test/cypress/support/commands.js | 17 ++++++++++++++--- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 182eeaafe..04ef13d45 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -12,7 +12,6 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue'; import VnConfirm from './ui/VnConfirm.vue'; import { tMobile } from 'src/composables/tMobile'; import { useArrayData } from 'src/composables/useArrayData'; -import { getDifferences, getUpdatedValues } from 'src/filters'; const { push } = useRouter(); const quasar = useQuasar(); @@ -285,12 +284,7 @@ function trimData(data) { } return data; } -function onBeforeSave(formData, originalData) { - return getUpdatedValues( - Object.keys(getDifferences(formData, originalData)), - formData, - ); -} + async function onKeyup(evt) { if (evt.key === 'Enter' && !('prevent-submit' in attrs)) { const input = evt.target; @@ -327,7 +321,6 @@ defineExpose({ class="q-pa-md" :style="maxWidth ? 'max-width: ' + maxWidth : ''" id="formModel" - :mapper="onBeforeSave" >
-
+
diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js index 7572ea417..f83d29278 100644 --- a/test/cypress/integration/client/clientList.spec.js +++ b/test/cypress/integration/client/clientList.spec.js @@ -1,7 +1,6 @@ /// -describe.skip('Client list', () => { +describe('Client list', () => { beforeEach(() => { - cy.viewport(1280, 720); cy.login('developer'); cy.visit('/#/customer/list', { timeout: 5000, @@ -28,7 +27,7 @@ describe.skip('Client list', () => { Email: { val: `user.test${randomInt}@cypress.com` }, 'Sales person': { val: 'salesPerson', type: 'select' }, Location: { val: '46000', type: 'select' }, - 'Business type': { val: 'Otros', type: 'select' }, + 'Business type': { val: 'others', type: 'select' }, }; cy.fillInForm(data); @@ -37,6 +36,7 @@ describe.skip('Client list', () => { cy.checkNotification('Data created'); cy.url().should('include', '/summary'); }); + it('Client list search client', () => { const search = 'Jessica Jones'; cy.searchByLabel('Name', search); @@ -59,6 +59,7 @@ describe.skip('Client list', () => { cy.checkValueForm(1, search); cy.checkValueForm(2, search); }); + it('Client founded create order', () => { const search = 'Jessica Jones'; cy.searchByLabel('Name', search); diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js index 6b6ebd426..c0f97dafb 100755 --- a/test/cypress/support/commands.js +++ b/test/cypress/support/commands.js @@ -329,8 +329,13 @@ Cypress.Commands.add('openUserPanel', () => { Cypress.Commands.add('checkNotification', (text) => { cy.get('.q-notification', { timeout: 10000 }) .should('be.visible') - .filter((_, el) => Cypress.$(el).text().includes(text)) - .should('have.length.greaterThan', 0); + .should('have.length.greaterThan', 0) + .should(($elements) => { + const found = $elements + .toArray() + .some((el) => Cypress.$(el).text().includes(text)); + expect(found).to.be.true; + }); }); Cypress.Commands.add('openActions', (row) => { @@ -376,7 +381,13 @@ Cypress.Commands.add('clickButtonWith', (type, value) => { } }); Cypress.Commands.add('clickButtonWithIcon', (iconClass) => { - cy.get(`.q-icon.${iconClass}`).parent().click(); + cy.waitForElement('[data-cy="descriptor_actions"]'); + cy.get('[data-cy="loading-spinner"]', { timeout: 10000 }).should('not.be.visible'); + cy.get('.q-btn') + .filter((index, el) => Cypress.$(el).find('.q-icon.' + iconClass).length > 0) + .then(($btn) => { + cy.wrap($btn).click(); + }); }); Cypress.Commands.add('clickButtonWithText', (buttonText) => { cy.get('.q-btn').contains(buttonText).click(); From 6baf8504709a3b6d401472f8367953d551957d2a Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 26 Feb 2025 12:44:20 +0100 Subject: [PATCH 2/2] fix: refs #6943 formModel workerDepartment --- src/components/FormModel.vue | 9 ++++++++- src/pages/Worker/WorkerDepartment.vue | 9 +-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 04ef13d45..182eeaafe 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -12,6 +12,7 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue'; import VnConfirm from './ui/VnConfirm.vue'; import { tMobile } from 'src/composables/tMobile'; import { useArrayData } from 'src/composables/useArrayData'; +import { getDifferences, getUpdatedValues } from 'src/filters'; const { push } = useRouter(); const quasar = useQuasar(); @@ -284,7 +285,12 @@ function trimData(data) { } return data; } - +function onBeforeSave(formData, originalData) { + return getUpdatedValues( + Object.keys(getDifferences(formData, originalData)), + formData, + ); +} async function onKeyup(evt) { if (evt.key === 'Enter' && !('prevent-submit' in attrs)) { const input = evt.target; @@ -321,6 +327,7 @@ defineExpose({ class="q-pa-md" :style="maxWidth ? 'max-width: ' + maxWidth : ''" id="formModel" + :mapper="onBeforeSave" > -import VnSection from 'src/components/common/VnSection.vue'; import WorkerDepartmentTree from './WorkerDepartmentTree.vue';