verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

fix test and fixtures for itemTags updated

This commit is contained in:
Bernat 2018-08-03 08:29:38 +02:00
parent 901398cfa7
commit c177bc7ab9
7 changed files with 94 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/ticket/src/sale/index.spec.js
View File

@ -1,6 +1,6 @@
import './index.js';
fdescribe('Ticket', () => {
describe('Ticket', () => {
describe('Component vnTicketSale', () => {
let $componentController;
let controller;

5
e2e/helpers/selectors.js
View File

@ -216,9 +216,12 @@ export default {
fourthRelevancyInput: `vn-horizontal:nth-child(5) > vn-textfield[label="Relevancy"] input`,
fifthTagSelect: `vn-item-tags vn-horizontal:nth-child(6) > vn-autocomplete[field="itemTag.tagFk"] input`,
fifthTagDisabled: `vn-item-tags vn-horizontal:nth-child(6) > vn-autocomplete > div > div > input`,
fifthTagSelectOptionFive: `vn-item-tags vn-horizontal:nth-child(6) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(5)`,
fifthValueInput: `vn-item-tags vn-horizontal:nth-child(6) > vn-textfield[label="Value"] input`,
fifthRelevancyInput: `vn-horizontal:nth-child(6) > vn-textfield[label="Relevancy"] input`,
seventhTagSelectOptionFive: `vn-item-tags vn-horizontal:nth-child(8) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(5)`,
seventhTagSelect: `vn-item-tags vn-horizontal:nth-child(8) > vn-autocomplete[field="itemTag.tagFk"] input`,
seventhValueInput: `vn-item-tags vn-horizontal:nth-child(8) > vn-textfield[label="Value"] input`,
seventhRelevancyInput: `vn-horizontal:nth-child(8) > vn-textfield[label="Relevancy"] input`,
addItemTagButton: `vn-icon-button[icon="add_circle"]`,
submitItemTagsButton: `${components.vnSubmit}`
},

42
e2e/paths/item-module/04_create_item_tags.spec.js
View File

@ -48,11 +48,11 @@ describe('Item', () => {
return nightmare
.waitToClick(selectors.itemTags.firstRemoveTagButton)
.waitToClick(selectors.itemTags.addItemTagButton)
.waitToClick(selectors.itemTags.fifthTagSelect)
.waitToClick(selectors.itemTags.fifthTagSelectOptionFive)
.type(selectors.itemTags.fifthValueInput, 'Thanos')
.clearInput(selectors.itemTags.fifthRelevancyInput)
.type(selectors.itemTags.fifthRelevancyInput, '1')
.waitToClick(selectors.itemTags.seventhTagSelect)
.waitToClick(selectors.itemTags.seventhTagSelectOptionFive)
.type(selectors.itemTags.seventhValueInput, '50')
.clearInput(selectors.itemTags.seventhRelevancyInput)
.type(selectors.itemTags.seventhRelevancyInput, '1')
.click(selectors.itemTags.submitItemTagsButton)
.waitForSnackbar()
.then(result => {
@ -65,19 +65,19 @@ describe('Item', () => {
.click(selectors.itemBasicData.basicDataButton)
.wait(selectors.itemBasicData.nameInput)
.click(selectors.itemTags.tagsButton)
.waitForTextInInput(selectors.itemTags.firstTagDisabled, 'Owner')
.waitForTextInInput(selectors.itemTags.firstTagDisabled, 'Diámetro')
.getInputValue(selectors.itemTags.firstTagDisabled)
.then(result => {
expect(result).toEqual('Owner');
expect(result).toEqual('Diámetro');
});
});
it(`should confirm the first value is the expected one`, () => {
return nightmare
.waitForTextInInput(selectors.itemTags.firstValueInput, 'Thanos')
.waitForTextInInput(selectors.itemTags.firstValueInput, '50')
.getInputValue(selectors.itemTags.firstValueInput)
.then(result => {
expect(result).toEqual('Thanos');
expect(result).toEqual('50');
});
});
@ -92,19 +92,19 @@ describe('Item', () => {
it(`should confirm the second select is the expected one`, () => {
return nightmare
.waitForTextInInput(selectors.itemTags.secondTagDisabled, 'Location')
.waitForTextInInput(selectors.itemTags.secondTagDisabled, 'Variedad')
.getInputValue(selectors.itemTags.secondTagDisabled)
.then(result => {
expect(result).toEqual('Location');
expect(result).toEqual('Variedad');
});
});
it(`should confirm the second value is the expected one`, () => {
return nightmare
.waitForTextInInput(selectors.itemTags.secondValueInput, 'Gamoras hideout')
.waitForTextInInput(selectors.itemTags.secondValueInput, 'Gem1')
.getInputValue(selectors.itemTags.secondValueInput)
.then(result => {
expect(result).toEqual('Gamoras hideout');
expect(result).toEqual('Gem1');
});
});
@ -119,19 +119,19 @@ describe('Item', () => {
it(`should confirm the third select is the expected one`, () => {
return nightmare
.waitForTextInInput(selectors.itemTags.thirdTagDisabled, 'Shape')
.waitForTextInInput(selectors.itemTags.thirdTagDisabled, 'Longitud(cm)')
.getInputValue(selectors.itemTags.thirdTagDisabled)
.then(result => {
expect(result).toEqual('Shape');
expect(result).toEqual('Longitud(cm)');
});
});
it(`should confirm the third value is the expected one`, () => {
return nightmare
.waitForTextInInput(selectors.itemTags.thirdValueInput, 'round')
.waitForTextInInput(selectors.itemTags.thirdValueInput, '5')
.getInputValue(selectors.itemTags.thirdValueInput)
.then(result => {
expect(result).toEqual('round');
expect(result).toEqual('5');
});
});
@ -146,19 +146,19 @@ describe('Item', () => {
it(`should confirm the fourth select is the expected one`, () => {
return nightmare
.waitForTextInInput(selectors.itemTags.fourthTagDisabled, 'Power')
.waitForTextInInput(selectors.itemTags.fourthTagDisabled, 'Proveedor')
.getInputValue(selectors.itemTags.fourthTagDisabled)
.then(result => {
expect(result).toEqual('Power');
expect(result).toEqual('Proveedor');
});
});
it(`should confirm the fourth value is the expected one`, () => {
return nightmare
.waitForTextInInput(selectors.itemTags.fourthValueInput, 'Manipulates time')
.waitForTextInInput(selectors.itemTags.fourthValueInput, 'Marvel1')
.getInputValue(selectors.itemTags.fourthValueInput)
.then(result => {
expect(result).toEqual('Manipulates time');
expect(result).toEqual('Marvel1');
});
});

2
services/db/export-data.cmd
View File

@ -4,7 +4,7 @@ mysqldump --defaults-file=connect.ini --no-create-info account role roleRole rol
echo USE `salix`; >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> install/dump/03-dumpedFixtures.sql
echo USE `vn`; >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc tag >> install/dump/03-dumpedFixtures.sql
echo USE `vn2008`; >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos Monedas container iva_group_codigo escritos cl_est cl_con cl_res cl_dev cl_mot cl_sol>> install/dump/03-dumpedFixtures.sql
echo USE `bi`; >> install/dump/03-dumpedFixtures.sql

2
services/db/export-data.sh
View File

@ -5,7 +5,7 @@ mysqldump --defaults-file=connect.ini --no-create-info account role roleRole rol
echo "USE \`salix\`;" >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> install/dump/03-dumpedFixtures.sql
echo "USE \`vn\`;" >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc tag >> install/dump/03-dumpedFixtures.sql
echo "USE \`vn2008\`;" >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos Monedas container iva_group_codigo escritos cl_est cl_con cl_res cl_dev cl_mot cl_sol>> install/dump/03-dumpedFixtures.sql
echo "USE \`bi\`;" >> install/dump/03-dumpedFixtures.sql

26
services/db/install/dump/03-dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

86
services/db/install/dump/fixtures.sql
View File

@ -338,7 +338,7 @@ INSERT INTO `vn`.`invoiceOut`(`id`, `ref`, `serial`, `amount`, `issued`,`clientF
(8 , 4, 4, 4, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 104, 'Professor X', 124, NULL),
(9 , 5, 5, 4, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), DATE_ADD(CURDATE(), INTERVAL -2 MONTH), 105, 'Hulk', 125, NULL),
(10, 6, 5, 5, DATE_ADD(CURDATE(), INTERVAL -3 MONTH), DATE_ADD(CURDATE(), INTERVAL -3 MONTH), 105, 'Jessica Jones', 125, NULL),
(11, 1, 1, 1, CURDATE() , CURDATE() , 101, 'ticket 1', 121, NULL),
(11, 7, 1, 1, CURDATE() , CURDATE() , 101, 'ticket 1', 121, NULL),
(12, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 101, 'ticket 2', 121, NULL),
(13, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL +2 MONTH), DATE_ADD(CURDATE(), INTERVAL +2 MONTH), 101, 'ticket 3', 121, NULL),
(14, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL +3 MONTH), DATE_ADD(CURDATE(), INTERVAL +3 MONTH), 101, 'ticket 4', 121, NULL),
@ -515,8 +515,8 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
( 4, 4, 1 , 'Mark I' , 20 , 9 , 0, 0, 0, CURDATE()),
( 5, 1, 2 , 'Gem of Time', 10 , 23.5, 0, 0, 0, CURDATE()),
( 6, 1, 3 , 'Gem of Time', 15 , 23.5, 0, 0, 0, CURDATE()),
( 7, 1, 11, 'Gem of Mind', 15 , 4.5 , 0, 0, 0, CURDATE()),
( 8, 1, 11, 'Mark I' , 10 , 9 , 0, 0, 0, CURDATE());
( 7, 2, 11, 'Gem of Mind', 15 , 4.5 , 0, 0, 0, CURDATE()),
( 8, 4, 11, 'Mark I' , 10 , 9 , 0, 0, 0, CURDATE());
INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`)
VALUES
@ -561,9 +561,11 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
( 6, 28, 1),
( 7, 28, 1),
( 7, 17, 3.5),
( 7, 15, 3),
( 8, 28, 1),
( 8, 10, 1),
( 8, 39, 5),
( 8, 15, 5),
( 8, 37, 2);
INSERT INTO `vn`.`saleTracking`(`saleFk`, `isChecked`, `created`, `originalQuantity`, `workerFk`, `actionFk`, `id`, `stateFk`)
@ -607,36 +609,43 @@ INSERT INTO `vn`.`itemBotanical`(`itemFk`, `botanical`, `genusFk`, `specieFk`)
( 3, 'Cycas revoluta', 2, NULL),
( 4, 'Polygonum', NULL, NULL);
INSERT INTO `vn`.`tag`(`id`,`name`,`isFree`,`isQuantitatif`,`sourceTable`,`unit`)
VALUES
(1, 'Color', 0, 0, 'ink', null),
(2, 'Power', 0, 0, 'producer', null),
(3, 'Shape', 0, 0, null, null),
(4, 'Location', 1, 0, null, null),
(5, 'Owner', 1, 1, null, null);
INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
VALUES
(1, 1, 1, 'Yellow', 5),
(2, 1, 2, 'Manipulates time', 4),
(3, 1, 3, 'round', 3),
(4, 1, 4, 'Gamoras hideout', 2),
(5, 1, 5, 'Gamora', 1),
(6, 2, 1, 'Red', 5),
(7, 2, 2, 'Manipulates mind', 4),
(8, 2, 3, 'square', 3),
(9, 2, 4, 'unknown location', 2),
(10, 2, 5, 'Thanos', 1),
(11, 3, 1, 'Green', 5),
(12, 3, 2, 'Save the children', 4),
(13, 3, 3, 'human shape', 3),
(14, 3, 4, 'Stark tower', 2),
(15, 3, 5, 'Tony Stark', 1),
(16, 4, 1, 'Blue', 5),
(17, 4, 2, 'Protect the citizen', 4),
(18, 4, 3, 'human shape', 3),
(19, 4, 4, 'Manhattan', 2),
(20, 4, 5, 'Tony Stark', 1);
(1 , 1, 56, 'Object1', 1),
(2 , 1, 58, 'Gem1' , 2),
(3 , 1, 27, '5' , 3),
(4 , 1, 36, 'Marvel1', 4),
(5 , 1, 1 , 'Yellow' , 5),
(6 , 1, 67 , 'A1' , 6),
(7 , 1, 23, '0' , 7),
(8 , 2, 56, 'Object2', 1),
(9 , 2, 58, 'Gem2' , 2),
(10, 2, 27 , '3' , 3),
(11, 2, 36, 'Marvel2', 4),
(12, 2, 1 , 'Red' , 5),
(13, 2, 67, 'A1' , 6),
(14, 2, 23, '0' , 7),
(15, 3, 56, 'Object3', 1),
(16, 3, 58, 'Armor' , 2),
(17, 3, 4, '3' , 3),
(18, 3, 36, 'Stark' , 4),
(19, 3, 1 , 'Green' , 5),
(20, 3, 67, 'EXT' , 6),
(21, 3, 23, '0' , 7),
(22, 4, 56, 'Object3', 1),
(23, 4, 58, 'Armor2' , 2),
(24, 4, 4, '2' , 3),
(25, 4, 36, 'Stark' , 4),
(26, 4, 1 , 'Blue' , 5),
(27, 4, 67, 'EXT' , 6),
(28, 4, 23, '1' , 7),
(29, 5, 56, 'Object5', 1),
(30, 5, 58, 'Weapon' , 2),
(31, 5, 27 , '50' , 3),
(32, 5, 36, 'Thor' , 4),
(33, 5, 1 , 'Grey' , 5),
(34, 5, 67, 'EXT' , 6),
(35, 5, 23, '1' , 7);
INSERT INTO `vn`.`itemTypeTag`(`id`, `itemTypeFk`, `tagFk`, `priority`)
VALUES
@ -719,10 +728,11 @@ INSERT INTO `vn`.`agencyProvince`(`provinceFk`, `agencyFk`, `zone`, `warehouseFk
INSERT INTO `vn`.`agencyModeZone`(`agencyModeFk`, `zone`, `price`, `itemFk`, `warehouseFk`, `minimCost`, `inflation`)
VALUES
( 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),
( 2, 1, 20, 6, 1, 1, 1.00),
( 3, 1, 10, 6, 1, 1, 1.00),
( 4, 1, 20, 6, 1, 1, 2.00),
( 5, 2, 10, 6, 1, 0, 2.00),
( 6, 2, 10, 6, 1, 0, 2.00),
( 7, 2, 50, 6, 1, 0, 1.00),
( 8, 2, 100, 6, 1, 0, 2.00);
@ -744,9 +754,9 @@ INSERT INTO `bi`.`claims_ratio`(`id_Cliente`, `Consumo`, `Reclamaciones`, `Ratio
INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packageFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`,`minPrice`,`producer`,`printedStickers`,`isChecked`,`isIgnored`)
VALUES
(1, 1, 1, 2.5, 5000 , 1, 1, 0.350, 0.050, 0.000, 1, 1, 1, NULL, 1.50, 1.25, 1.30, 2.00, NULL, 0, 1, 0),
(2, 2, 2, 5 , 450, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2, 1.00, 1.30, 2.00, NULL, 0, 1, 0),
(3, 3, 3, 10 , 500, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2.50, 1.00, 2.50, 2.00, NULL, 0, 1, 0),
(4, 4, 4, 20 , 100, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2.50, 1.00, 2.50, 2.00, NULL, 0, 1, 0);
(2, 2, 2, 5 , 450 , 1, 1, 0.500, 0.100, 0.000, 1, 1, 1, NULL, 2, 1.00, 1.30, 2.00, NULL, 0, 1, 0),
(3, 3, 3, 10 , 500 , 1, 1, 1.000, 0.050, 0.000, 1, 1, 1, NULL, 2.50, 1.00, 2.50, 2.00, NULL, 0, 1, 0),
(4, 4, 4, 20 , 100 , 1, 1, 0.700, 0.020, 0.000, 1, 1, 1, NULL, 2.50, 1.00, 2.50, 2.00, NULL, 0, 1, 0);
INSERT INTO `vn2008`.`tblContadores`(`id`,`FechaInventario`)
VALUES