From 679ac764b115045f139da48bfaae0876f145b5d3 Mon Sep 17 00:00:00 2001
From: Evert Timberg <evert.timberg@gmail.com>
Date: Sat, 7 Nov 2015 09:34:07 -0500
Subject: [PATCH] Travis CI should also run tests on chrome

---
 .travis.yml      |  1 +
 karma.conf.ci.js | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62e5de6a1..5397abf98 100644
--- 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 826b65575..d6ee47bf2 100644
--- 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