From b3ade3c7f5d686e4eea2150745096904ba93bf5e Mon Sep 17 00:00:00 2001 From: Bernat Date: Thu, 27 Jun 2019 13:20:30 +0200 Subject: [PATCH] Tarea #1511 refactr fixtures expedition --- db/dump/fixtures.sql | 16 ++++++++++------ .../02_expeditions_and_log.spec.js | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 00c7496006..f0cfd8c892 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -614,12 +614,16 @@ INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `d INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`) VALUES - (1, 1, 1, 71, CURDATE(), 1, 0, 1, 18), - (2, 1, 1, 71, CURDATE(), 2, 1, 0, 18), - (3, 2, 1, 71, CURDATE(), 3, 2, 0, 18), - (4, 1, 1, 71, CURDATE(), 1, 0, 1, 18), - (5, 1, 1, 71, CURDATE(), 2, 1, 0, 18), - (6, 2, 1, 71, CURDATE(), 3, 2, 0, 18); + (1, 1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 1, 18), + (2, 1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 18), + (3, 1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 2, 3, 1, 18), + (4, 1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 18), + (5, 1, 2, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 1, 18), + (6, 7, 3, 71, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), 1, 1, 1, 18), + (7, 2, 4, 71, DATE_ADD(CURDATE(), INTERVAL -3 MONTH), 1, 1, 1, 18), + (8, 3, 5, 71, DATE_ADD(CURDATE(), INTERVAL -4 MONTH), 1, 1, 1, 18), + (9, 3, 6, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 1, 18), + (10, 7, 7, 71, CURDATE(), 1, 1, 1, 18); INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPackageReturnable`, `created`, `itemFk`, `price`) VALUES diff --git a/e2e/paths/05-ticket-module/02_expeditions_and_log.spec.js b/e2e/paths/05-ticket-module/02_expeditions_and_log.spec.js index 680e651f08..8e4645051c 100644 --- a/e2e/paths/05-ticket-module/02_expeditions_and_log.spec.js +++ b/e2e/paths/05-ticket-module/02_expeditions_and_log.spec.js @@ -21,7 +21,7 @@ describe('Ticket expeditions and log path', () => { .wait(selectors.ticketExpedition.expeditionRow) .countElement(selectors.ticketExpedition.expeditionRow); - expect(result).toEqual(5); + expect(result).toEqual(3); }); it(`should confirm the expedition deleted is shown now in the ticket log`, async() => {