Skip to content

Commit 73fead6

Browse files
jdaltonjdalton
committed
style: pre-commit autofixes for external-tools resolve tests
1 parent b5c6605 commit 73fead6

7 files changed

Lines changed: 60 additions & 36 deletions

File tree

‎test/unit/external-tools/cdxgen/resolve-resolution.test.mts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ vi.mock('../../../../src/external-tools/cdxgen/from-download', () => ({
1212

1313
async function loadFresh() {
1414
const vfsMod = await import('../../../../src/external-tools/cdxgen/from-vfs')
15-
const pathMod = await import('../../../../src/external-tools/cdxgen/from-path')
16-
const dlMod = await import(
17-
'../../../../src/external-tools/cdxgen/from-download'
18-
)
15+
const pathMod =
16+
await import('../../../../src/external-tools/cdxgen/from-path')
17+
const dlMod =
18+
await import('../../../../src/external-tools/cdxgen/from-download')
1919
const mod = await import('../../../../src/external-tools/cdxgen/resolve')
2020
return {
2121
fromVfs: vfsMod.cdxgenFromVfs as ReturnType<typeof vi.fn>,
@@ -56,7 +56,10 @@ describe.sequential('external-tools/cdxgen/resolve — doResolveCdxgen', () => {
5656
await loadFresh()
5757
fromVfs.mockResolvedValueOnce(undefined)
5858
fromPath.mockResolvedValueOnce(undefined)
59-
const expected = { binaryPath: '/cache/cdxgen', source: 'download' as const }
59+
const expected = {
60+
binaryPath: '/cache/cdxgen',
61+
source: 'download' as const,
62+
}
6063
fromDownload.mockResolvedValueOnce(expected)
6164
const opts = {
6265
downloadIfMissing: { platformArch: 'darwin-arm64', version: '1.22.0' },

‎test/unit/external-tools/janus/resolve-resolution.test.mts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ vi.mock('../../../../src/external-tools/janus/from-download', () => ({
1313
async function loadFresh() {
1414
const vfsMod = await import('../../../../src/external-tools/janus/from-vfs')
1515
const pathMod = await import('../../../../src/external-tools/janus/from-path')
16-
const dlMod = await import(
17-
'../../../../src/external-tools/janus/from-download'
18-
)
16+
const dlMod =
17+
await import('../../../../src/external-tools/janus/from-download')
1918
const mod = await import('../../../../src/external-tools/janus/resolve')
2019
return {
2120
fromVfs: vfsMod.janusFromVfs as ReturnType<typeof vi.fn>,

‎test/unit/external-tools/opengrep/resolve-resolution.test.mts‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ vi.mock('../../../../src/external-tools/opengrep/from-download', () => ({
1111
}))
1212

1313
async function loadFresh() {
14-
const vfsMod = await import('../../../../src/external-tools/opengrep/from-vfs')
15-
const pathMod = await import('../../../../src/external-tools/opengrep/from-path')
16-
const dlMod = await import(
17-
'../../../../src/external-tools/opengrep/from-download'
18-
)
14+
const vfsMod =
15+
await import('../../../../src/external-tools/opengrep/from-vfs')
16+
const pathMod =
17+
await import('../../../../src/external-tools/opengrep/from-path')
18+
const dlMod =
19+
await import('../../../../src/external-tools/opengrep/from-download')
1920
const mod = await import('../../../../src/external-tools/opengrep/resolve')
2021
return {
2122
fromVfs: vfsMod.opengrepFromVfs as ReturnType<typeof vi.fn>,
@@ -39,7 +40,10 @@ describe.sequential('external-tools/opengrep/resolve — doResolveOpengrep', ()
3940
test('returns the PATH result when opengrep is on PATH', async () => {
4041
const { doResolveOpengrep, fromPath, fromVfs } = await loadFresh()
4142
fromVfs.mockResolvedValueOnce(undefined)
42-
const expected = { binaryPath: '/usr/bin/opengrep', source: 'path' as const }
43+
const expected = {
44+
binaryPath: '/usr/bin/opengrep',
45+
source: 'path' as const,
46+
}
4347
fromPath.mockResolvedValueOnce(expected)
4448
expect(await doResolveOpengrep()).toBe(expected)
4549
})
@@ -56,7 +60,10 @@ describe.sequential('external-tools/opengrep/resolve — doResolveOpengrep', ()
5660
await loadFresh()
5761
fromVfs.mockResolvedValueOnce(undefined)
5862
fromPath.mockResolvedValueOnce(undefined)
59-
const expected = { binaryPath: '/cache/opengrep', source: 'download' as const }
63+
const expected = {
64+
binaryPath: '/cache/opengrep',
65+
source: 'download' as const,
66+
}
6067
fromDownload.mockResolvedValueOnce(expected)
6168
const opts = {
6269
downloadIfMissing: { platformArch: 'darwin-arm64', version: '1.22.0' },
@@ -70,7 +77,10 @@ describe.sequential('external-tools/opengrep/resolve — resolveOpengrep memoiza
7077
test('memoizes by cacheKey within one module instance', async () => {
7178
const { fromPath, fromVfs, resolveOpengrep } = await loadFresh()
7279
fromVfs.mockResolvedValue(undefined)
73-
const expected = { binaryPath: '/usr/bin/opengrep', source: 'path' as const }
80+
const expected = {
81+
binaryPath: '/usr/bin/opengrep',
82+
source: 'path' as const,
83+
}
7484
fromPath.mockResolvedValueOnce(expected)
7585
const a = await resolveOpengrep()
7686
const b = await resolveOpengrep()
@@ -80,7 +90,8 @@ describe.sequential('external-tools/opengrep/resolve — resolveOpengrep memoiza
8090
})
8191

8292
test('uses separate cache slots for different option shapes', async () => {
83-
const { fromDownload, fromPath, fromVfs, resolveOpengrep } = await loadFresh()
93+
const { fromDownload, fromPath, fromVfs, resolveOpengrep } =
94+
await loadFresh()
8495
fromVfs.mockResolvedValue(undefined)
8596
fromPath.mockResolvedValue(undefined)
8697
const dl = { binaryPath: '/cache/opengrep', source: 'download' as const }

‎test/unit/external-tools/synp/resolve.test.mts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ vi.mock('../../../../src/external-tools/synp/from-download', () => ({
1515
async function loadFresh() {
1616
const vfsMod = await import('../../../../src/external-tools/synp/from-vfs')
1717
const pathMod = await import('../../../../src/external-tools/synp/from-path')
18-
const dlMod = await import('../../../../src/external-tools/synp/from-download')
18+
const dlMod =
19+
await import('../../../../src/external-tools/synp/from-download')
1920
const mod = await import('../../../../src/external-tools/synp/resolve')
2021
return {
2122
fromVfs: vfsMod.synpFromVfs as ReturnType<typeof vi.fn>,
@@ -122,7 +123,10 @@ describe.sequential('external-tools/synp/resolve — resolveSynp memoization', (
122123
await loadFresh()
123124
fromVfs.mockResolvedValue(undefined)
124125
const first = { binaryPath: '/usr/bin/synp', source: 'path' as const }
125-
const second = { binaryPath: '/usr/local/bin/synp', source: 'path' as const }
126+
const second = {
127+
binaryPath: '/usr/local/bin/synp',
128+
source: 'path' as const,
129+
}
126130
fromPath.mockResolvedValueOnce(first).mockResolvedValueOnce(second)
127131
expect(await resolveSynp()).toBe(first)
128132
resetSynpResolution()

‎test/unit/external-tools/trivy/resolve-resolution.test.mts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ vi.mock('../../../../src/external-tools/trivy/from-download', () => ({
1313
async function loadFresh() {
1414
const vfsMod = await import('../../../../src/external-tools/trivy/from-vfs')
1515
const pathMod = await import('../../../../src/external-tools/trivy/from-path')
16-
const dlMod = await import(
17-
'../../../../src/external-tools/trivy/from-download'
18-
)
16+
const dlMod =
17+
await import('../../../../src/external-tools/trivy/from-download')
1918
const mod = await import('../../../../src/external-tools/trivy/resolve')
2019
return {
2120
fromVfs: vfsMod.trivyFromVfs as ReturnType<typeof vi.fn>,

‎test/unit/external-tools/trufflehog/resolve-resolution.test.mts‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ vi.mock('../../../../src/external-tools/trufflehog/from-download', () => ({
1111
}))
1212

1313
async function loadFresh() {
14-
const vfsMod = await import('../../../../src/external-tools/trufflehog/from-vfs')
15-
const pathMod = await import('../../../../src/external-tools/trufflehog/from-path')
16-
const dlMod = await import(
17-
'../../../../src/external-tools/trufflehog/from-download'
18-
)
14+
const vfsMod =
15+
await import('../../../../src/external-tools/trufflehog/from-vfs')
16+
const pathMod =
17+
await import('../../../../src/external-tools/trufflehog/from-path')
18+
const dlMod =
19+
await import('../../../../src/external-tools/trufflehog/from-download')
1920
const mod = await import('../../../../src/external-tools/trufflehog/resolve')
2021
return {
2122
fromVfs: vfsMod.trufflehogFromVfs as ReturnType<typeof vi.fn>,
@@ -39,7 +40,10 @@ describe.sequential('external-tools/trufflehog/resolve — doResolveTrufflehog',
3940
test('returns the PATH result when trufflehog is on PATH', async () => {
4041
const { doResolveTrufflehog, fromPath, fromVfs } = await loadFresh()
4142
fromVfs.mockResolvedValueOnce(undefined)
42-
const expected = { binaryPath: '/usr/bin/trufflehog', source: 'path' as const }
43+
const expected = {
44+
binaryPath: '/usr/bin/trufflehog',
45+
source: 'path' as const,
46+
}
4347
fromPath.mockResolvedValueOnce(expected)
4448
expect(await doResolveTrufflehog()).toBe(expected)
4549
})
@@ -56,7 +60,10 @@ describe.sequential('external-tools/trufflehog/resolve — doResolveTrufflehog',
5660
await loadFresh()
5761
fromVfs.mockResolvedValueOnce(undefined)
5862
fromPath.mockResolvedValueOnce(undefined)
59-
const expected = { binaryPath: '/cache/trufflehog', source: 'download' as const }
63+
const expected = {
64+
binaryPath: '/cache/trufflehog',
65+
source: 'download' as const,
66+
}
6067
fromDownload.mockResolvedValueOnce(expected)
6168
const opts = {
6269
downloadIfMissing: { platformArch: 'darwin-arm64', version: '1.22.0' },
@@ -70,7 +77,10 @@ describe.sequential('external-tools/trufflehog/resolve — resolveTrufflehog mem
7077
test('memoizes by cacheKey within one module instance', async () => {
7178
const { fromPath, fromVfs, resolveTrufflehog } = await loadFresh()
7279
fromVfs.mockResolvedValue(undefined)
73-
const expected = { binaryPath: '/usr/bin/trufflehog', source: 'path' as const }
80+
const expected = {
81+
binaryPath: '/usr/bin/trufflehog',
82+
source: 'path' as const,
83+
}
7484
fromPath.mockResolvedValueOnce(expected)
7585
const a = await resolveTrufflehog()
7686
const b = await resolveTrufflehog()
@@ -80,7 +90,8 @@ describe.sequential('external-tools/trufflehog/resolve — resolveTrufflehog mem
8090
})
8191

8292
test('uses separate cache slots for different option shapes', async () => {
83-
const { fromDownload, fromPath, fromVfs, resolveTrufflehog } = await loadFresh()
93+
const { fromDownload, fromPath, fromVfs, resolveTrufflehog } =
94+
await loadFresh()
8495
fromVfs.mockResolvedValue(undefined)
8596
fromPath.mockResolvedValue(undefined)
8697
const dl = { binaryPath: '/cache/trufflehog', source: 'download' as const }

‎test/unit/external-tools/uv/resolve-resolution.test.mts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ vi.mock('../../../../src/external-tools/uv/from-download', () => ({
1313
async function loadFresh() {
1414
const vfsMod = await import('../../../../src/external-tools/uv/from-vfs')
1515
const pathMod = await import('../../../../src/external-tools/uv/from-path')
16-
const dlMod = await import(
17-
'../../../../src/external-tools/uv/from-download'
18-
)
16+
const dlMod = await import('../../../../src/external-tools/uv/from-download')
1917
const mod = await import('../../../../src/external-tools/uv/resolve')
2018
return {
2119
fromVfs: vfsMod.uvFromVfs as ReturnType<typeof vi.fn>,
@@ -52,8 +50,7 @@ describe.sequential('external-tools/uv/resolve — doResolveUv', () => {
5250
})
5351

5452
test('falls through to download when PATH misses and opts.downloadIfMissing is set', async () => {
55-
const { doResolveUv, fromDownload, fromPath, fromVfs } =
56-
await loadFresh()
53+
const { doResolveUv, fromDownload, fromPath, fromVfs } = await loadFresh()
5754
fromVfs.mockResolvedValueOnce(undefined)
5855
fromPath.mockResolvedValueOnce(undefined)
5956
const expected = { binaryPath: '/cache/uv', source: 'download' as const }

0 commit comments

Comments
 (0)