From e377562d991410d6ba38a09f150e458375333f36 Mon Sep 17 00:00:00 2001 From: Bernat Date: Fri, 13 Apr 2018 08:11:40 +0200 Subject: [PATCH] update fixtures with inserts in company and refactor e2e --- e2e/paths/client-module/11_mandate.spec.js | 2 +- e2e/paths/client-module/13_invoices.spec.js | 2 +- services/db/04-fixtures.sql | 32 +++++++++++++-------- services/db/changes/1.0.3/04-company.sql | 15 ++++++++++ 4 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 services/db/changes/1.0.3/04-company.sql diff --git a/e2e/paths/client-module/11_mandate.spec.js b/e2e/paths/client-module/11_mandate.spec.js index 0959d95ba1..ada1d04730 100644 --- a/e2e/paths/client-module/11_mandate.spec.js +++ b/e2e/paths/client-module/11_mandate.spec.js @@ -52,7 +52,7 @@ describe('Client', () => { .getInnerText(selectors.clientMandate.firstMandateText) .then(value => { expect(value).toContain('1'); - expect(value).toContain('WAY'); + expect(value).toContain('VNL'); expect(value).toContain('CORE'); }); }); diff --git a/e2e/paths/client-module/13_invoices.spec.js b/e2e/paths/client-module/13_invoices.spec.js index ab386140bb..9f65222a70 100644 --- a/e2e/paths/client-module/13_invoices.spec.js +++ b/e2e/paths/client-module/13_invoices.spec.js @@ -51,7 +51,7 @@ describe('Client', () => { .wait(selectors.clientInvoices.firstInvoiceText) .getInnerText(selectors.clientInvoices.firstInvoiceText) .then(value => { - expect(value).toContain('V1800001'); + expect(value).toContain('V2800001'); expect(value).toContain('350.50'); }); }); diff --git a/services/db/04-fixtures.sql b/services/db/04-fixtures.sql index 8203dbe8fc..79e668dde0 100644 --- a/services/db/04-fixtures.sql +++ b/services/db/04-fixtures.sql @@ -266,22 +266,30 @@ INSERT INTO `vn2008`.`empresa_grupo`(`empresa_grupo_id`, `grupo`) VALUES (1, 'Wayne Industries'); -INSERT INTO `vn2008`.`empresa`(`id`, `abbreviation`, `registro`, `gerente_id`, `alta`, `baja`, `logo`, `oficial`, `cyc`, `rgb`, `mail`, `cuno`, `ODBC_DATE`, `Id_Cliente`, `digito_factura`, `Id_Proveedores_account`, `morosidad`, `empresa_grupo`) +/* INSERT INTO `vn2008`.`empresa`(`id`, `abbreviation`, `gerente_id`, `digito_factura`, `Id_Proveedores_account`) VALUES - (442, 'WAY', 'Wayne Industries, Inc. operates as a warehouse for steel products.', '20', '1989-11-19', NULL, NULL, '1', '1', '00FF00', 'BruceWayne@verdnatura.es', NULL, '1989-08-11 12:31:22', '110', '1', NULL, '1', '1'); + (442, 'WAY', '20', '1', NULL); */ + + INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`) + VALUES + ( 69, 'CCs', NULL, 30, NULL, 1), + (442, 'VNL', NULL, 30, 2, 2), + ( 567, 'VNH', NULL, 30, NULL, 3), + ( 791, 'FTH', NULL, 30, NULL, 4), + ( 1381, 'ORN', NULL, 30, NULL,5); INSERT INTO `vn`.`ticket`(`id`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `clientFk`,`nickname`, `addressFk`) VALUES - (1, 1, 1, NULL, CURDATE(), 101, 'Batman', 101), - (2, 1, 1, NULL, CURDATE(), 101, 'Spider-Man', 102), - (3, 2, 2, NULL, CURDATE(), 102, 'Super-Man', 103), - (4, 2, 2, NULL, CURDATE(), 102, 'Iron-Man', 104), - (5, 3, 3, NULL, CURDATE(), 103, 'Magneto', 105), - (6, 3, 3, NULL, CURDATE(), 103, 'Legion', 106), - (7, 4, 4, NULL, CURDATE(), 104, 'Ant-Man', 107), - (8, 4, 4, NULL, CURDATE(), 104, 'Professor X', 108), - (9, 5, 5, NULL, CURDATE(), 105, 'Hulk', 109), - (10, 6, 5, NULL, CURDATE(), 105, 'Jessica Jones', 110); + (1, 1, 1, NULL, CURDATE(), 101, 'Batman', 101), + (2, 1, 1, NULL, CURDATE(), 101, 'Spider-Man', 102), + (3, 2, 2, NULL, CURDATE(), 102, 'Super-Man', 103), + (4, 2, 2, NULL, CURDATE(), 102, 'Iron-Man', 104), + (5, 3, 3, NULL, CURDATE(), 103, 'Magneto', 105), + (6, 3, 3, NULL, CURDATE(), 103, 'Legion', 106), + (7, 4, 4, NULL, CURDATE(), 104, 'Ant-Man', 107), + (8, 4, 4, NULL, CURDATE(), 104, 'Professor X', 108), + (9, 5, 5, NULL, CURDATE(), 105, 'Hulk', 109), + (10, 6, 5, NULL, CURDATE(), 105, 'Jessica Jones', 110); INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`) VALUES diff --git a/services/db/changes/1.0.3/04-company.sql b/services/db/changes/1.0.3/04-company.sql new file mode 100644 index 0000000000..6116b3c63d --- /dev/null +++ b/services/db/changes/1.0.3/04-company.sql @@ -0,0 +1,15 @@ +USE `vn`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `vn`.`company` AS + SELECT + `e`.`id` AS `id`, + `e`.`abbreviation` AS `code`, + `e`.`Id_Proveedores_account` AS `supplierAccountFk`, + `e`.`gerente_id` AS `workerManagerFk`, + `e`.`digito_factura` AS `sage200Company`, + `e`.`CodigoEmpresa` AS `companyCode` + FROM + `vn2008`.`empresa` `e`;