From 413148906339514b7e50aba709449e1d84a2c50c Mon Sep 17 00:00:00 2001 From: Dmitriy Shekhovtsov Date: Wed, 6 Dec 2017 12:19:52 +0200 Subject: [PATCH] chore(ci): tests shall pass! (#3205) --- karma.conf.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 34b68070db..2c5c4b93ad 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -37,6 +37,9 @@ module.exports = function (config) { logLevel: config.LOG_INFO, autoWatch: true, browsers: ['Chrome'], + browserNoActivityTimeout: 20000, + browserDisconnectTolerance: 2, + browserDisconnectTimeout: 5000, singleRun: false, customLaunchers: { Chrome_travis_ci: { @@ -54,7 +57,7 @@ module.exports = function (config) { }; if (process.env.TRAVIS) { - configuration.browsers = ['Firefox']; + configuration.browsers = ['Chrome_travis_ci']; } if (process.env.SAUCE) { @@ -70,8 +73,6 @@ module.exports = function (config) { singleRun: false, concurrency: 2, captureTimeout: 60000, - browserNoActivityTimeout: 20000, - browserDisconnectTimeout: 5000, sauceLabs: { testName: 'ngx-bootstrap', build: process.env.TRAVIS_JOB_NUMBER,