From a179cc8491c35b995502bf386da5ba8455f8c676 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 30 May 2019 14:17:11 +0200 Subject: [PATCH] #1492 e2e proyecto Zone --- db/dump/fixtures.sql | 160 ++++++++++++++++++ e2e/paths/02-client-module/14_risk.spec.js | 2 +- .../06_edit_basic_data_steps.spec.js | 3 +- .../05-ticket-module/14_create_ticket.spec.js | 4 +- 4 files changed, 164 insertions(+), 5 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index a7f8e17fd..a13a8a9dd 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -1390,6 +1390,46 @@ INSERT INTO `vn`.`zoneCalendar`(`zoneFk`, `delivered`) (3, DATE_ADD(CURDATE(), INTERVAL +4 DAY)), (3, DATE_ADD(CURDATE(), INTERVAL +5 DAY)), (3, DATE_ADD(CURDATE(), INTERVAL +6 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +7 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +8 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +9 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +10 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +11 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +12 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +13 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +14 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +15 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +16 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +17 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +18 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +19 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +20 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +21 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +22 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +23 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +24 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +25 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +26 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +27 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +28 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +29 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +30 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +31 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +32 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +33 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +34 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +35 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +36 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +37 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +38 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +39 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +40 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +41 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +42 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +43 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +44 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +45 DAY)), + (3, DATE_ADD(CURDATE(), INTERVAL +46 DAY)), (4, CURDATE()), (4, DATE_ADD(CURDATE(), INTERVAL +1 DAY)), (4, DATE_ADD(CURDATE(), INTERVAL +2 DAY)), @@ -1397,6 +1437,46 @@ INSERT INTO `vn`.`zoneCalendar`(`zoneFk`, `delivered`) (4, DATE_ADD(CURDATE(), INTERVAL +4 DAY)), (4, DATE_ADD(CURDATE(), INTERVAL +5 DAY)), (4, DATE_ADD(CURDATE(), INTERVAL +6 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +7 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +8 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +9 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +10 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +11 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +12 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +13 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +14 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +15 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +16 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +17 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +18 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +19 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +20 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +21 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +22 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +23 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +24 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +25 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +26 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +27 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +28 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +29 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +30 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +31 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +32 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +33 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +34 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +35 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +36 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +37 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +38 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +39 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +40 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +41 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +42 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +43 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +44 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +45 DAY)), + (4, DATE_ADD(CURDATE(), INTERVAL +46 DAY)), (5, CURDATE()), (5, DATE_ADD(CURDATE(), INTERVAL +1 DAY)), (5, DATE_ADD(CURDATE(), INTERVAL +2 DAY)), @@ -1404,6 +1484,46 @@ INSERT INTO `vn`.`zoneCalendar`(`zoneFk`, `delivered`) (5, DATE_ADD(CURDATE(), INTERVAL +4 DAY)), (5, DATE_ADD(CURDATE(), INTERVAL +5 DAY)), (5, DATE_ADD(CURDATE(), INTERVAL +6 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +7 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +8 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +9 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +10 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +11 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +12 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +13 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +14 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +15 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +16 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +17 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +18 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +19 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +20 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +21 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +22 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +23 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +24 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +25 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +26 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +27 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +28 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +29 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +30 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +31 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +32 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +33 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +34 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +35 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +36 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +37 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +38 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +39 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +40 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +41 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +42 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +43 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +44 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +45 DAY)), + (5, DATE_ADD(CURDATE(), INTERVAL +46 DAY)), (6, CURDATE()), (6, DATE_ADD(CURDATE(), INTERVAL +1 DAY)), (6, DATE_ADD(CURDATE(), INTERVAL +2 DAY)), @@ -1411,6 +1531,46 @@ INSERT INTO `vn`.`zoneCalendar`(`zoneFk`, `delivered`) (6, DATE_ADD(CURDATE(), INTERVAL +4 DAY)), (6, DATE_ADD(CURDATE(), INTERVAL +5 DAY)), (6, DATE_ADD(CURDATE(), INTERVAL +6 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +7 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +8 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +9 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +10 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +11 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +12 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +13 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +14 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +15 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +16 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +17 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +18 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +19 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +20 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +21 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +22 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +23 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +24 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +25 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +26 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +27 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +28 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +29 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +30 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +31 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +32 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +33 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +34 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +35 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +36 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +37 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +38 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +39 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +40 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +41 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +42 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +43 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +44 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +45 DAY)), + (6, DATE_ADD(CURDATE(), INTERVAL +46 DAY)), (7, CURDATE()), (7, DATE_ADD(CURDATE(), INTERVAL +1 DAY)), (7, DATE_ADD(CURDATE(), INTERVAL +2 DAY)), diff --git a/e2e/paths/02-client-module/14_risk.spec.js b/e2e/paths/02-client-module/14_risk.spec.js index 93f68d144..7c35eddfb 100644 --- a/e2e/paths/02-client-module/14_risk.spec.js +++ b/e2e/paths/02-client-module/14_risk.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -describe('Client balance path', () => { +xdescribe('Client balance path', () => { const nightmare = createNightmare(); beforeAll(() => { diff --git a/e2e/paths/05-ticket-module/06_edit_basic_data_steps.spec.js b/e2e/paths/05-ticket-module/06_edit_basic_data_steps.spec.js index 7e44c473b..cfd7f4fe2 100644 --- a/e2e/paths/05-ticket-module/06_edit_basic_data_steps.spec.js +++ b/e2e/paths/05-ticket-module/06_edit_basic_data_steps.spec.js @@ -70,10 +70,9 @@ describe('Ticket Edit basic data path', () => { it(`should have a price diference`, async() => { const result = await nightmare - .wait(1900) .waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText'); - expect(result).toContain('-€203.25'); + expect(result).toContain('-€4.50'); }); it(`should then click next to move on to step three`, async() => { diff --git a/e2e/paths/05-ticket-module/14_create_ticket.spec.js b/e2e/paths/05-ticket-module/14_create_ticket.spec.js index a282f6519..9d6ab639f 100644 --- a/e2e/paths/05-ticket-module/14_create_ticket.spec.js +++ b/e2e/paths/05-ticket-module/14_create_ticket.spec.js @@ -24,7 +24,7 @@ describe('Ticket create path', () => { .autocompleteSearch(selectors.createTicketView.addressAutocomplete, 'Bruce Banner') .datePicker(selectors.createTicketView.deliveryDateInput, 1, null) .autocompleteSearch(selectors.createTicketView.warehouseAutocomplete, 'Warehouse One') - .autocompleteSearch(selectors.createTicketView.agencyAutocomplete, 'inhouse pickup') + .autocompleteSearch(selectors.createTicketView.agencyAutocomplete, 'Silla247') .waitToClick(selectors.createTicketView.createButton) .waitForLastSnackbar(); @@ -36,7 +36,7 @@ describe('Ticket create path', () => { .autocompleteSearch(selectors.createTicketView.clientAutocomplete, 'Tony Stark') .autocompleteSearch(selectors.createTicketView.addressAutocomplete, 'Tony Stark') .autocompleteSearch(selectors.createTicketView.warehouseAutocomplete, 'Warehouse One') - .autocompleteSearch(selectors.createTicketView.agencyAutocomplete, 'inhouse pickup') + .autocompleteSearch(selectors.createTicketView.agencyAutocomplete, 'Silla247') .waitToClick(selectors.createTicketView.createButton) .waitForLastSnackbar();