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

Merge branch 'dev' into test

This commit is contained in:
Vicente Falco 2018-01-08 11:00:02 +01:00
parent 604e02ca58 0843b824f2
commit 8c976e49da
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Jenkinsfile vendored
View File

@ -43,14 +43,18 @@ node
stage ("Stopping/Removing Docker") stage ("Stopping/Removing Docker")
{ {
env.TAG = env.BUILD_NUMBER - 1; steps{
sh "docker-compose down --rmi 'all'" env.TAG = env.BUILD_NUMBER - 1;
sh "docker-compose down --rmi 'all'"
}
} }
stage ("Generar dockers") stage ("Generar dockers")
{ {
env.TAG = env.BUILD_NUMBER + 1; steps{
sh "docker-compose up -d --build" env.TAG = env.BUILD_NUMBER + 1;
sh "docker-compose up -d --build"
}
} }
} }
} }

4
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;
describe('Add credit path', () => { fdescribe('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
@ -104,7 +104,7 @@ describe('Add credit path', () => {
.wait(selectors.globalItems.snackbarIsActive) .wait(selectors.globalItems.snackbarIsActive)
.getInnerText(selectors.globalItems.snackbarIsActive) .getInnerText(selectors.globalItems.snackbarIsActive)
.then(result => { .then(result => {
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved');
done(); done();
}) })
.catch(catchErrors(done)); .catch(catchErrors(done));

6
gulpfile.js
View File

@ -159,11 +159,11 @@ gulp.task('e2e', callback => {
gulp.task('runDockerLogs', callback => { gulp.task('runDockerLogs', callback => {
let timer = 0; let timer = 0;
console.log('Waiting for MySQL init process...');
let waitForLocaldb = setInterval(() => { let waitForLocaldb = setInterval(() => {
if (timer < 15000) { if (timer < 15000) {
timer += 2000; timer += 1000;
exec('docker logs --tail 4 dblocal', (err, stdout, stderr) => { exec('docker logs --tail 4 dblocal', (err, stdout, stderr) => {
console.log('Waiting for MySQL init process...');
if (stdout.includes('MySQL init process done. Ready for start up.')) { if (stdout.includes('MySQL init process done. Ready for start up.')) {
console.log('MySQL init process done.'); console.log('MySQL init process done.');
clearInterval(waitForLocaldb); clearInterval(waitForLocaldb);
@ -174,7 +174,7 @@ gulp.task('runDockerLogs', callback => {
console.log('MySQL connection not established whithin 15 secs!'); console.log('MySQL connection not established whithin 15 secs!');
clearInterval(waitForLocaldb); clearInterval(waitForLocaldb);
} }
}, 2000); }, 1000);
}); });
gulp.task('endToEndTests', callback => { gulp.task('endToEndTests', callback => {