Skip to content

Commit c01cc9d

Browse files
ChiragRupaniChiragRupani
committed
Moved Edge executable paths to constants
1 parent 7e8bde7 commit c01cc9d

File tree

11 files changed

+138
-66
lines changed

11 files changed

+138
-66
lines changed

‎package-lock.json‎

Lines changed: 49 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
"author": "Chirag",
3434
"license": "MIT Based",
3535
"devDependencies": {
36-
"@types/chai": "^4.2.15",
36+
"@types/chai": "^4.2.18",
3737
"@types/mocha": "^8.2.2",
38-
"@types/node": "^14.14.37",
39-
"@types/sinon": "^9.0.11",
38+
"@types/node": "^15.0.2",
39+
"@types/sinon": "^10.0.0",
4040
"chai": "^4.3.4",
41-
"mocha": "^8.3.2",
41+
"mocha": "^8.4.0",
4242
"mocha-junit-reporter": "^2.0.0",
4343
"nyc": "^15.1.0",
4444
"ts-node": "^9.1.1",
45-
"typescript": "^4.2.3"
45+
"typescript": "^4.2.4"
4646
},
4747
"nyc": {
4848
"reporter": [

‎src/Constants.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
export class WindowsConstants {
2+
static readonly EdgeCanary = 'Edge SxS';
3+
static readonly EdgeBeta = 'Edge Beta';
4+
static readonly EdgeDev = 'Edge Dev';
5+
static readonly Edge = 'Edge';
6+
}
7+
8+
export class LinuxConstants {
9+
static readonly EdgeCanary = 'microsoft-edge-canary';
10+
static readonly EdgeBeta = 'microsoft-edge-beta';
11+
static readonly EdgeDev = 'microsoft-edge-dev';
12+
static readonly Edge = 'microsoft-edge';
13+
}
14+
15+
export class DarwinConstants {
16+
static readonly EdgeCanary = 'Microsoft Edge Canary';
17+
static readonly EdgeBeta = 'Microsoft Edge Beta';
18+
static readonly EdgeDev = 'Microsoft Edge Dev';
19+
static readonly Edge = 'Microsoft Edge';
20+
}

‎src/channels/EdgeBeta.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
import BaseBrowser from '../BaseBrowser';
2+
import {
3+
DarwinConstants,
4+
LinuxConstants,
5+
WindowsConstants,
6+
} from '../Constants';
27
import Utilities from '../Utilities';
38

49
const EdgeBetaBrowser = function (baseBrowserDecorator, args) {
@@ -15,11 +20,11 @@ EdgeBetaBrowser.prototype = {
1520
name: 'Edge Beta',
1621

1722
DEFAULT_CMD: {
18-
linux: Utilities.GetLinuxBin('microsoft-edge-beta'),
23+
linux: Utilities.GetLinuxBin(LinuxConstants.EdgeBeta),
1924
darwin: Utilities.GetEdgeDarwin(
20-
'/Applications/Microsoft Edge Beta.app/Contents/MacOS/Microsoft Edge Beta'
25+
`/Applications/${DarwinConstants.EdgeBeta}.app/Contents/MacOS/${DarwinConstants.EdgeBeta}`
2126
),
22-
win32: Utilities.GetEdgeExe('Edge Beta'),
27+
win32: Utilities.GetEdgeExe(WindowsConstants.EdgeBeta),
2328
},
2429

2530
ENV_CMD: 'EDGE_BETA_BIN',

‎src/channels/EdgeCanary.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
import BaseBrowser from '../BaseBrowser';
2+
import {
3+
DarwinConstants,
4+
LinuxConstants,
5+
WindowsConstants,
6+
} from '../Constants';
27
import Utilities from '../Utilities';
38

49
const EdgeCanaryBrowser = function (baseBrowserDecorator, args) {
@@ -15,11 +20,11 @@ EdgeCanaryBrowser.prototype = {
1520
name: 'Edge Canary',
1621

1722
DEFAULT_CMD: {
18-
linux: Utilities.GetLinuxBin('microsoft-edge-canary'),
23+
linux: Utilities.GetLinuxBin(LinuxConstants.EdgeCanary),
1924
darwin: Utilities.GetEdgeDarwin(
20-
'/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary'
25+
`/Applications/${DarwinConstants.EdgeCanary}.app/Contents/MacOS/${DarwinConstants.EdgeCanary}`
2126
),
22-
win32: Utilities.GetEdgeExe('Edge SxS'),
27+
win32: Utilities.GetEdgeExe(WindowsConstants.EdgeCanary),
2328
},
2429

2530
ENV_CMD: 'EDGE_CANARY_BIN',

‎src/channels/EdgeDev.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
import BaseBrowser from '../BaseBrowser';
2+
import {
3+
DarwinConstants,
4+
LinuxConstants,
5+
WindowsConstants,
6+
} from '../Constants';
27
import Utilities from '../Utilities';
38

49
const EdgeDevBrowser = function (baseBrowserDecorator, args) {
@@ -15,11 +20,11 @@ EdgeDevBrowser.prototype = {
1520
name: 'Edge Dev',
1621

1722
DEFAULT_CMD: {
18-
linux: Utilities.GetLinuxBin('microsoft-edge-dev'),
23+
linux: Utilities.GetLinuxBin(LinuxConstants.EdgeDev),
1924
darwin: Utilities.GetEdgeDarwin(
20-
'/Applications/Microsoft Edge Dev.app/Contents/MacOS/Microsoft Edge Dev'
25+
`/Applications/${DarwinConstants.EdgeDev}.app/Contents/MacOS/${DarwinConstants.EdgeDev}`
2126
),
22-
win32: Utilities.GetEdgeExe('Edge Dev'),
27+
win32: Utilities.GetEdgeExe(WindowsConstants.EdgeDev),
2328
},
2429

2530
ENV_CMD: 'EDGE_DEV_BIN',

‎src/channels/EdgeStable.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
import BaseBrowser from '../BaseBrowser';
2+
import {
3+
DarwinConstants,
4+
LinuxConstants,
5+
WindowsConstants,
6+
} from '../Constants';
27
import Utilities from '../Utilities';
38

49
const EdgeStableBrowser = function (baseBrowserDecorator, args) {
@@ -15,11 +20,11 @@ EdgeStableBrowser.prototype = {
1520
name: 'Edge',
1621

1722
DEFAULT_CMD: {
18-
linux: Utilities.GetLinuxBin('microsoft-edge'),
23+
linux: Utilities.GetLinuxBin(LinuxConstants.Edge),
1924
darwin: Utilities.GetEdgeDarwin(
20-
'/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge'
25+
`/Applications/${DarwinConstants.Edge}.app/Contents/MacOS/${DarwinConstants.Edge}`
2126
),
22-
win32: Utilities.GetEdgeExe('Edge'),
27+
win32: Utilities.GetEdgeExe(WindowsConstants.Edge),
2328
},
2429

2530
ENV_CMD: 'EDGE_BIN',

‎src/headlessChannels/EdgeBetaHeadless.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
import BaseBrowser from '../BaseBrowser';
2+
import {
3+
DarwinConstants,
4+
LinuxConstants,
5+
WindowsConstants,
6+
} from '../Constants';
27
import Utilities from '../Utilities';
38

49
const EdgeBetaHeadlessBrowser = function (baseBrowserDecorator, args) {
@@ -15,11 +20,11 @@ EdgeBetaHeadlessBrowser.prototype = {
1520
name: 'Edge Beta Headless',
1621

1722
DEFAULT_CMD: {
18-
linux: Utilities.GetLinuxBin('microsoft-edge-beta'),
23+
linux: Utilities.GetLinuxBin(LinuxConstants.EdgeBeta),
1924
darwin: Utilities.GetEdgeDarwin(
20-
'/Applications/Microsoft Edge Beta.app/Contents/MacOS/Microsoft Edge Beta'
25+
`/Applications/${DarwinConstants.EdgeBeta}.app/Contents/MacOS/${DarwinConstants.EdgeBeta}`
2126
),
22-
win32: Utilities.GetEdgeExe('Edge Beta'),
27+
win32: Utilities.GetEdgeExe(WindowsConstants.EdgeBeta),
2328
},
2429

2530
ENV_CMD: 'EDGE_BETA_BIN',

‎src/headlessChannels/EdgeCanaryHeadless.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
import BaseBrowser from '../BaseBrowser';
2+
import {
3+
DarwinConstants,
4+
LinuxConstants,
5+
WindowsConstants,
6+
} from '../Constants';
27
import Utilities from '../Utilities';
38

49
const EdgeCanaryHeadlessBrowser = function (baseBrowserDecorator, args) {
@@ -15,11 +20,11 @@ EdgeCanaryHeadlessBrowser.prototype = {
1520
name: 'Edge Canary Headless',
1621

1722
DEFAULT_CMD: {
18-
linux: Utilities.GetLinuxBin('microsoft-edge-canary'),
23+
linux: Utilities.GetLinuxBin(LinuxConstants.EdgeCanary),
1924
darwin: Utilities.GetEdgeDarwin(
20-
'/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary'
25+
`/Applications/${DarwinConstants.EdgeCanary}.app/Contents/MacOS/${DarwinConstants.EdgeCanary}`
2126
),
22-
win32: Utilities.GetEdgeExe('Edge SxS'),
27+
win32: Utilities.GetEdgeExe(WindowsConstants.EdgeCanary),
2328
},
2429

2530
ENV_CMD: 'EDGE_CANARY_BIN',

‎src/headlessChannels/EdgeDevHeadless.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
import BaseBrowser from '../BaseBrowser';
2+
import {
3+
DarwinConstants,
4+
LinuxConstants,
5+
WindowsConstants,
6+
} from '../Constants';
27
import Utilities from '../Utilities';
38

49
const EdgeDevHeadlessBrowser = function (baseBrowserDecorator, args) {
@@ -15,11 +20,11 @@ EdgeDevHeadlessBrowser.prototype = {
1520
name: 'Edge Dev Headless',
1621

1722
DEFAULT_CMD: {
18-
linux: Utilities.GetLinuxBin('microsoft-edge-dev'),
23+
linux: Utilities.GetLinuxBin(LinuxConstants.EdgeDev),
1924
darwin: Utilities.GetEdgeDarwin(
20-
'/Applications/Microsoft Edge Dev.app/Contents/MacOS/Microsoft Edge Dev'
25+
`/Applications/${DarwinConstants.EdgeDev}.app/Contents/MacOS/${DarwinConstants.EdgeDev}`
2126
),
22-
win32: Utilities.GetEdgeExe('Edge Dev'),
27+
win32: Utilities.GetEdgeExe(WindowsConstants.EdgeDev),
2328
},
2429

2530
ENV_CMD: 'EDGE_DEV_BIN',

0 commit comments

Comments
 (0)