diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 0d186bd57..935c7b1cf 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -775,7 +775,7 @@ const rowCtrlClickFunction = computed(() => { :data-col-field="col?.name" >
+ { clickNotificationAction(); - cy.dataCy('handleSplitDialog').should('be.visible'); - cy.dataCy('handleSplitDialog').find('tbody > tr > :nth-child(1) > .q-icon'); - cy.dataCy('handleSplitDialog').find(findTr(2)).should('have.class', 'link'); - cy.dataCy('handleSplitDialog') + cy.dataCy('HandleLackDialog').should('be.visible'); + cy.dataCy('HandleLackDialog').find('tbody > tr > :nth-child(1) > .q-icon'); + cy.dataCy('HandleLackDialog').find(findTr(2)).should('have.class', 'link'); + cy.dataCy('HandleLackDialog') .find(`${findTr(2)}.link > div > span`) .should('have.text', `${ticketId} `); - cy.dataCy('handleSplitDialog').find(findTr(3)).should('have.text', 'noSplit'); + cy.dataCy('HandleLackDialog').find(findTr(3)).should('have.text', 'noSplit'); }); }); describe('Change Item', () => { @@ -86,13 +86,13 @@ describe('Ticket Lack detail', () => { clickNotificationAction(); - cy.dataCy('handleSplitDialog').should('be.visible'); - cy.dataCy('handleSplitDialog').find('tbody > tr > :nth-child(1) > .q-icon'); - cy.dataCy('handleSplitDialog').find(findTr(2)).should('have.class', 'link'); - cy.dataCy('handleSplitDialog') + cy.dataCy('HandleLackDialog').should('be.visible'); + cy.dataCy('HandleLackDialog').find('tbody > tr > :nth-child(1) > .q-icon'); + cy.dataCy('HandleLackDialog').find(findTr(2)).should('have.class', 'link'); + cy.dataCy('HandleLackDialog') .find(`${findTr(2)}.link > span`) .should('have.text', `${ticketId}`); - cy.dataCy('handleSplitDialog') + cy.dataCy('HandleLackDialog') .find(findTr(3)) .should('have.text', 'price retrieval failed'); }); @@ -109,14 +109,14 @@ describe('Ticket Lack detail', () => { clickNotificationAction(); - cy.dataCy('handleSplitDialog') + cy.dataCy('HandleLackDialog') .should('be.visible') .find('tbody > tr > :nth-child(1) > .q-icon'); - cy.dataCy('handleSplitDialog').find(findTr(2)).should('have.class', 'link'); - cy.dataCy('handleSplitDialog') + cy.dataCy('HandleLackDialog').find(findTr(2)).should('have.class', 'link'); + cy.dataCy('HandleLackDialog') .find(`${findTr(2)}.link > div > span`) .should('have.text', `${ticketId} `); - cy.dataCy('handleSplitDialog').find(findTr(3)).should('have.text', 'OK'); + cy.dataCy('HandleLackDialog').find(findTr(3)).should('have.text', 'OK'); }); }); describe('change quantity', () => { @@ -132,14 +132,14 @@ describe('Ticket Lack detail', () => { clickNotificationAction(); - cy.dataCy('handleSplitDialog') + cy.dataCy('HandleLackDialog') .should('be.visible') .find('tbody > tr > :nth-child(1) > .q-icon'); - cy.dataCy('handleSplitDialog').find(findTr(2)).should('have.class', 'link'); - cy.dataCy('handleSplitDialog') + cy.dataCy('HandleLackDialog').find(findTr(2)).should('have.class', 'link'); + cy.dataCy('HandleLackDialog') .find(`${findTr(2)}.link > div > span`) .should('have.text', `${ticketId} `); - cy.dataCy('handleSplitDialog').find(findTr(3)).should('have.text', '10'); + cy.dataCy('HandleLackDialog').find(findTr(3)).should('have.text', '10'); }); }); describe('Item proposal', () => { diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js index ce5c2c2cb..bd6f6dad6 100755 --- a/test/cypress/support/commands.js +++ b/test/cypress/support/commands.js @@ -321,9 +321,7 @@ Cypress.Commands.add('clickButtonDescriptor', (id) => { }); Cypress.Commands.add('openUserPanel', () => { - cy.get( - '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image', - ).click(); + cy.dataCy('userPanel_btn').click(); }); Cypress.Commands.add('checkNotification', (text) => { @@ -379,7 +377,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(); diff --git a/test/cypress/support/index.js b/test/cypress/support/index.js index c57c1a303..075e0c8eb 100644 --- a/test/cypress/support/index.js +++ b/test/cypress/support/index.js @@ -27,7 +27,17 @@ function randomNumber(options = { length: 10 }) { function randomizeValue(characterSet, options) { return Array.from({ length: options.length }, () => - characterSet.charAt(Math.floor(Math.random() * characterSet.length)) + characterSet.charAt(Math.floor(Math.random() * characterSet.length)), ).join(''); } + +const style = document.createElement('style'); +style.innerHTML = ` + * { + transition: none !important; + animation: none !important; + } +`; +document.head.appendChild(style); + export { randomString, randomNumber, randomizeValue };