From 5aae57256628924b6a97bea0cf38d65fc7595173 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Tue, 31 Jul 2018 13:49:54 +0200 Subject: [PATCH] renamed spec files plus fixtures update for ticket basicdata #462 e2e --- client/item/src/diary/index.spec.js | 2 +- .../src/sale/{sale.spec.js => index.spec.js} | 4 +-- services/db/install/dump/fixtures.sql | 26 ++++++++++--------- 3 files changed, 17 insertions(+), 15 deletions(-) rename client/ticket/src/sale/{sale.spec.js => index.spec.js} (98%) diff --git a/client/item/src/diary/index.spec.js b/client/item/src/diary/index.spec.js index ecece4f86..559fe3ea4 100644 --- a/client/item/src/diary/index.spec.js +++ b/client/item/src/diary/index.spec.js @@ -1,6 +1,6 @@ import './index.js'; -fdescribe('Item', () => { +describe('Item', () => { describe('Component vnItemDiary', () => { let $componentController; let $scope; diff --git a/client/ticket/src/sale/sale.spec.js b/client/ticket/src/sale/index.spec.js similarity index 98% rename from client/ticket/src/sale/sale.spec.js rename to client/ticket/src/sale/index.spec.js index 06b822b39..c18c8a7e5 100644 --- a/client/ticket/src/sale/sale.spec.js +++ b/client/ticket/src/sale/index.spec.js @@ -159,8 +159,8 @@ describe('Ticket', () => { }); describe('onStateChange()', () => { - it('should perform a post and then call a function', () => { - $httpBackend.expectPOST(`/ticket/api/TicketTrackings/changeState`).respond(); + it('should perform a POST', () => { + $httpBackend.expectPOST(`/ticket/api/TicketTrackings`).respond(); controller.card = {reload: () => {}}; controller.onStateChange(3); $httpBackend.flush(); diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index d069447ef..0d750de58 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -85,11 +85,11 @@ UPDATE `vn`.`agencyMode` SET `id` = 6 WHERE `name` = 'Walking'; UPDATE `vn`.`agencyMode` SET `id` = 7 WHERE `name` = 'Silla247'; UPDATE `vn`.`agencyMode` SET `id` = 8 WHERE `name` = 'Silla247Expensive'; -UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 1; -UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 2; +UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 1; +UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 2; UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 2 WHERE `id` = 3; -UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 4; -UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 5; +UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 4; +UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 5; UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 2 WHERE `id` = 6; UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 7; UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 8; @@ -712,17 +712,19 @@ INSERT INTO `vn`.`agencyProvince`(`provinceFk`, `agencyFk`, `zone`, `warehouseFk ( 1, 1, 1, 2, 1), ( 1, 1, 1, 3, 1), ( 1, 2, 2, 2, 2), - ( 1, 2, 2, 3, 2); + ( 1, 2, 2, 3, 2), + ( 1, 7, 2, 1, 1), + ( 1, 8, 2, 1, 1); INSERT INTO `vn`.`agencyModeZone`(`agencyModeFk`, `zone`, `price`, `itemFk`, `warehouseFk`, `minimCost`, `inflation`) VALUES - ( 1, 1, 10, 1, 1, 1, 1.00), - ( 1, 1, 20, 2, 1, 1, 1.00), - ( 2, 1, 10, 1, 1, 1, 1.00), - ( 2, 1, 20, 2, 1, 1, 2.00), - ( 2, 2, 10, 1, 1, 0, 2.00), - ( 7, 2, 10, 1, 1, 0, 2.00), - ( 8, 2, 10, 1, 1, 0, 2.00); + ( 1, 1, 10, 6, 1, 1, 1.00), + ( 1, 1, 20, 6, 1, 1, 1.00), + ( 2, 1, 10, 6, 1, 1, 1.00), + ( 2, 1, 20, 6, 1, 1, 2.00), + ( 2, 2, 10, 6, 1, 0, 2.00), + ( 7, 2, 50, 6, 1, 0, 1.00), + ( 8, 2, 100, 6, 1, 0, 2.00); INSERT INTO `vn`.`agencyWeekDayBonus`(`id`, `warehouseFk`, `agencyFk`, `weekDay`, `zone`, `bonus`) VALUES