Merge pull request react-bootstrap#636 from react-bootstrap/revert-63…

…5-revert-630-TravisChrome We again "Use Chrome on TravisCI instead of PhantomJS.""
timothykang · May 10, 2015 · af92f05 · af92f05
2 parents 7bd0b74 + 44635df
commit af92f05
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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
diff --git a/karma.conf.js b/karma.conf.js
@@ -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,

diff --git a/package.json b/package.json
@@ -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",