Skip to content

Commit

Permalink
Chrome fixes for travis - karma-runner/karma#1144
Browse files Browse the repository at this point in the history
  • Loading branch information
wdavis122 committed Oct 27, 2015
1 parent 7c62825 commit 4bd3455
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
language: node_js
node_js:
- "0.10"
- "0.12"
- "4.0"
before_script:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
email:
on_failure: change
on_success: never

9 changes: 8 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,14 @@ module.exports = function(config) {

autoWatch: false,

browsers: ['PhantomJS', 'Firefox', 'Chrome'],
browsers: ['PhantomJS', 'Firefox', process.env.TRAVIS ? 'Chrome_travis_ci' : 'Chrome'],

customLaunchers: {
Chrome_travis_ci: {
base: 'Chrome',
flags: ['--no-sandbox']
}
},

singleRun: false,

Expand Down

0 comments on commit 4bd3455

Please sign in to comment.