From a6bf61033f5d3e03a2e5e4af5c4d06c63ac87331 Mon Sep 17 00:00:00 2001 From: alexandre Date: Mon, 6 Mar 2023 12:04:16 +0100 Subject: [PATCH] refactor tests --- e2e/paths/05-ticket/21_future.spec.js | 83 +++++++++----------------- e2e/paths/05-ticket/22_advance.spec.js | 30 +++------- 2 files changed, 35 insertions(+), 78 deletions(-) diff --git a/e2e/paths/05-ticket/21_future.spec.js b/e2e/paths/05-ticket/21_future.spec.js index 34ae3d688..2b8057247 100644 --- a/e2e/paths/05-ticket/21_future.spec.js +++ b/e2e/paths/05-ticket/21_future.spec.js @@ -4,12 +4,17 @@ import getBrowser from '../../helpers/puppeteer'; describe('Ticket Future path', () => { let browser; let page; + let httpRequest; beforeAll(async() => { browser = await getBrowser(); page = browser.page; await page.loginAndModule('employee', 'ticket'); await page.accessToSection('ticket.future'); + page.on('request', req => { + if (req.url().includes(`Tickets/getTicketsFuture`)) + httpRequest = req.url(); + }); }); afterAll(async() => { @@ -42,114 +47,82 @@ describe('Ticket Future path', () => { it('should search with the required data', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); + + expect(httpRequest).toBeDefined(); }); it('should search with the origin IPT', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.ipt); - await page.clearInput(selectors.ticketFuture.futureIpt); - await page.clearInput(selectors.ticketFuture.state); - await page.clearInput(selectors.ticketFuture.futureState); - await page.autocompleteSearch(selectors.ticketFuture.ipt, 'Horizontal'); await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); + + expect(httpRequest).toContain('ipt=H'); }); it('should search with the destination IPT', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.clearInput(selectors.ticketFuture.ipt); - await page.clearInput(selectors.ticketFuture.futureIpt); - await page.clearInput(selectors.ticketFuture.state); - await page.clearInput(selectors.ticketFuture.futureState); await page.autocompleteSearch(selectors.ticketFuture.futureIpt, 'Horizontal'); await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); + + expect(httpRequest).toContain('futureIpt=H'); }); it('should search with the origin grouped state', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.futureIpt); - await page.clearInput(selectors.ticketFuture.state); - await page.clearInput(selectors.ticketFuture.futureState); await page.autocompleteSearch(selectors.ticketFuture.state, 'Free'); await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 3); + + expect(httpRequest).toContain('state=FREE'); }); it('should search with the destination grouped state', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.ipt); - await page.clearInput(selectors.ticketFuture.futureIpt); await page.clearInput(selectors.ticketFuture.state); - await page.clearInput(selectors.ticketFuture.futureState); await page.autocompleteSearch(selectors.ticketFuture.futureState, 'Free'); await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 0); + + expect(httpRequest).toContain('futureState=FREE'); await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.ipt); - await page.clearInput(selectors.ticketFuture.futureIpt); - await page.clearInput(selectors.ticketFuture.state); await page.clearInput(selectors.ticketFuture.futureState); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); }); it('should search in smart-table with an ID Origin', async() => { await page.waitToClick(selectors.ticketFuture.tableButtonSearch); - await page.write(selectors.ticketFuture.tableId, '13'); + await page.write(selectors.ticketFuture.tableId, '1'); await page.keyboard.press('Enter'); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 2); + expect(httpRequest).toContain('id'); await page.waitToClick(selectors.ticketFuture.tableButtonSearch); - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); - }); - - it('should search in smart-table with an ID Destination', async() => { - await page.waitToClick(selectors.ticketFuture.tableButtonSearch); - await page.write(selectors.ticketFuture.tableFutureId, '12'); - await page.keyboard.press('Enter'); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 5); - - await page.waitToClick(selectors.ticketFuture.tableButtonSearch); - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); - }); - - it('should search in smart-table with an IPT Origin', async() => { - await page.waitToClick(selectors.ticketFuture.tableButtonSearch); - await page.autocompleteSearch(selectors.ticketFuture.tableIpt, 'Vertical'); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 1); - - await page.waitToClick(selectors.ticketFuture.tableButtonSearch); - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); }); it('should search in smart-table with an IPT Destination', async() => { await page.waitToClick(selectors.ticketFuture.tableButtonSearch); - await page.autocompleteSearch(selectors.ticketFuture.tableFutureIpt, 'Vertical'); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 1); + await page.autocompleteSearch(selectors.ticketFuture.tableFutureIpt, 'Horizontal'); + expect(httpRequest).toContain('futureIpt'); + await page.waitToClick(selectors.ticketFuture.tableButtonSearch); + }); + + it('should search in smart-table with an ID Destination', async() => { + await page.waitToClick(selectors.ticketFuture.tableButtonSearch); + await page.write(selectors.ticketFuture.tableFutureId, '1'); + await page.keyboard.press('Enter'); + + expect(httpRequest).toContain('futureId'); await page.waitToClick(selectors.ticketFuture.tableButtonSearch); await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); }); it('should check the three last tickets and move to the future', async() => { diff --git a/e2e/paths/05-ticket/22_advance.spec.js b/e2e/paths/05-ticket/22_advance.spec.js index c92cd7a20..f8442bf12 100644 --- a/e2e/paths/05-ticket/22_advance.spec.js +++ b/e2e/paths/05-ticket/22_advance.spec.js @@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer'; describe('Ticket Advance path', () => { let browser; let page; - const httpRequests = []; + let httpRequest; beforeAll(async() => { browser = await getBrowser(); @@ -13,7 +13,7 @@ describe('Ticket Advance path', () => { await page.accessToSection('ticket.advance'); page.on('request', req => { if (req.url().includes(`Tickets/getTicketsAdvance`)) - httpRequests.push(req.url()); + httpRequest = req.url(); }); }); @@ -49,7 +49,7 @@ describe('Ticket Advance path', () => { await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton); await page.waitToClick(selectors.ticketAdvance.submit); - expect(httpRequests.length).toBeGreaterThan(0); + expect(httpRequest).toBeDefined(); }); it('should search with the origin IPT', async() => { @@ -57,11 +57,7 @@ describe('Ticket Advance path', () => { await page.autocompleteSearch(selectors.ticketAdvance.futureIpt, 'Horizontal'); await page.waitToClick(selectors.ticketAdvance.submit); - const request = httpRequests.find(req => req.includes(('futureIpt=H'))); - - expect(request).toBeDefined(); - - httpRequests.splice(httpRequests.indexOf(request), 1); + expect(httpRequest).toContain('futureIpt=H'); await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton); await page.clearInput(selectors.ticketAdvance.futureIpt); @@ -73,11 +69,7 @@ describe('Ticket Advance path', () => { await page.autocompleteSearch(selectors.ticketAdvance.ipt, 'Horizontal'); await page.waitToClick(selectors.ticketAdvance.submit); - const request = httpRequests.find(req => req.includes(('ipt=H'))); - - expect(request).toBeDefined(); - - httpRequests.splice(httpRequests.indexOf(request), 1); + expect(httpRequest).toContain('ipt=H'); await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton); await page.clearInput(selectors.ticketAdvance.ipt); @@ -88,11 +80,7 @@ describe('Ticket Advance path', () => { await page.waitToClick(selectors.ticketAdvance.tableButtonSearch); await page.autocompleteSearch(selectors.ticketAdvance.tableFutureIpt, 'Vertical'); - const request = httpRequests.find(req => req.includes(('futureIpt'))); - - expect(request).toBeDefined(); - - httpRequests.splice(httpRequests.indexOf(request), 1); + expect(httpRequest).toContain('futureIpt'); await page.waitToClick(selectors.ticketAdvance.tableButtonSearch); await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton); @@ -103,11 +91,7 @@ describe('Ticket Advance path', () => { await page.waitToClick(selectors.ticketAdvance.tableButtonSearch); await page.autocompleteSearch(selectors.ticketAdvance.tableIpt, 'Vertical'); - const request = httpRequests.find(req => req.includes(('ipt'))); - - expect(request).toBeDefined(); - - httpRequests.splice(httpRequests.indexOf(request), 1); + expect(httpRequest).toContain('ipt'); await page.waitToClick(selectors.ticketAdvance.tableButtonSearch); await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton); -- 2.40.1