Skip to content

Commit

Permalink
Fix WSL1 tests to force POSIX path separator
Browse files Browse the repository at this point in the history
  • Loading branch information
yhatt committed Sep 22, 2024
1 parent 93e6701 commit 5cd5a6f
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 53 deletions.
45 changes: 24 additions & 21 deletions test/browser/finders/edge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,10 @@ describe('Edge finder', () => {
})

describe('with WSL1', () => {
const wsl1EdgePath = path.join('/mnt/c/Program Files', ...winEdgeStable)
const wsl1EdgePath = path.posix.join(
'/mnt/c/Program Files',
...winEdgeStable
)

beforeEach(() => {
jest.spyOn(utils, 'getPlatform').mockResolvedValue('wsl1')
Expand All @@ -231,18 +234,18 @@ describe('Edge finder', () => {
acceptedBrowsers: [ChromeBrowser, ChromeCdpBrowser],
})
expect(findExecutableSpy).toHaveBeenCalledWith([
path.join('/mnt/c/mock/AppData/Local', ...winEdgeCanary),
path.join('/mnt/c/Program Files', ...winEdgeCanary),
path.join('/mnt/c/Program Files (x86)', ...winEdgeCanary),
path.join('/mnt/c/mock/AppData/Local', ...winEdgeDev),
path.join('/mnt/c/Program Files', ...winEdgeDev),
path.join('/mnt/c/Program Files (x86)', ...winEdgeDev),
path.join('/mnt/c/mock/AppData/Local', ...winEdgeBeta),
path.join('/mnt/c/Program Files', ...winEdgeBeta),
path.join('/mnt/c/Program Files (x86)', ...winEdgeBeta),
path.join('/mnt/c/mock/AppData/Local', ...winEdgeStable),
path.join('/mnt/c/Program Files', ...winEdgeStable),
path.join('/mnt/c/Program Files (x86)', ...winEdgeStable),
path.posix.join('/mnt/c/mock/AppData/Local', ...winEdgeCanary),
path.posix.join('/mnt/c/Program Files', ...winEdgeCanary),
path.posix.join('/mnt/c/Program Files (x86)', ...winEdgeCanary),
path.posix.join('/mnt/c/mock/AppData/Local', ...winEdgeDev),
path.posix.join('/mnt/c/Program Files', ...winEdgeDev),
path.posix.join('/mnt/c/Program Files (x86)', ...winEdgeDev),
path.posix.join('/mnt/c/mock/AppData/Local', ...winEdgeBeta),
path.posix.join('/mnt/c/Program Files', ...winEdgeBeta),
path.posix.join('/mnt/c/Program Files (x86)', ...winEdgeBeta),
path.posix.join('/mnt/c/mock/AppData/Local', ...winEdgeStable),
path.posix.join('/mnt/c/Program Files', ...winEdgeStable),
path.posix.join('/mnt/c/Program Files (x86)', ...winEdgeStable),
])
})

Expand All @@ -253,14 +256,14 @@ describe('Edge finder', () => {
await edgeFinder({})

expect(findExecutableSpy).toHaveBeenCalledWith([
path.join('/mnt/c/Program Files', ...winEdgeCanary),
path.join('/mnt/c/Program Files (x86)', ...winEdgeCanary),
path.join('/mnt/c/Program Files', ...winEdgeDev),
path.join('/mnt/c/Program Files (x86)', ...winEdgeDev),
path.join('/mnt/c/Program Files', ...winEdgeBeta),
path.join('/mnt/c/Program Files (x86)', ...winEdgeBeta),
path.join('/mnt/c/Program Files', ...winEdgeStable),
path.join('/mnt/c/Program Files (x86)', ...winEdgeStable),
path.posix.join('/mnt/c/Program Files', ...winEdgeCanary),
path.posix.join('/mnt/c/Program Files (x86)', ...winEdgeCanary),
path.posix.join('/mnt/c/Program Files', ...winEdgeDev),
path.posix.join('/mnt/c/Program Files (x86)', ...winEdgeDev),
path.posix.join('/mnt/c/Program Files', ...winEdgeBeta),
path.posix.join('/mnt/c/Program Files (x86)', ...winEdgeBeta),
path.posix.join('/mnt/c/Program Files', ...winEdgeStable),
path.posix.join('/mnt/c/Program Files (x86)', ...winEdgeStable),
])
})

Expand Down
64 changes: 32 additions & 32 deletions test/browser/finders/firefox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,14 @@ describe('Firefox finder', () => {
acceptedBrowsers: [FirefoxBrowser],
})
expect(findExecutableSpy).toHaveBeenCalledWith([
path.join('/mnt/c/Program Files', ...winFxNightly),
path.join('/mnt/c/Program Files (x86)', ...winFxNightly),
path.join('/mnt/c/Program Files', ...winFxNightlyAlt),
path.join('/mnt/c/Program Files (x86)', ...winFxNightlyAlt),
path.join('/mnt/c/Program Files', ...winFxDev),
path.join('/mnt/c/Program Files (x86)', ...winFxDev),
path.join('/mnt/c/Program Files', ...winFx),
path.join('/mnt/c/Program Files (x86)', ...winFx),
path.posix.join('/mnt/c/Program Files', ...winFxNightly),
path.posix.join('/mnt/c/Program Files (x86)', ...winFxNightly),
path.posix.join('/mnt/c/Program Files', ...winFxNightlyAlt),
path.posix.join('/mnt/c/Program Files (x86)', ...winFxNightlyAlt),
path.posix.join('/mnt/c/Program Files', ...winFxDev),
path.posix.join('/mnt/c/Program Files (x86)', ...winFxDev),
path.posix.join('/mnt/c/Program Files', ...winFx),
path.posix.join('/mnt/c/Program Files (x86)', ...winFx),
])
})

Expand All @@ -295,30 +295,30 @@ describe('Firefox finder', () => {
await firefoxFinder({})

expect(findExecutableSpy).toHaveBeenCalledWith([
path.join('/mnt/c/Program Files', ...winFxNightly),
path.join('/mnt/c/Program Files (x86)', ...winFxNightly),
path.join('/mnt/d/Program Files', ...winFxNightly),
path.join('/mnt/d/Program Files (x86)', ...winFxNightly),
path.join('/mnt/z/Program Files', ...winFxNightly),
path.join('/mnt/z/Program Files (x86)', ...winFxNightly),
path.join('/mnt/c/Program Files', ...winFxNightlyAlt),
path.join('/mnt/c/Program Files (x86)', ...winFxNightlyAlt),
path.join('/mnt/d/Program Files', ...winFxNightlyAlt),
path.join('/mnt/d/Program Files (x86)', ...winFxNightlyAlt),
path.join('/mnt/z/Program Files', ...winFxNightlyAlt),
path.join('/mnt/z/Program Files (x86)', ...winFxNightlyAlt),
path.join('/mnt/c/Program Files', ...winFxDev),
path.join('/mnt/c/Program Files (x86)', ...winFxDev),
path.join('/mnt/d/Program Files', ...winFxDev),
path.join('/mnt/d/Program Files (x86)', ...winFxDev),
path.join('/mnt/z/Program Files', ...winFxDev),
path.join('/mnt/z/Program Files (x86)', ...winFxDev),
path.join('/mnt/c/Program Files', ...winFx),
path.join('/mnt/c/Program Files (x86)', ...winFx),
path.join('/mnt/d/Program Files', ...winFx),
path.join('/mnt/d/Program Files (x86)', ...winFx),
path.join('/mnt/z/Program Files', ...winFx),
path.join('/mnt/z/Program Files (x86)', ...winFx),
path.posix.join('/mnt/c/Program Files', ...winFxNightly),
path.posix.join('/mnt/c/Program Files (x86)', ...winFxNightly),
path.posix.join('/mnt/d/Program Files', ...winFxNightly),
path.posix.join('/mnt/d/Program Files (x86)', ...winFxNightly),
path.posix.join('/mnt/z/Program Files', ...winFxNightly),
path.posix.join('/mnt/z/Program Files (x86)', ...winFxNightly),
path.posix.join('/mnt/c/Program Files', ...winFxNightlyAlt),
path.posix.join('/mnt/c/Program Files (x86)', ...winFxNightlyAlt),
path.posix.join('/mnt/d/Program Files', ...winFxNightlyAlt),
path.posix.join('/mnt/d/Program Files (x86)', ...winFxNightlyAlt),
path.posix.join('/mnt/z/Program Files', ...winFxNightlyAlt),
path.posix.join('/mnt/z/Program Files (x86)', ...winFxNightlyAlt),
path.posix.join('/mnt/c/Program Files', ...winFxDev),
path.posix.join('/mnt/c/Program Files (x86)', ...winFxDev),
path.posix.join('/mnt/d/Program Files', ...winFxDev),
path.posix.join('/mnt/d/Program Files (x86)', ...winFxDev),
path.posix.join('/mnt/z/Program Files', ...winFxDev),
path.posix.join('/mnt/z/Program Files (x86)', ...winFxDev),
path.posix.join('/mnt/c/Program Files', ...winFx),
path.posix.join('/mnt/c/Program Files (x86)', ...winFx),
path.posix.join('/mnt/d/Program Files', ...winFx),
path.posix.join('/mnt/d/Program Files (x86)', ...winFx),
path.posix.join('/mnt/z/Program Files', ...winFx),
path.posix.join('/mnt/z/Program Files (x86)', ...winFx),
])
})

Expand Down

0 comments on commit 5cd5a6f

Please sign in to comment.