Travis CI should also run tests on chrome

diff --git a/.travis.yml b/.travis.yml
index 62e5de6a1872c6856a79ca06c2dc573906ab2285..5397abf984c6529182041fa545c63b39d5abaf4c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ node_js:
   - "0.10"
 
 before_install:
+  - "export CHROME_BIN=chromium-browser"
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 

diff --git a/karma.conf.ci.js b/karma.conf.ci.js
index 826b655755f8f51271cdcc2d61ca97ccc50f49a4..d6ee47bf2c9085333fe45f95daecae23689a394e 100644 (file)
--- a/karma.conf.ci.js
+++ b/karma.conf.ci.js
@@ -1,7 +1,19 @@
 module.exports = function(config) {
-       config.set({
+       var configuration = {
                browsers: ['Firefox'],
+               customLaunchers: {
+                       Chrome_travis_ci: {
+                               base: 'Chrome',
+                               flags: ['--no-sandbox']
+                       }
+               },
                frameworks: ['jasmine'],
                reporters: ['progress', 'html'],
-       });
+       };
+
+       if (process.env.TRAVIS) {
+               configuration.browsers.push('Chrome_travis_ci');
+       }
+
+       config.set(configuration);
 };
\ No newline at end of file