Skip to content

O
origin-web-common
Unverified Commit be7b0058 by Jessica Forrester Committed by GitHub
Options

Merge pull request #281 from TheRealJon/travis-browser-fix 

Switch karma browser to Firefox for Travis
parents 518e296c a8bb2b5a
Showing with 1 additions and 3 deletions
.travis.yml
...@@ -5,8 +5,6 @@ cache: ...@@ -5,8 +5,6 @@ cache:
directories: directories:
- node_modules - node_modules
- bower_components - bower_components
addons:
chrome: stable
before_script: before_script:
- export DISPLAY=:99.0 - export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start - sh -e /etc/init.d/xvfb start
......
test/karma.conf.js
...@@ -77,7 +77,7 @@ module.exports = function(config) { ...@@ -77,7 +77,7 @@ module.exports = function(config) {
// - PhantomJS // - PhantomJS
// - IE (only Windows) // - IE (only Windows)
// CLI --browsers Chrome,Firefox,Safari // CLI --browsers Chrome,Firefox,Safari
browsers: [process.env.TRAVIS ? 'Chrome' : 'Chrome'], browsers: [process.env.TRAVIS ? 'Firefox' : 'Chrome'],
// If browser does not capture in given timeout [ms], kill it // If browser does not capture in given timeout [ms], kill it
// CLI --capture-timeout 5000 // CLI --capture-timeout 5000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment