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

Merge branch 'dev' into 6397-emailValidation
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Carlos Satorres 2024-01-30 10:48:06 +00:00
parent 94cc3ad80e acf47468c0
commit edfb90813a
25 changed files with 60 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -101,6 +101,7 @@ pipeline {
}
stage('Database') {
when { anyOf {
branch 'dev'
branch 'test'
branch 'master'
}}

37
back/tests.js
View File

@ -1,9 +1,10 @@
/* eslint-disable no-console */
const path = require('path');
const Myt = require('@verdnatura/myt/myt');
const Run = require('@verdnatura/myt/myt-run');
let dataSources = require('../loopback/server/datasources.json');
let myt;
let server;
process.on('warning', warning => {
console.log(warning.name);
@ -11,25 +12,33 @@ process.on('warning', warning => {
console.log(warning.stack);
});
process.on('SIGUSR2', async() => {
if (myt) await myt.deinit();
});
process.on('SIGUSR2', rmServer);
process.on('exit', rmServer);
process.on('exit', async function() {
if (myt) await myt.deinit();
});
async function rmServer() {
if (!server) return;
await server.rm();
server = null;
}
async function test() {
console.log('Building and running DB container.');
const isCI = process.argv[2] === 'ci';
myt = new Myt();
const myt = new Myt();
await myt.init({
workspace: path.join(__dirname, '..'),
random: true,
ci: isCI,
tmpfs: process.platform == 'linux',
network: isCI ? 'jenkins' : null
});
const {dbConfig} = await myt.run(Run);
server = await myt.run(Run);
await myt.deinit();
const {dbConfig} = server;
console.log('Initializing backend.');
dataSources = JSON.parse(JSON.stringify(dataSources));
Object.assign(dataSources.vn, {
@ -46,6 +55,8 @@ async function test() {
// FIXME: Workaround to wait for loopback to be ready
await app.models.Application.status();
console.log('Running tests.');
const Jasmine = require('jasmine');
const jasmine = new Jasmine();
@ -81,9 +92,13 @@ async function test() {
});
await jasmine.execute();
console.log('Stopping.');
if (app) await app.disconnect();
if (myt) await myt.deinit();
console.log('App disconnected & container removed');
await rmServer();
console.log('Tests ended.\n');
}
test();

7
db/dump/fixtures.before.sql
View File

@ -6,9 +6,10 @@
*/
SET foreign_key_checks = 0;
-- CREATE ROLE 'salix';
-- GRANT 'salix' TO 'root'@'%';
-- SET DEFAULT ROLE 'salix' FOR 'root'@'%';
DROP ROLE 'salix';
CREATE ROLE 'salix';
GRANT 'salix' TO 'root'@'%';
SET DEFAULT ROLE 'salix' FOR 'root'@'%';
CREATE SCHEMA IF NOT EXISTS `vn2008`;
CREATE SCHEMA IF NOT EXISTS `tmp`;

1
db/versions/10849-chocolateCymbidium/00-roleLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE account.roleLog DROP FOREIGN KEY roleLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/01-userLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE account.userLog DROP FOREIGN KEY userLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/02-entryLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.entryLog DROP FOREIGN KEY entryLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/03-clientLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.clientLog DROP FOREIGN KEY clientLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/04-itemLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.itemLog DROP FOREIGN KEY itemLogItemFk;

1
db/versions/10849-chocolateCymbidium/05-shelvingLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.shelvingLog DROP FOREIGN KEY shelvingLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/06-workerLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.workerLog DROP FOREIGN KEY workerFk;

1
db/versions/10849-chocolateCymbidium/07-deviceProductionLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.deviceProductionLog DROP FOREIGN KEY deviceProductionOriginFk;

1
db/versions/10849-chocolateCymbidium/08-zoneLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.zoneLog DROP FOREIGN KEY zoneLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/09-rateLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.rateLog DROP FOREIGN KEY rateOriginFk;

1
db/versions/10849-chocolateCymbidium/10-ticketLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.ticketLog DROP FOREIGN KEY ticketLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/11-userLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.userLog DROP FOREIGN KEY userLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/12-routeLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.routeLog DROP FOREIGN KEY routeLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/13-claimLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.claimLog DROP FOREIGN KEY claimOriginFk;

1
db/versions/10849-chocolateCymbidium/14-supplierLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.supplierLog DROP FOREIGN KEY supplierLog_supplierFk;

1
db/versions/10849-chocolateCymbidium/15-invoiceInLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.invoiceInLog DROP FOREIGN KEY invoiceInLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/16-travelLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.travelLog DROP FOREIGN KEY travelLog_ibfk_1;

1
db/versions/10849-chocolateCymbidium/17-packingSiteDeviceLog.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.packingSiteDeviceLog DROP FOREIGN KEY packingSiteDeviceLog_ibfk_1;

2
e2e/paths/05-ticket/02_expeditions_and_log.spec.js
View File

@ -27,6 +27,6 @@ describe('Ticket expeditions and log path', () => {
const result = await page
.countElement(selectors.ticketExpedition.expeditionRow);
expect(result).toEqual(4);
expect(result).toEqual(6);
});
});

4
e2e/paths/13-supplier/02_basic_data.spec.js
View File

@ -41,10 +41,10 @@ describe('Supplier basic data path', () => {
expect(result).toEqual('Plants Nick SL');
});
it('should check the isSerious checkbox is now unchecked', async() => {
it('should check the isSerious checkbox is now checked', async() => {
const result = await page.checkboxState(selectors.supplierBasicData.isSerious);
expect(result).toBe('unchecked');
expect(result).toBe('checked');
});
it('should check the isActive checkbox is now unchecked', async() => {

14
package-lock.json generated
View File

@ -54,7 +54,7 @@
"@babel/plugin-syntax-dynamic-import": "^7.7.4",
"@babel/preset-env": "^7.11.0",
"@babel/register": "^7.7.7",
"@verdnatura/myt": "^1.6.0",
"@verdnatura/myt": "^1.6.3",
"angular-mocks": "^1.7.9",
"babel-jest": "^26.0.1",
"babel-loader": "^8.2.4",
@ -3375,9 +3375,9 @@
}
},
"node_modules/@verdnatura/myt": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.6.0.tgz",
"integrity": "sha512-bQWWMTkvX4wQzojp//XmTRLFGTBuVJ+pwNZxSoIl4LjsidCq5FId48qpkFG9E/CBi3gaf7AkbYDD+A8pv1WMUQ==",
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.6.3.tgz",
"integrity": "sha512-VRoTB5sEPL8a7VaX9l2afpaPNT6pBa+If1tP9tpaJ4enFQbNITlApcC0GK6XYmWMkJQjl2lgdN4/u0UCiNb2MQ==",
"dev": true,
"dependencies": {
"@sqltools/formatter": "^1.2.5",
@ -30604,9 +30604,9 @@
}
},
"@verdnatura/myt": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.6.0.tgz",
"integrity": "sha512-bQWWMTkvX4wQzojp//XmTRLFGTBuVJ+pwNZxSoIl4LjsidCq5FId48qpkFG9E/CBi3gaf7AkbYDD+A8pv1WMUQ==",
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.6.3.tgz",
"integrity": "sha512-VRoTB5sEPL8a7VaX9l2afpaPNT6pBa+If1tP9tpaJ4enFQbNITlApcC0GK6XYmWMkJQjl2lgdN4/u0UCiNb2MQ==",
"dev": true,
"requires": {
"@sqltools/formatter": "^1.2.5",

2
package.json
View File

@ -57,7 +57,7 @@
"@babel/plugin-syntax-dynamic-import": "^7.7.4",
"@babel/preset-env": "^7.11.0",
"@babel/register": "^7.7.7",
"@verdnatura/myt": "^1.6.0",
"@verdnatura/myt": "^1.6.3",
"angular-mocks": "^1.7.9",
"babel-jest": "^26.0.1",
"babel-loader": "^8.2.4",