Skip to content

Commit

Permalink
Merge pull request react-bootstrap#636 from react-bootstrap/revert-63…
Browse files Browse the repository at this point in the history
…5-revert-630-TravisChrome

We again "Use Chrome on TravisCI instead of PhantomJS.""
  • Loading branch information
AlexKVal committed May 10, 2015
2 parents 7bd0b74 + 44635df commit af92f05
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ notifications:
on_success: always
on_failure: always
on_start: false
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
9 changes: 8 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,14 @@ module.exports = function (config) {

autoWatch: true,

browsers: [ isCI ? 'PhantomJS' : 'Chrome' ],
browsers: [ isCI ? 'ChromeTravisCI' : 'Chrome' ],

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

captureTimeout: 60000,
browserNoActivityTimeout: 45000,
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"karma-firefox-launcher": "~0.1.3",
"karma-mocha": "~0.1.1",
"karma-mocha-reporter": "^1.0.2",
"karma-phantomjs-launcher": "~0.1.1",
"karma-sinon": "^1.0.3",
"karma-sourcemap-loader": "^0.3.4",
"karma-webpack": "^1.5.0",
Expand Down

0 comments on commit af92f05

Please sign in to comment.