From a4062f188becaaf41567acb8d6ff157f072b30b0 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 16 Dec 2024 07:46:36 +0100 Subject: [PATCH] refactor: refs #8219 requested changes --- .../invoiceOut/invoiceOutList.spec.js | 6 ++--- .../invoiceOutNegativeBases.spec.js | 4 +-- .../invoiceOut/invoiceOutSummary.spec.js | 25 +++++++------------ .../vnComponent/VnSearchBar.spec.js | 6 ++--- test/cypress/support/commands.js | 2 +- 5 files changed, 17 insertions(+), 26 deletions(-) diff --git a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js index 3db4d89ca..7de481e66 100644 --- a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js +++ b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js @@ -14,14 +14,14 @@ describe('InvoiceOut list', () => { cy.viewport(1920, 1080); cy.login('developer'); cy.visit(`/#/invoice-out/list`); - cy.dataCy('vnSearchBar').find('input').type('{enter}'); + cy.typeSearchbar('{enter}'); }); it('should search and filter an invoice and enter to the summary', () => { - cy.dataCy('vnSearchBar').find('input').type('1{enter}'); + cy.typeSearchbar('1{enter}'); cy.get('.q-virtual-scroll__content > :nth-child(2) > :nth-child(7)').click(); cy.get('.header > a.q-btn > .q-btn__content').click(); - cy.dataCy('vnSearchBar').find('input').type('{enter}'); + cy.typeSearchbar('{enter}'); cy.dataCy('InvoiceOutFilterAmountBtn').find('input').type('8.88{enter}'); }); diff --git a/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js b/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js index 8f5835e56..5f629df0b 100644 --- a/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js +++ b/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js @@ -1,7 +1,5 @@ /// describe('InvoiceOut negative bases', () => { - const notification = '.q-notification__message'; - beforeEach(() => { cy.viewport(1920, 1080); cy.login('developer'); @@ -13,6 +11,6 @@ describe('InvoiceOut negative bases', () => { ':nth-child(7) > .full-width > :nth-child(1) > .column > div.q-px-xs > .q-field > .q-field__inner > .q-field__control' ).type('23{enter}'); cy.get('#subToolbar > .q-btn').click(); - cy.get(notification).should('contains.text', 'CSV downloaded successfully'); + cy.checkNotification('CSV downloaded successfully'); }); }); diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js index 14f53fdfa..b7fd11307 100644 --- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js +++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js @@ -1,6 +1,5 @@ /// describe('InvoiceOut summary', () => { - const notification = '.q-notification__message'; const transferInvoice = { Client: { val: 'employee', type: 'select' }, Type: { val: 'Error in customer data', type: 'select' }, @@ -10,45 +9,39 @@ describe('InvoiceOut summary', () => { cy.viewport(1920, 1080); cy.login('developer'); cy.visit(`/#/invoice-out/list`); - cy.get('#searchbar input').type('{enter}'); + cy.typeSearchbar('{enter}'); }); it('should generate the invoice PDF', () => { - cy.get('#searchbar input').type('T1111111{enter}'); + cy.typeSearchbar('T1111111{enter}'); cy.dataCy('descriptor-more-opts').click(); cy.get('.q-menu > .q-list > :nth-child(6)').click(); cy.dataCy('VnConfirm_confirm').click(); - cy.get(notification).should( - 'contains.text', - 'The invoice PDF document has been regenerated' - ); + cy.checkNotification('The invoice PDF document has been regenerated'); }); it('should refund the invoice ', () => { - cy.get('#searchbar input').type('T1111111{enter}'); + cy.typeSearchbar('T1111111{enter}'); cy.dataCy('descriptor-more-opts').click(); cy.get('.q-menu > .q-list > :nth-child(7)').click(); cy.get('#q-portal--menu--3 > .q-menu > .q-list > :nth-child(2)').click(); - cy.get(notification).should( - 'contains.text', - 'The following refund ticket have been created 1000000' - ); + cy.checkNotification('The following refund ticket have been created 1000000'); }); it('should delete an invoice ', () => { - cy.get('#searchbar input').type('T2222222{enter}'); + cy.typeSearchbar('T2222222{enter}'); cy.dataCy('descriptor-more-opts').click(); cy.get('.q-menu > .q-list > :nth-child(4)').click(); cy.dataCy('VnConfirm_confirm').click(); - cy.get(notification).should('contains.text', 'InvoiceOut deleted'); + cy.checkNotification('InvoiceOut deleted'); }); it('should transfer the invoice ', () => { - cy.get('#searchbar input').type('T1111111{enter}'); + cy.typeSearchbar('T1111111{enter}'); cy.dataCy('descriptor-more-opts').click(); cy.get('.q-menu > .q-list > :nth-child(1)').click(); cy.fillInForm(transferInvoice); cy.get('.q-mt-lg > .q-btn').click(); - cy.get(notification).should('contains.text', 'Transferred invoice'); + cy.checkNotification('Transferred invoice'); }); }); diff --git a/test/cypress/integration/vnComponent/VnSearchBar.spec.js b/test/cypress/integration/vnComponent/VnSearchBar.spec.js index b8621118c..c8f6b3c19 100644 --- a/test/cypress/integration/vnComponent/VnSearchBar.spec.js +++ b/test/cypress/integration/vnComponent/VnSearchBar.spec.js @@ -16,18 +16,18 @@ describe('VnSearchBar', () => { }); it('should stay on the list page if there are several results or none', () => { - cy.writeSearchbar('salesA{enter}'); + cy.typeSearchbar('salesA{enter}'); checkTableLength(2); cy.clearSearchbar(); - cy.writeSearchbar('0{enter}'); + cy.typeSearchbar('0{enter}'); checkTableLength(0); }); const searchAndCheck = (searchTerm, expectedText) => { cy.clearSearchbar(); - cy.writeSearchbar(`${searchTerm}{enter}`); + cy.typeSearchbar(`${searchTerm}{enter}`); cy.get(idGap).should('have.text', expectedText); }; diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js index 91ce0348e..88589e8d4 100755 --- a/test/cypress/support/commands.js +++ b/test/cypress/support/commands.js @@ -255,7 +255,7 @@ Cypress.Commands.add('clearSearchbar', (element) => { ).clear(); }); -Cypress.Commands.add('writeSearchbar', (value) => { +Cypress.Commands.add('typeSearchbar', (value) => { cy.get('#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input').type( value );