From 40a2d0e3bdec2c780985b7dac1f3a71e8cd9a9da Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Tue, 1 Nov 2016 14:49:44 -0400 Subject: [PATCH 1/3] Update karma-detect-browsers and depend on karma-edge-launcher --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index aa27bbc960..22d9a84728 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,8 @@ "jshint": "^2.9.4", "karma": "^1.3.0", "karma-chrome-launcher": "^2.0.0", - "karma-detect-browsers": "^2.2.2", + "karma-detect-browsers": "^2.2.3", + "karma-edge-launcher": "^0.1.1", "karma-firefox-launcher": "^1.0.0", "karma-ie-launcher": "^1.0.0", "karma-jasmine": "^1.0.2", From f831f5de06b73135563e86aeed19bfea72a176b1 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Tue, 1 Nov 2016 15:18:25 -0400 Subject: [PATCH 2/3] Remove IE from the list of browsers to test --- karma.conf.js | 2 ++ package.json | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index c19b4065cd..5689327761 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -22,6 +22,8 @@ module.exports = function(config) { enabled: true, usePhantomJS: false, postDetection(browsers){ + var ieIndex = browsers.indexOf('IE'); + if (ieIndex !== -1) browsers.splice(ieIndex, 1); return browsers; } }, diff --git a/package.json b/package.json index 22d9a84728..ae41a2f4e0 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "karma-detect-browsers": "^2.2.3", "karma-edge-launcher": "^0.1.1", "karma-firefox-launcher": "^1.0.0", - "karma-ie-launcher": "^1.0.0", "karma-jasmine": "^1.0.2", "karma-mocha": "^1.3.0", "karma-mocha-reporter": "^2.2.0", From 3f70f11ec88b5f7fa9912d2436f48491ce29ed2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20C=C3=A1ceres?= Date: Mon, 21 Nov 2016 18:52:34 +1100 Subject: [PATCH 3/3] style: use filter method instead. --- karma.conf.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 5689327761..992eb4fcd5 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -22,9 +22,9 @@ module.exports = function(config) { enabled: true, usePhantomJS: false, postDetection(browsers){ - var ieIndex = browsers.indexOf('IE'); - if (ieIndex !== -1) browsers.splice(ieIndex, 1); - return browsers; + return browsers + // Remove IE + .filter(browser => browser !== 'IE'); } },