test: disable windows/firefox testing, add chrome+experimental web

Polymer · Oct 4, 2013 · 25c0f99 · 25c0f99
1 parent cde2d60
commit 25c0f99
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/test/karma-common.conf.js b/test/karma-common.conf.js
@@ -1,13 +1,13 @@
 exports.mixin_common_opts = function(karma, opts) {
-	var browsers = ['Chrome', 'Firefox'];
+	var browsers;
 	var os = require('os').type();
 	if (os === 'Darwin') {
-		browsers.push('ChromeCanary');
-		browsers.push('Safari');
-		// browsers.push('iOS');
+    browsers = ['Chrome', 'ChromeCanary', 'Firefox', 'Safari'];
 	} else if (os === 'Windows_NT') {
-		browsers.push('IE');
-	}
+    browsers = ['Chrome', 'IE'];
+	} else {
+    browsers = ['Chrome', 'Firefox'];
+  }
 	var all_opts = {
     // list of files to exclude
     exclude: [],
@@ -42,6 +42,11 @@ exports.mixin_common_opts = function(karma, opts) {
 
     // Custom launchers via BrowserStack.
     customLaunchers: {
+      ChromeCanaryExperimental: {
+        base: 'ChromeCanary',
+        name: 'ChromeCanaryExperimental',
+        flags: ['--enable-experimental-web-platform-features']
+      },
       bs_iphone5: {
         base: 'BrowserStack',
         device: 'iPhone 5',