diff --git a/.travis.yml b/.travis.yml index cd001503dc..2b9c01e399 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js node_js: - 0.12 before_install: - - export CHROME_BIN=/usr/bin/google-chrome + - export CHROME_BIN=chromium-browser - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start notifications: @@ -25,8 +25,3 @@ cache: - node_modules addons: firefox: latest - apt: - sources: - - google-chrome - packages: - - google-chrome-stable diff --git a/test/karma.conf.js b/test/karma.conf.js index 08f3c7f02f..a4ec7de0c1 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -107,7 +107,7 @@ module.exports = function(config) { 'ie8_bs' ]; } else { - settings.browsers = ['chrome_travis', 'Firefox']; + settings.browsers = ['Firefox']; } } @@ -116,11 +116,6 @@ module.exports = function(config) { function getCustomLaunchers(){ return { - chrome_travis: { - base: 'Chrome', - flags: ['--no-sandbox'] - }, - chrome_bs: { base: 'BrowserStack', browser: 'chrome',