Merge branch 'master' into add_datadir

developit · Sep 5, 2019 · 18d708c · 18d708c
2 parents 2be075f + c8eb11e
commit 18d708c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "karmatic",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Zero-config automatic (headless) browser testing. Powered by Karma, Webpack & Jasmine.",
   "main": "dist/index.js",
   "module": "dist/index.m.js",
@@ -54,7 +54,7 @@
     "karma-sauce-launcher": "^2.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.32",
-    "karma-webpack": "2.0.7",
+    "karma-webpack": "^2.0.13",
     "puppeteer": "^1.0.0",
     "sade": "^1.3.1",
     "script-loader": "^0.7.2"

diff --git a/src/configure.js b/src/configure.js
@@ -51,8 +51,8 @@ export default function configure(options) {
 	let browsers;
 	if (options.browsers) {
 		browsers = options.browsers.map(browser => {
-			if (/^chrome$/i.test(browser)) {
-				return 'Chrome';
+			if (/^chrome([ :-]?headless)?$/i.test(browser)) {
+				return `KarmaticChrome${/headless/i.test(browser)?'Headless':''}`;
 			}
 			if (/^firefox$/i.test(browser)) {
 				PLUGINS.push('karma-firefox-launcher');
@@ -67,7 +67,7 @@ export default function configure(options) {
 				const name = parts.join('_');
 				launchers[name] = {
 					base: 'SauceLabs',
-					browserName: parts[1].replace(/^ie$/gi, 'Internet Explorer'),
+					browserName: parts[1].replace(/^(msie|ie|internet ?explorer)$/i, 'Internet Explorer').replace(/^(ms|microsoft|)edge$/i, 'MicrosoftEdge'),
 					version: parts[2] || undefined,
 					platform: parts[3] ? parts[3].replace(/^win(dows)?[ -]+/gi, 'Windows ').replace(/^(macos|mac ?os ?x|os ?x)[ -]+/gi, 'OS X ') : undefined
 				};

diff --git a/src/lib/babel-loader.js b/src/lib/babel-loader.js
@@ -10,7 +10,7 @@ export default function babelLoader(options) {
 						browsers: [
 							'last 2 Chrome versions',
 							'last 2 Firefox versions',
-							(options.downlevel || options.browsers && String(options.browsers).match(/(\bie(\b|\d)|internet.explorer)/gi)) && 'ie>=9'
+							(options.downlevel || options.browsers && String(options.browsers).match(/(\b|ms|microsoft)(ie|internet.explorer|edge)/gi)) && 'ie>=9'
 						].filter(Boolean)
 					},
 					corejs: 2,