Merge branch 'dev' into test
This commit is contained in:
commit
8c976e49da
|
@ -43,14 +43,18 @@ node
|
|||
|
||||
stage ("Stopping/Removing Docker")
|
||||
{
|
||||
steps{
|
||||
env.TAG = env.BUILD_NUMBER - 1;
|
||||
sh "docker-compose down --rmi 'all'"
|
||||
}
|
||||
}
|
||||
|
||||
stage ("Generar dockers")
|
||||
{
|
||||
steps{
|
||||
env.TAG = env.BUILD_NUMBER + 1;
|
||||
sh "docker-compose up -d --build"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -8,7 +8,7 @@ const moduleAccessViewHashURL = '#!/';
|
|||
|
||||
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
|
||||
|
||||
describe('Add credit path', () => {
|
||||
fdescribe('Add credit path', () => {
|
||||
describe('warm up', () => {
|
||||
it('should warm up login and fixtures', done => {
|
||||
nightmare
|
||||
|
@ -104,7 +104,7 @@ describe('Add credit path', () => {
|
|||
.wait(selectors.globalItems.snackbarIsActive)
|
||||
.getInnerText(selectors.globalItems.snackbarIsActive)
|
||||
.then(result => {
|
||||
expect(result).toEqual('Data saved!');
|
||||
expect(result).toEqual('Data saved');
|
||||
done();
|
||||
})
|
||||
.catch(catchErrors(done));
|
||||
|
|
|
@ -159,11 +159,11 @@ gulp.task('e2e', callback => {
|
|||
|
||||
gulp.task('runDockerLogs', callback => {
|
||||
let timer = 0;
|
||||
console.log('Waiting for MySQL init process...');
|
||||
let waitForLocaldb = setInterval(() => {
|
||||
if (timer < 15000) {
|
||||
timer += 2000;
|
||||
timer += 1000;
|
||||
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.')) {
|
||||
console.log('MySQL init process done.');
|
||||
clearInterval(waitForLocaldb);
|
||||
|
@ -174,7 +174,7 @@ gulp.task('runDockerLogs', callback => {
|
|||
console.log('MySQL connection not established whithin 15 secs!');
|
||||
clearInterval(waitForLocaldb);
|
||||
}
|
||||
}, 2000);
|
||||
}, 1000);
|
||||
});
|
||||
|
||||
gulp.task('endToEndTests', callback => {
|
||||
|
|
Loading…
Reference in New Issue