From 70ba5027c7ea7982f4195339f57daa55dd6ac38f Mon Sep 17 00:00:00 2001 From: Aleen Date: Tue, 9 Mar 2021 16:02:25 +0800 Subject: [PATCH] Detect Chromium Edge with the plugin @chiragrupani/karma-chromium-edge-launcher --- README.md | 4 ++-- browsers/Edge.js | 24 +++++++++++++++++++----- demo/karma.conf.js | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 44c437a..b266a11 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ module.exports = function(config) { plugins: [ 'karma-chrome-launcher', - 'karma-edge-launcher', + '@chiragrupani/karma-chromium-edge-launcher', 'karma-firefox-launcher', 'karma-ie-launcher', 'karma-safari-launcher', @@ -103,7 +103,7 @@ module.exports = function(config) { plugins: [ 'karma-chrome-launcher', - 'karma-edge-launcher', + '@chiragrupani/karma-chromium-edge-launcher', 'karma-firefox-launcher', 'karma-ie-launcher', 'karma-safari-launcher', diff --git a/browsers/Edge.js b/browsers/Edge.js index fe3a57b..2c36f03 100644 --- a/browsers/Edge.js +++ b/browsers/Edge.js @@ -1,15 +1,29 @@ -var CMD; +var linux, darwin, win32; try { - CMD = require.resolve('edge-launcher/dist/x86/MicrosoftEdgeLauncher.exe'); -} catch (e) { - CMD = ''; + var ChromiumEdge = require('@chiragrupani/karma-chromium-edge-launcher')['launcher:Edge'][1].prototype.DEFAULT_CMD; +} catch (ignore) {} + +try { + var ChromiumEdge = require('karma-chromium-edge-launcher')['launcher:Edge'][1].prototype.DEFAULT_CMD; +} catch (ignore) {} + +if (ChromiumEdge) { + linux = ChromiumEdge.linux; + darwin = ChromiumEdge.darwin; + win32 = ChromiumEdge.win32; +} else { + try { + win32 = require.resolve('edge-launcher/dist/x86/MicrosoftEdgeLauncher.exe'); + } catch (ignore) {} } module.exports = { name: 'Edge', DEFAULT_CMD: { - win32: [CMD] + linux: [linux || ''], + darwin: [darwin || ''], + win32: [win32 || ''] }, ENV_CMD: 'EDGE_BIN' }; diff --git a/demo/karma.conf.js b/demo/karma.conf.js index 6888cd9..3dfa7a8 100644 --- a/demo/karma.conf.js +++ b/demo/karma.conf.js @@ -61,7 +61,7 @@ module.exports = function (config) { plugins: [ 'karma-jasmine', 'karma-chrome-launcher', - 'karma-edge-launcher', + '@chiragrupani/karma-chromium-edge-launcher', 'karma-firefox-launcher', 'karma-ie-launcher', 'karma-safari-launcher',