Skip to content

Commit 7bd0b74

Browse files
committed
Merge pull request react-bootstrap#635 from react-bootstrap/revert-630-TravisChrome
Revert "Use Chrome on TravisCI instead of PhantomJS."
2 parents f1b0dc7 + 5fec602 commit 7bd0b74

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,3 @@ 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

karma.conf.js

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

4444
autoWatch: true,
4545

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

5548
captureTimeout: 60000,
5649
browserNoActivityTimeout: 45000,

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
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",
6566
"karma-sinon": "^1.0.3",
6667
"karma-sourcemap-loader": "^0.3.4",
6768
"karma-webpack": "^1.5.0",

0 commit comments

Comments
 (0)