From 25c0f99bc886441129505927e2b2fe88dddb2ba7 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Thu, 3 Oct 2013 17:47:31 -0700 Subject: [PATCH] test: disable windows/firefox testing, add chrome+experimental web --- test/karma-common.conf.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test/karma-common.conf.js b/test/karma-common.conf.js index 5bf9d837b..605486aa9 100644 --- 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',