diff options
| author | dotnetCarpenter <jon.ronnenberg@gmail.com> | 2016-10-05 14:18:42 +0200 |
|---|---|---|
| committer | dotnetCarpenter <jon.ronnenberg@gmail.com> | 2016-10-05 14:18:42 +0200 |
| commit | e03ef5004963aab03f1b46451a10e833041f9560 (patch) | |
| tree | e372fa1e9c380895a0416ece8ac3c0f2cb7e9ffe | |
| parent | 5276ff3948c60f4edd2c70c572ad2ce2bbd4b838 (diff) | |
| download | svg.js-e03ef5004963aab03f1b46451a10e833041f9560.tar.gz svg.js-e03ef5004963aab03f1b46451a10e833041f9560.zip | |
configure chromium to be chrome on travis
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | karma.conf.js | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 5179db0..4dc3db7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,8 @@ node_js: script: npm test sudo: true before_install: - - sudo apt-get -qq update - - sudo apt-get install -y chrome + - export CHROME_BIN=chromium-browser - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start + # - sudo apt-get -qq update + # - sudo apt-get install -y chrome diff --git a/karma.conf.js b/karma.conf.js index facc3d6..e2ecc37 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -65,7 +65,15 @@ module.exports = function(config) { // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['Chromium'], + browsers: ['Chrome'], + + + customLaunchers: { + Chrome_travis_ci: { + base: 'Chrome', + flags: ['--no-sandbox'] + } + }, // Continuous Integration mode @@ -76,4 +84,8 @@ module.exports = function(config) { // how many browser should be started simultaneous concurrency: Infinity }) + + if(process.env.TRAVIS){ + config.browsers = ['Chrome_travis_ci']; + } } |