Cleaning up karma.conf.js for travis

micjamking · Mar 6, 2016 · 3911ac7 · 3911ac7
1 parent 31eb5c8
commit 3911ac7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,4 +3,7 @@ node_js:
   - "node"
   - "iojs"
 before_script:
+  - export CHROME_BIN=chromium-browser
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
   - npm install -g grunt-cli
diff --git a/karma.conf.js b/karma.conf.js
@@ -2,7 +2,8 @@
 // Generated on Tue Feb 09 2016 15:58:33 GMT-0700 (MST)
 
 module.exports = function(config) {
-  config.set({
+
+  var configuration = {
 
     // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: '.',
@@ -73,6 +74,20 @@ module.exports = function(config) {
 
     // Concurrency level
     // how many browser should be started simultaneous
-    concurrency: Infinity
-  })
+    concurrency: Infinity,
+
+    // Custom Launchers
+    customLaunchers: {
+        Chrome_travis_ci: {
+            base: 'Chrome',
+            flags: ['--no-sandbox']
+        }
+    }
+  };
+
+  if (process.env.TRAVIS) {
+    configuration.browsers = ['Chrome_travis_ci'];
+  }
+
+  config.set(configuration);
 }