added chrome tests

wheresrhys · May 4, 2015 · 3e3a045 · 3e3a045
1 parent d61661a
commit 3e3a045
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,9 @@ script: npm test
 node_js:
 - '0.12'
 before_install:
+- export CHROME_BIN=chromium-browser
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
 - npm install -g bower
 - bower install
 before_deploy:

diff --git a/karma.conf.js b/karma.conf.js
@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = function(karma) {
-	karma.set({
+	var configuration = {
 
 		frameworks: [ 'mocha', 'chai', 'browserify'],
 		files: [
@@ -15,6 +15,20 @@ module.exports = function(karma) {
 				transform: ['debowerify'],
 				debug: true
 		},
-		browsers: ['PhantomJS'],
-	});
-};
+		browsers: ['PhantomJS', 'Chrome'],
+		customLaunchers: {
+      Chrome_travis_ci: {
+        base: 'Chrome',
+        flags: ['--no-sandbox']
+      }
+    }
+	};
+
+  if(process.env.TRAVIS){
+    configuration.browsers = ['PhantomJS', 'Chrome_travis_ci'];
+  }
+
+  karma.set(configuration);
+
+};
+
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "karma": "^0.12.31",
     "karma-browserify": "^4.1.2",
     "karma-chai": "^0.1.0",
+    "karma-chrome-launcher": "^0.1.8",
     "karma-mocha": "^0.1.10",
     "karma-phantomjs-launcher": "^0.1.4",
     "mocha": "^2.2.4",