Skip to content

Commit af92f05

Browse files
committed
Merge pull request react-bootstrap#636 from react-bootstrap/revert-635-revert-630-TravisChrome
We again "Use Chrome on TravisCI instead of PhantomJS.""
2 parents 7bd0b74 + 44635df commit af92f05

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

Diff for: .travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ notifications:
1111
on_success: always
1212
on_failure: always
1313
on_start: false
14+
before_install:
15+
- export CHROME_BIN=chromium-browser
16+
- export DISPLAY=:99.0
17+
- sh -e /etc/init.d/xvfb start

Diff for: karma.conf.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,14 @@ module.exports = function (config) {
4343

4444
autoWatch: true,
4545

46-
browsers: [ isCI ? 'PhantomJS' : 'Chrome' ],
46+
browsers: [ isCI ? 'ChromeTravisCI' : 'Chrome' ],
47+
48+
customLaunchers: {
49+
ChromeTravisCI: {
50+
base: 'Chrome',
51+
flags: ['--no-sandbox']
52+
}
53+
},
4754

4855
captureTimeout: 60000,
4956
browserNoActivityTimeout: 45000,

Diff for: package.json

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
"karma-firefox-launcher": "~0.1.3",
6363
"karma-mocha": "~0.1.1",
6464
"karma-mocha-reporter": "^1.0.2",
65-
"karma-phantomjs-launcher": "~0.1.1",
6665
"karma-sinon": "^1.0.3",
6766
"karma-sourcemap-loader": "^0.3.4",
6867
"karma-webpack": "^1.5.0",

0 commit comments

Comments
 (0)