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

Merge branch 'dev' of http://git.verdnatura.es/salix into test

This commit is contained in:
Carlos Jimenez 2018-01-08 09:42:36 +01:00
parent 82a1d4fdb7 22d482f1c6
commit 604e02ca58
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/core/src/lib/app.js
View File

@ -12,7 +12,7 @@ export default class App {
this.$rootScope = $rootScope; this.$rootScope = $rootScope;
} }
show(message) { show(message) {
if (this.snackbar) this.snackbar.show({message: message, timeout: 400}); if (this.snackbar) this.snackbar.show({message: message});
} }
showMessage(message) { showMessage(message) {
this.show(message); this.show(message);

2
e2e/paths/08_add_credit.spec.js
View File

@ -8,7 +8,7 @@ const moduleAccessViewHashURL = '#!/';
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
fdescribe('Add credit path', () => { describe('Add credit path', () => {
describe('warm up', () => { describe('warm up', () => {
it('should warm up login and fixtures', done => { it('should warm up login and fixtures', done => {
nightmare nightmare

17
gulpfile.js
View File

@ -147,7 +147,7 @@ gulp.task('watch', function() {
gulp.watch(localeFiles, ['locales']); gulp.watch(localeFiles, ['locales']);
}); });
// Test environment // Server side unit tests
gulp.task('test', callback => { gulp.task('test', callback => {
return require('./services_tests').start(); return require('./services_tests').start();
}); });
@ -161,22 +161,25 @@ gulp.task('runDockerLogs', callback => {
let timer = 0; let timer = 0;
let waitForLocaldb = setInterval(() => { let waitForLocaldb = setInterval(() => {
if (timer < 15000) { if (timer < 15000) {
timer += 1000; timer += 2000;
exec('docker logs dblocal', (err, stdout, stderr) => { exec('docker logs --tail 4 dblocal', (err, stdout, stderr) => {
if (stdout.includes('starting as process 1')) { console.log('Waiting for MySQL init process...');
console.log(stdout); if (stdout.includes('MySQL init process done. Ready for start up.')) {
console.log('MySQL init process done.');
clearInterval(waitForLocaldb); clearInterval(waitForLocaldb);
callback(err); callback(err);
} }
}); });
} else { } else {
console.log('MySQL connection not established whithin 15 secs!');
clearInterval(waitForLocaldb); clearInterval(waitForLocaldb);
} }
}, 1000); }, 2000);
}); });
gulp.task('endToEndTests', callback => { gulp.task('endToEndTests', callback => {
exec('node e2e_tests', err => { exec('npm run e2e', (err, stdout, stderr) => {
console.log(stdout);
callback(err); callback(err);
}); });
}); });

3
services/loopback/package.json
View File

@ -2,8 +2,7 @@
"name": "vn-loopback", "name": "vn-loopback",
"version": "1.0.0", "version": "1.0.0",
"scripts": { "scripts": {
"start": "node .", "start": "node ."
"posttest": "npm run lint && nsp check"
}, },
"dependencies": { "dependencies": {
"compression": "^1.0.3", "compression": "^1.0.3",