diff --git a/.travis.yml b/.travis.yml index 6b69c225d4..bb8ffc0302 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,3 @@ notifications: on_success: always on_failure: always on_start: false -before_install: - - export CHROME_BIN=chromium-browser - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start diff --git a/karma.conf.js b/karma.conf.js index 7fe1710b1b..5789610e3b 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -43,14 +43,7 @@ module.exports = function (config) { autoWatch: true, - browsers: [ isCI ? 'ChromeTravisCI' : 'Chrome' ], - - customLaunchers: { - ChromeTravisCI: { - base: 'Chrome', - flags: ['--no-sandbox'] - } - }, + browsers: [ isCI ? 'PhantomJS' : 'Chrome' ], captureTimeout: 60000, browserNoActivityTimeout: 45000, diff --git a/package.json b/package.json index 71762e501c..e0c545a22f 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "karma-firefox-launcher": "~0.1.3", "karma-mocha": "~0.1.1", "karma-mocha-reporter": "^1.0.2", + "karma-phantomjs-launcher": "~0.1.1", "karma-sinon": "^1.0.3", "karma-sourcemap-loader": "^0.3.4", "karma-webpack": "^1.5.0",