File tree Expand file tree Collapse file tree 4 files changed +21
-11
lines changed Expand file tree Collapse file tree 4 files changed +21
-11
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ module.exports = function(config) {
3838
3939 plugins: [
4040 ' karma-chrome-launcher' ,
41- ' karma-edge-launcher' ,
41+ ' @chiragrupani/ karma-chromium -edge-launcher' ,
4242 ' karma-firefox-launcher' ,
4343 ' karma-ie-launcher' ,
4444 ' karma-safari-launcher' ,
@@ -103,7 +103,7 @@ module.exports = function(config) {
103103
104104 plugins: [
105105 ' karma-chrome-launcher' ,
106- ' karma-edge-launcher' ,
106+ ' @chiragrupani/ karma-chromium -edge-launcher' ,
107107 ' karma-firefox-launcher' ,
108108 ' karma-ie-launcher' ,
109109 ' karma-safari-launcher' ,
Original file line number Diff line number Diff line change 1- var CMD ;
1+ var linux , darwin , win32 ;
22
33try {
4- CMD = require . resolve ( 'edge-launcher/dist/x86/MicrosoftEdgeLauncher.exe' ) ;
5- } catch ( e ) {
6- CMD = '' ;
4+ var ChromiumEdge = require ( '@chiragrupani/karma-chromium-edge-launcher' ) [ 'launcher:Edge' ] [ 1 ] . prototype . DEFAULT_CMD ;
5+ } catch ( ignore ) { }
6+
7+ if ( ChromiumEdge ) {
8+ linux = ChromiumEdge . linux ;
9+ darwin = ChromiumEdge . darwin ;
10+ win32 = ChromiumEdge . win32 ;
11+ } else {
12+ try {
13+ win32 = require . resolve ( 'edge-launcher/dist/x86/MicrosoftEdgeLauncher.exe' ) ;
14+ } catch ( ignore ) { }
715}
816
917module . exports = {
1018 name : 'Edge' ,
1119 DEFAULT_CMD : {
12- win32 : [ CMD ]
20+ linux : [ linux || '' ] ,
21+ darwin : [ darwin || '' ] ,
22+ win32 : [ win32 || '' ]
1323 } ,
1424 ENV_CMD : 'EDGE_BIN'
1525} ;
Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ module.exports = function (config) {
6161 plugins : [
6262 'karma-jasmine' ,
6363 'karma-chrome-launcher' ,
64- 'karma-edge-launcher' ,
64+ '@chiragrupani/ karma-chromium -edge-launcher' ,
6565 'karma-firefox-launcher' ,
6666 'karma-ie-launcher' ,
6767 'karma-safari-launcher' ,
Original file line number Diff line number Diff line change 11{
2- "name" : " karma-detect-browsers" ,
2+ "name" : " @aleen42/ karma-detect-browsers" ,
33 "description" : " Karma runner plugin for detecting all browsers installed on the current system." ,
4- "version" : " 2.3.3 " ,
4+ "version" : " 2.3.4-beta.0 " ,
55 "homepage" : " https://github.com/litixsoft/karma-detect-browsers" ,
66 "author" : {
77 "name" : " Litixsoft GmbH" ,
8181 "jasmine-core" : " ^3.1.0" ,
8282 "karma" : " ^2.0.0" ,
8383 "karma-chrome-launcher" : " *" ,
84- "karma-edge-launcher" : " * " ,
84+ "@chiragrupani/ karma-chromium- edge-launcher" : " ^2.4.1 " ,
8585 "karma-firefox-launcher" : " *" ,
8686 "karma-ie-launcher" : " *" ,
8787 "karma-jasmine" : " ^1.1.0" ,
You can’t perform that action at this time.
0 commit comments