Merge pull request #51 from skrustev/master

Configure Travis to run Chrome for testing.

Author: mpavlinov

.travis.yml

@@ -1,4 +1,8 @@
 language: node_js
-after_success: npm run test-single && npm run protractor
 node_js:
-  - "5"
+  - "5"
+script: npm run test-single
+before_install:
+  - export CHROME_BIN=chromium-browser
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start

test/karma.conf.js

@@ -1,5 +1,5 @@
 module.exports = function(config){
-	config.set({
+	var cfg = {
 
 		basePath : '../',
 
@@ -21,8 +21,6 @@ module.exports = function(config){
 
 		frameworks: ['jasmine'],
 
-		browsers : ['Chrome'],
-
 		plugins : [ 'karma-chrome-launcher', 'karma-firefox-launcher', 'karma-jasmine', 'karma-junit-reporter' ],
 
 		reporters: ['junit'],
@@ -31,7 +29,21 @@ module.exports = function(config){
 			outputDir: './test_out',
 			outputFile: 'unit.xml',
 			suite: 'unit'
-		}
+		},
+		
+		browsers : ['Chrome'],
+		
+		customLaunchers: {
+            Chrome_travis_ci: {
+                base: 'Chrome',
+                flags: ['--no-sandbox']
+            }
+        }
+	};
+	
+	if (process.env.TRAVIS) {
+		cfg.browsers = ['Chrome_travis_ci'];
+    }
 
-	});
+    config.set(cfg);
 };