From ee3ebc51f1866efd0fc5b7db8facb3250c1bfc29 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 25 Feb 2025 15:27:01 +0100 Subject: [PATCH 1/8] test: refs #8621 add e2e tests for cmrList --- .../integration/route/cmr/cmrList.spec.js | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 test/cypress/integration/route/cmr/cmrList.spec.js diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js new file mode 100644 index 000000000..fc437f218 --- /dev/null +++ b/test/cypress/integration/route/cmr/cmrList.spec.js @@ -0,0 +1,87 @@ +describe('Cmr list', () => { + const getLinkSelector = (colField) => + `tr:first-child > [data-col-field="${colField}"] > .no-padding > .link`; + + const selectors = { + ticket: getLinkSelector('ticketFk'), + client: getLinkSelector('clientFk'), + lastRowSelectCheckBox: + '.q-virtual-scroll__content > tr:last-child > :nth-child(1) > .q-checkbox', + downloadBtn: '#subToolbar > .q-btn', + viewCmr: 'tableAction-0', + summaryPopupBtn: '.header > :nth-child(2) > .q-btn__content > .q-icon', + summaryPopupHeader: '.summaryHeader > :nth-child(2)', + summaryHeader: '.summaryHeader', + descriptorId: '.q-item > .q-item__label', + descriptorTitle: '.q-item__label--header > .title > span', + summaryGoToSummaryBtn: '.header > .q-icon', + descriptorGoToSummaryBtn: '.descriptor > .header > a[href] > .q-btn', + }; + + const data = { + ticket: '2', + client: 'Bruce Wayne', + }; + + beforeEach(() => { + cy.viewport(1920, 1080); + cy.login('developer'); + cy.visit('/#/route/cmr'); + cy.typeSearchbar('{enter}'); + }); + + it('Should download selected cmr', () => { + const downloadsFolder = Cypress.config('downloadsFolder'); + cy.get(selectors.lastRowSelectCheckBox).click(); + cy.get(selectors.downloadBtn).click(); + cy.wait(3000); + + const fileName = 'cmrs.zip'; + cy.readFile(`${downloadsFolder}/${fileName}`).should('exist'); + }); + + it('Should open selected cmr pdf', () => { + cy.window().then((win) => { + cy.stub(win, 'open').as('windowOpen'); + }); + cy.get(selectors.lastRowSelectCheckBox).click(); + cy.dataCy(selectors.viewCmr).last().click(); + cy.get('@windowOpen').should('be.calledWithMatch', '\/api\/Cmrs\/3'); + }); + + describe('Ticket pop-ups', () => { + it('Should redirect to the ticket summary from the ticket descriptor pop-up', () => { + cy.get(selectors.ticket).click(); + cy.get(selectors.descriptorId).should('contain', data.ticket); + cy.get(selectors.descriptorGoToSummaryBtn).click(); + cy.get(selectors.summaryHeader).should('contain', data.client); + }); + + it('Should redirect to the ticket summary from summary pop-up from the ticket descriptor pop-up', () => { + cy.get(selectors.ticket).click(); + cy.get(selectors.descriptorId).should('contain', data.ticket); + cy.get(selectors.summaryPopupBtn).click(); + cy.get(selectors.summaryPopupHeader).should('contain', data.client); + cy.get(selectors.summaryGoToSummaryBtn).click(); + cy.get(selectors.summaryHeader).should('contain', data.client); + }); + }); + + describe('Client pop-ups', () => { + it('Should redirect to the client summary from the client descriptor pop-up', () => { + cy.get(selectors.client).click(); + cy.get(selectors.descriptorTitle).should('contain', data.client); + cy.get(selectors.descriptorGoToSummaryBtn).click(); + cy.get(selectors.summaryHeader).should('contain', data.client); + }); + + it('Should redirect to the client summary from summary pop-up from the client descriptor pop-up', () => { + cy.get(selectors.client).click(); + cy.get(selectors.descriptorTitle).should('contain', data.client); + cy.get(selectors.summaryPopupBtn).click(); + cy.get(selectors.summaryHeader).should('contain', data.client); + cy.get(selectors.summaryGoToSummaryBtn).click(); + cy.get(selectors.summaryHeader).should('contain', data.client); + }); + }); +}); From 083e68c291d97d83fe9f08e1fe028c9db6fd5dd9 Mon Sep 17 00:00:00 2001 From: jtubau Date: Wed, 26 Feb 2025 09:09:19 +0100 Subject: [PATCH 2/8] test: refs #8621 add functionality to remove filters in cmrList e2e tests --- test/cypress/integration/route/cmr/cmrList.spec.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js index fc437f218..6bcbfc842 100644 --- a/test/cypress/integration/route/cmr/cmrList.spec.js +++ b/test/cypress/integration/route/cmr/cmrList.spec.js @@ -16,6 +16,7 @@ describe('Cmr list', () => { descriptorTitle: '.q-item__label--header > .title > span', summaryGoToSummaryBtn: '.header > .q-icon', descriptorGoToSummaryBtn: '.descriptor > .header > a[href] > .q-btn', + removeFilter: '.q-chip__icon--remove', }; const data = { @@ -28,6 +29,7 @@ describe('Cmr list', () => { cy.login('developer'); cy.visit('/#/route/cmr'); cy.typeSearchbar('{enter}'); + cy.get(selectors.removeFilter).click(); }); it('Should download selected cmr', () => { From 15e44174badf8fcd351dfff19747589c579f9b39 Mon Sep 17 00:00:00 2001 From: jtubau Date: Wed, 26 Feb 2025 12:08:40 +0100 Subject: [PATCH 3/8] refactor: refs #8621 update column names in RouteList and add formatting for agency and vehicle fields --- src/pages/Route/RouteList.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue index 9dad8ba22..899b3b8c3 100644 --- a/src/pages/Route/RouteList.vue +++ b/src/pages/Route/RouteList.vue @@ -56,8 +56,9 @@ const columns = computed(() => [ }, { align: 'left', - name: 'agencyName', + name: 'agencyModeFk', label: t('route.Agency'), + format: (row) => row?.agencyName, cardVisible: true, component: 'select', attrs: { @@ -74,8 +75,9 @@ const columns = computed(() => [ }, { align: 'left', - name: 'vehiclePlateNumber', + name: 'vehicleFk', label: t('route.Vehicle'), + format: (row) => row?.vehiclePlateNumber, cardVisible: true, component: 'select', attrs: { @@ -155,6 +157,7 @@ const columns = computed(() => [ - + \ No newline at end of file From 6a0c58631c4e8d997b93f9f7ebaecdfd7bb53ff5 Mon Sep 17 00:00:00 2001 From: jtubau Date: Wed, 12 Mar 2025 12:34:03 +0100 Subject: [PATCH 4/8] fix: refs #8621 test for date input selector --- src/pages/Route/RouteList.vue | 30 +++++++------------ .../route/routeExtendedList.spec.js | 2 +- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue index db52dcf6d..f8234c7db 100644 --- a/src/pages/Route/RouteList.vue +++ b/src/pages/Route/RouteList.vue @@ -39,28 +39,24 @@ const columns = computed(() => [ width: '25px', }, { - name: 'workerFk', - label: t('gloabls.worker'), - component: markRaw(VnSelectWorker), - create: true, - format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef), - columnFilter: false, - width: '100px', - }, - { + align: 'left', name: 'workerFk', label: t('globals.worker'), - visible: false, + component: markRaw(VnSelectWorker), + create: true, cardVisible: true, + format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef), + columnFilter: false, }, { - name: 'agencyName', + align: 'left', + name: 'agencyModeFk', label: t('globals.agency'), - visible: false, + format: (row) => row?.agencyName, cardVisible: true, }, { - label: t('globals.Agency'), + label: t('globals.agency'), name: 'agencyModeFk', component: 'select', attrs: { @@ -78,17 +74,13 @@ const columns = computed(() => [ { align: 'left', name: 'vehicleFk', - label: t('route.Vehicle'), + label: t('globals.vehicle'), format: (row) => row?.vehiclePlateNumber, cardVisible: true, }, - { - name: 'vehiclePlateNumber', - label: t('globals.vehicle'), - }, { name: 'vehicleFk', - label: t('globals.Vehicle'), + label: t('globals.vehicle'), cardVisible: true, component: 'select', attrs: { diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js index 237729107..b46ce3ba2 100644 --- a/test/cypress/integration/route/routeExtendedList.spec.js +++ b/test/cypress/integration/route/routeExtendedList.spec.js @@ -120,7 +120,7 @@ describe('Route extended list', () => { it('Should clone selected route', () => { cy.get(selectors.lastRowSelectCheckBox).click(); cy.get(selectors.cloneBtn).click(); - cy.dataCy('route.Starting date_inputDate').type('10-05-2001'); + cy.dataCy('Starting date_inputDate').type('10-05-2001'); cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click(); cy.validateContent(selectors.date, '05/10/2001'); }); From c50d6d884ec86786ad4831269b76277e348317d6 Mon Sep 17 00:00:00 2001 From: jtubau Date: Thu, 13 Mar 2025 09:02:41 +0100 Subject: [PATCH 5/8] test: refs #8621 add data-cy attributes for summary navigation buttons in CMR list tests --- src/components/ui/VnToSummary.vue | 1 + .../integration/route/cmr/cmrList.spec.js | 77 ++++++++++++++----- 2 files changed, 59 insertions(+), 19 deletions(-) diff --git a/src/components/ui/VnToSummary.vue b/src/components/ui/VnToSummary.vue index 305d65e02..853d26230 100644 --- a/src/components/ui/VnToSummary.vue +++ b/src/components/ui/VnToSummary.vue @@ -26,6 +26,7 @@ const id = props.entityId; :to="{ name: routeName, params: { id: id } }" class="header link" :href="url" + data-cy="goToSummaryBtn" > diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js index 6bcbfc842..5c71132de 100644 --- a/test/cypress/integration/route/cmr/cmrList.spec.js +++ b/test/cypress/integration/route/cmr/cmrList.spec.js @@ -9,13 +9,12 @@ describe('Cmr list', () => { '.q-virtual-scroll__content > tr:last-child > :nth-child(1) > .q-checkbox', downloadBtn: '#subToolbar > .q-btn', viewCmr: 'tableAction-0', - summaryPopupBtn: '.header > :nth-child(2) > .q-btn__content > .q-icon', - summaryPopupHeader: '.summaryHeader > :nth-child(2)', - summaryHeader: '.summaryHeader', - descriptorId: '.q-item > .q-item__label', - descriptorTitle: '.q-item__label--header > .title > span', - summaryGoToSummaryBtn: '.header > .q-icon', - descriptorGoToSummaryBtn: '.descriptor > .header > a[href] > .q-btn', + descriptorOpenSummaryBtn: '.descriptor [data-cy="openSummaryBtn"]', + summaryTitle: '.summaryHeader', + descriptorId: '.descriptor .subtitle', + descriptorTitle: '.descriptor .title', + summaryGoToSummaryBtn: '.summaryHeader [data-cy="goToSummaryBtn"]', + descriptorGoToSummaryBtn: '.descriptor [data-cy="goToSummaryBtn"]', removeFilter: '.q-chip__icon--remove', }; @@ -54,36 +53,76 @@ describe('Cmr list', () => { describe('Ticket pop-ups', () => { it('Should redirect to the ticket summary from the ticket descriptor pop-up', () => { cy.get(selectors.ticket).click(); - cy.get(selectors.descriptorId).should('contain', data.ticket); + cy.get(selectors.descriptorId) + .invoke('text') + .then((text) => { + expect(text).to.include(data.ticket); + }); cy.get(selectors.descriptorGoToSummaryBtn).click(); - cy.get(selectors.summaryHeader).should('contain', data.client); + cy.get(selectors.summaryTitle) + .invoke('text') + .then((text) => { + expect(text).to.include(data.client); + }); }); it('Should redirect to the ticket summary from summary pop-up from the ticket descriptor pop-up', () => { cy.get(selectors.ticket).click(); - cy.get(selectors.descriptorId).should('contain', data.ticket); - cy.get(selectors.summaryPopupBtn).click(); - cy.get(selectors.summaryPopupHeader).should('contain', data.client); + cy.get(selectors.descriptorId) + .invoke('text') + .then((text) => { + expect(text).to.include(data.ticket); + }); + cy.get(selectors.descriptorOpenSummaryBtn).click(); + cy.get(selectors.summaryTitle) + .invoke('text') + .then((text) => { + expect(text).to.include(data.client); + }); cy.get(selectors.summaryGoToSummaryBtn).click(); - cy.get(selectors.summaryHeader).should('contain', data.client); + cy.get(selectors.summaryTitle) + .invoke('text') + .then((text) => { + expect(text).to.include(data.client); + }); }); }); describe('Client pop-ups', () => { it('Should redirect to the client summary from the client descriptor pop-up', () => { cy.get(selectors.client).click(); - cy.get(selectors.descriptorTitle).should('contain', data.client); + cy.get(selectors.descriptorTitle) + .invoke('text') + .then((text) => { + expect(text).to.include(data.client); + }); cy.get(selectors.descriptorGoToSummaryBtn).click(); - cy.get(selectors.summaryHeader).should('contain', data.client); + cy.get(selectors.summaryTitle) + .invoke('text') + .then((text) => { + expect(text).to.include(data.client); + }); }); it('Should redirect to the client summary from summary pop-up from the client descriptor pop-up', () => { cy.get(selectors.client).click(); - cy.get(selectors.descriptorTitle).should('contain', data.client); - cy.get(selectors.summaryPopupBtn).click(); - cy.get(selectors.summaryHeader).should('contain', data.client); + cy.get(selectors.descriptorTitle) + .invoke('text') + .then((text) => { + expect(text).to.include(data.client); + }); + cy.get(selectors.descriptorOpenSummaryBtn).click(); + cy.get(selectors.summaryTitle) + .invoke('text') + .then((text) => { + expect(text).to.include(data.client); + }); cy.get(selectors.summaryGoToSummaryBtn).click(); - cy.get(selectors.summaryHeader).should('contain', data.client); + cy.get(selectors.summaryTitle) + .invoke('text') + .then((text) => { + expect(text).to.include(data.client); + }); }); }); }); From 911097dae46d6ab1e287f9bee3a250d3a7a7659a Mon Sep 17 00:00:00 2001 From: jtubau Date: Fri, 14 Mar 2025 07:25:58 +0100 Subject: [PATCH 6/8] test: refs #8621 remove unnecessary checkbox click in CMR list test --- test/cypress/integration/route/cmr/cmrList.spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js index 5c71132de..8d9299ce7 100644 --- a/test/cypress/integration/route/cmr/cmrList.spec.js +++ b/test/cypress/integration/route/cmr/cmrList.spec.js @@ -45,7 +45,6 @@ describe('Cmr list', () => { cy.window().then((win) => { cy.stub(win, 'open').as('windowOpen'); }); - cy.get(selectors.lastRowSelectCheckBox).click(); cy.dataCy(selectors.viewCmr).last().click(); cy.get('@windowOpen').should('be.calledWithMatch', '\/api\/Cmrs\/3'); }); From 7e74ab58da553e24a46586a6fe86fde41bd71f85 Mon Sep 17 00:00:00 2001 From: jtubau Date: Mon, 17 Mar 2025 12:03:26 +0100 Subject: [PATCH 7/8] fix: refs #8621 intermittent test --- src/pages/Route/Cmr/CmrList.vue | 2 +- .../integration/route/cmr/cmrList.spec.js | 66 +++++-------------- test/cypress/support/commands.js | 8 +++ 3 files changed, 24 insertions(+), 52 deletions(-) diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue index d0683e481..170f73bc0 100644 --- a/src/pages/Route/Cmr/CmrList.vue +++ b/src/pages/Route/Cmr/CmrList.vue @@ -28,7 +28,6 @@ const userParams = { shipped: null, }; - const columns = computed(() => [ { align: 'left', @@ -175,6 +174,7 @@ function downloadPdfs() { :data-key url="Cmrs/filter" :columns="columns" + :order="['shipped DESC', 'cmrFk ASC']" :user-params="userParams" default-mode="table" v-model:selected="selectedRows" diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js index 8d9299ce7..b3561708d 100644 --- a/test/cypress/integration/route/cmr/cmrList.spec.js +++ b/test/cypress/integration/route/cmr/cmrList.spec.js @@ -19,7 +19,7 @@ describe('Cmr list', () => { }; const data = { - ticket: '2', + ticket: '1', client: 'Bruce Wayne', }; @@ -52,76 +52,40 @@ describe('Cmr list', () => { describe('Ticket pop-ups', () => { it('Should redirect to the ticket summary from the ticket descriptor pop-up', () => { cy.get(selectors.ticket).click(); - cy.get(selectors.descriptorId) - .invoke('text') - .then((text) => { - expect(text).to.include(data.ticket); - }); + cy.containContent(selectors.descriptorId, data.ticket); cy.get(selectors.descriptorGoToSummaryBtn).click(); - cy.get(selectors.summaryTitle) - .invoke('text') - .then((text) => { - expect(text).to.include(data.client); - }); + cy.url().should('include', '/ticket/1/summary'); + cy.containContent(selectors.summaryTitle, data.client); }); it('Should redirect to the ticket summary from summary pop-up from the ticket descriptor pop-up', () => { cy.get(selectors.ticket).click(); - cy.get(selectors.descriptorId) - .invoke('text') - .then((text) => { - expect(text).to.include(data.ticket); - }); + cy.containContent(selectors.descriptorId, data.ticket); cy.get(selectors.descriptorOpenSummaryBtn).click(); - cy.get(selectors.summaryTitle) - .invoke('text') - .then((text) => { - expect(text).to.include(data.client); - }); + cy.containContent(selectors.summaryTitle, data.client); cy.get(selectors.summaryGoToSummaryBtn).click(); - cy.get(selectors.summaryTitle) - .invoke('text') - .then((text) => { - expect(text).to.include(data.client); - }); + cy.url().should('include', '/ticket/1/summary'); + cy.containContent(selectors.summaryTitle, data.client); }); }); describe('Client pop-ups', () => { it('Should redirect to the client summary from the client descriptor pop-up', () => { cy.get(selectors.client).click(); - cy.get(selectors.descriptorTitle) - .invoke('text') - .then((text) => { - expect(text).to.include(data.client); - }); + cy.containContent(selectors.descriptorTitle, data.client); cy.get(selectors.descriptorGoToSummaryBtn).click(); - cy.get(selectors.summaryTitle) - .invoke('text') - .then((text) => { - expect(text).to.include(data.client); - }); + cy.url().should('include', '/customer/1101/summary'); + cy.containContent(selectors.summaryTitle, data.client); }); it('Should redirect to the client summary from summary pop-up from the client descriptor pop-up', () => { cy.get(selectors.client).click(); - cy.get(selectors.descriptorTitle) - .invoke('text') - .then((text) => { - expect(text).to.include(data.client); - }); + cy.containContent(selectors.descriptorTitle, data.client); cy.get(selectors.descriptorOpenSummaryBtn).click(); - cy.get(selectors.summaryTitle) - .invoke('text') - .then((text) => { - expect(text).to.include(data.client); - }); + cy.containContent(selectors.summaryTitle, data.client); cy.get(selectors.summaryGoToSummaryBtn).click(); - cy.get(selectors.summaryTitle) - .invoke('text') - .then((text) => { - expect(text).to.include(data.client); - }); + cy.url().should('include', '/customer/1101/summary'); + cy.containContent(selectors.summaryTitle, data.client); }); }); }); diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js index 105d021ad..7d9f76349 100755 --- a/test/cypress/support/commands.js +++ b/test/cypress/support/commands.js @@ -322,6 +322,14 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => { cy.get(selector).should('have.text', expectedValue); }); +Cypress.Commands.add('containContent', (selector, expectedValue) => { + cy.get(selector) + .invoke('text') + .then((text) => { + expect(text).to.include(expectedValue); + }); +}); + Cypress.Commands.add('openActionDescriptor', (opt) => { cy.openActionsDescriptor(); const listItem = '[role="menu"] .q-list .q-item'; From 93b5be7628a8aa334e072ed8b8d7a4d1ed17a18f Mon Sep 17 00:00:00 2001 From: jtubau Date: Mon, 17 Mar 2025 14:09:14 +0100 Subject: [PATCH 8/8] test: refs #8621 ensure elements are visible before interaction in cmrList tests --- .../integration/route/cmr/cmrList.spec.js | 24 +++++++++---------- test/cypress/support/commands.js | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js index b3561708d..d33508e3a 100644 --- a/test/cypress/integration/route/cmr/cmrList.spec.js +++ b/test/cypress/integration/route/cmr/cmrList.spec.js @@ -33,8 +33,8 @@ describe('Cmr list', () => { it('Should download selected cmr', () => { const downloadsFolder = Cypress.config('downloadsFolder'); - cy.get(selectors.lastRowSelectCheckBox).click(); - cy.get(selectors.downloadBtn).click(); + cy.get(selectors.lastRowSelectCheckBox).should('be.visible').click(); + cy.get(selectors.downloadBtn).should('be.visible').click(); cy.wait(3000); const fileName = 'cmrs.zip'; @@ -51,19 +51,19 @@ describe('Cmr list', () => { describe('Ticket pop-ups', () => { it('Should redirect to the ticket summary from the ticket descriptor pop-up', () => { - cy.get(selectors.ticket).click(); + cy.get(selectors.ticket).should('be.visible').click(); cy.containContent(selectors.descriptorId, data.ticket); - cy.get(selectors.descriptorGoToSummaryBtn).click(); + cy.get(selectors.descriptorGoToSummaryBtn).should('be.visible').click(); cy.url().should('include', '/ticket/1/summary'); cy.containContent(selectors.summaryTitle, data.client); }); it('Should redirect to the ticket summary from summary pop-up from the ticket descriptor pop-up', () => { - cy.get(selectors.ticket).click(); + cy.get(selectors.ticket).should('be.visible').click(); cy.containContent(selectors.descriptorId, data.ticket); - cy.get(selectors.descriptorOpenSummaryBtn).click(); + cy.get(selectors.descriptorOpenSummaryBtn).should('be.visible').click(); cy.containContent(selectors.summaryTitle, data.client); - cy.get(selectors.summaryGoToSummaryBtn).click(); + cy.get(selectors.summaryGoToSummaryBtn).should('be.visible').click(); cy.url().should('include', '/ticket/1/summary'); cy.containContent(selectors.summaryTitle, data.client); }); @@ -71,19 +71,19 @@ describe('Cmr list', () => { describe('Client pop-ups', () => { it('Should redirect to the client summary from the client descriptor pop-up', () => { - cy.get(selectors.client).click(); + cy.get(selectors.client).should('be.visible').click(); cy.containContent(selectors.descriptorTitle, data.client); - cy.get(selectors.descriptorGoToSummaryBtn).click(); + cy.get(selectors.descriptorGoToSummaryBtn).should('be.visible').click(); cy.url().should('include', '/customer/1101/summary'); cy.containContent(selectors.summaryTitle, data.client); }); it('Should redirect to the client summary from summary pop-up from the client descriptor pop-up', () => { - cy.get(selectors.client).click(); + cy.get(selectors.client).should('be.visible').click(); cy.containContent(selectors.descriptorTitle, data.client); - cy.get(selectors.descriptorOpenSummaryBtn).click(); + cy.get(selectors.descriptorOpenSummaryBtn).should('be.visible').click(); cy.containContent(selectors.summaryTitle, data.client); - cy.get(selectors.summaryGoToSummaryBtn).click(); + cy.get(selectors.summaryGoToSummaryBtn).should('be.visible').click(); cy.url().should('include', '/customer/1101/summary'); cy.containContent(selectors.summaryTitle, data.client); }); diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js index 90e7e08df..c8fccbd5d 100755 --- a/test/cypress/support/commands.js +++ b/test/cypress/support/commands.js @@ -324,6 +324,7 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => { Cypress.Commands.add('containContent', (selector, expectedValue) => { cy.get(selector) + .should('be.visible') .invoke('text') .then((text) => { expect(text).to.include(expectedValue);