Skip to content

Commit

Permalink
Fix travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
RadLikeWhoa committed Nov 6, 2014
1 parent 627e37a commit 8770f5a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -2,5 +2,6 @@ language: node_js
node_js:
- "0.10"
before_script:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
17 changes: 15 additions & 2 deletions karma.conf.js
@@ -1,7 +1,7 @@
// Karma configuration

module.exports = function (config) {
config.set({
var configuration = {

// base path, that will be used to resolve files and exclude
basePath: '',
Expand Down Expand Up @@ -41,6 +41,13 @@ module.exports = function (config) {
// - IE (only Windows)
browsers: [ 'Firefox', 'Chrome' ],

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

// If browser does not capture in Given timeout [ms], kill it
captureTimeout: 20000,

Expand All @@ -51,5 +58,11 @@ module.exports = function (config) {
// report which specs are slower than 500ms
// CLI --report-slower-than 500
reportSlowerThan: 500
})
}

if (process.env.TRAVIS) {
configuration.browsers = [ 'Chrome_travis_ci' ]
}

config.set(configuration)
}

0 comments on commit 8770f5a

Please sign in to comment.