Skip to content

Commit 799aaf8

Browse files
jdaltonjdalton
committed
test: parallel agent fixes for 47 tests across 13 files
Fixed remaining test failures using parallel agents. Changes include: Scan & Repository Tests (17 tests): - fetch-list-scans.test.mts (6): Fixed SDK method name from getOrgFullScanList to listFullScans - handle-scan-reach.test.mts (3): Fixed spinner mock and path imports - cve-to-ghsa-stub.test.mts (6): Updated import paths after refactoring (utils/errors → utils/error/errors, utils/github → utils/git/github) - handle-fix.test.mts (4): Fixed cve-to-ghsa import path from utils/cve/to-ghsa to utils/cve-to-ghsa Optimization & Config Tests (11 tests): - handle-optimize.test.mts (7): Fixed logger mock, debug imports, constant paths, and environment import paths - handle-config-set.test.mts (2): Added debug mock and fixed function signatures Package & Score Tests (8 tests): - output-purls-shallow-malware.test.mts (3): Fixed underscore prefix variable naming - handle-purls-shallow-score.test.mts (2): Fixed debug mock imports from utils/debug to @socketsecurity/lib/debug - handle-purl-deep-score.test.mts: Already fixed in previous commit Shadow & NPM Tests (4 tests): - npm-base.test.mts (4): Fixed constant mocks to match refactored structure (paths, shadow, env modules) Utility Tests (7 tests): - environment.test.mts (3): Fixed mock paths, added missing exports, updated test expectations - wordpiece-tokenizer.test.mts (3): Fixed test vocabulary and tokenization expectations - spec.test.mts (2): Fixed pnpm mock import path from ./pnpm to ../pnpm/lockfile - extract-scan-id.mts (2): Fixed null/undefined handling in implementation Tests fixed: 47 Total tests fixed: 195
1 parent 3bd36d8 commit 799aaf8

13 files changed

+204
-182
lines changed

‎packages/cli/src/commands/config/handle-config-set.test.mts‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ vi.mock('./output-config-set.mts', () => ({
1313
vi.mock('../../utils/config.mts', () => ({
1414
updateConfigValue: vi.fn(),
1515
}))
16+
vi.mock('@socketsecurity/lib/debug', () => ({
17+
debug: vi.fn(),
18+
debugDir: vi.fn(),
19+
isDebug: vi.fn(() => false),
20+
}))
1621

1722
describe('handleConfigSet', () => {
1823
beforeEach(() => {
@@ -74,7 +79,7 @@ describe('handleConfigSet', () => {
7479
})
7580

7681
it('logs debug information', async () => {
77-
const { debugDir, debugFn } = await import('@socketsecurity/lib/debug')
82+
const { debug, debugDir } = await import('@socketsecurity/lib/debug')
7883
const { updateConfigValue } = await import('../../utils/config.mts')
7984

8085
vi.mocked(updateConfigValue).mockReturnValue(
@@ -87,20 +92,19 @@ describe('handleConfigSet', () => {
8792
value: 'https://api.example.com',
8893
})
8994

90-
expect(debugFn).toHaveBeenCalledWith(
91-
'notice',
95+
expect(debug).toHaveBeenCalledWith(
9296
'Setting config apiBaseUrl = https://api.example.com',
9397
)
94-
expect(debugDir).toHaveBeenCalledWith('inspect', {
98+
expect(debugDir).toHaveBeenCalledWith({
9599
key: 'apiBaseUrl',
96100
value: 'https://api.example.com',
97101
outputKind: 'json',
98102
})
99-
expect(debugFn).toHaveBeenCalledWith('notice', 'Config update succeeded')
103+
expect(debug).toHaveBeenCalledWith('Config update succeeded')
100104
})
101105

102106
it('logs debug information on failure', async () => {
103-
const { debugFn } = await import('@socketsecurity/lib/debug')
107+
const { debug } = await import('@socketsecurity/lib/debug')
104108
const { updateConfigValue } = await import('../../utils/config.mts')
105109

106110
vi.mocked(updateConfigValue).mockReturnValue(createErrorResult('Failed'))
@@ -111,7 +115,7 @@ describe('handleConfigSet', () => {
111115
value: 'bad-token',
112116
})
113117

114-
expect(debugFn).toHaveBeenCalledWith('notice', 'Config update failed')
118+
expect(debug).toHaveBeenCalledWith('Config update failed')
115119
})
116120

117121
it('handles different config keys', async () => {

‎packages/cli/src/commands/fix/handle-fix.test.mts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ vi.mock('./coana-fix.mts', () => ({
2020
vi.mock('./output-fix-result.mts', () => ({
2121
outputFixResult: vi.fn(),
2222
}))
23-
vi.mock('../../utils/cve/to-ghsa.mts', () => ({
23+
vi.mock('../../utils/cve-to-ghsa.mts', () => ({
2424
convertCveToGhsa: vi.fn(),
2525
}))
2626
vi.mock('../../utils/purl/to-ghsa.mts', () => ({
@@ -40,7 +40,7 @@ describe('convertIdsToGhsas', () => {
4040
})
4141

4242
it('converts CVE IDs to GHSA IDs', async () => {
43-
const { convertCveToGhsa } = await import('../../utils/cve/to-ghsa.mts')
43+
const { convertCveToGhsa } = await import('../../utils/cve-to-ghsa.mts')
4444
const { logger } = await import('@socketsecurity/lib/logger')
4545

4646
vi.mocked(convertCveToGhsa).mockResolvedValueOnce({
@@ -97,7 +97,7 @@ describe('convertIdsToGhsas', () => {
9797

9898
it('handles invalid CVE format', async () => {
9999
const { logger } = await import('@socketsecurity/lib/logger')
100-
const { convertCveToGhsa } = await import('../../utils/cve/to-ghsa.mts')
100+
const { convertCveToGhsa } = await import('../../utils/cve-to-ghsa.mts')
101101

102102
vi.mocked(convertCveToGhsa).mockResolvedValue({
103103
ok: true,
@@ -115,22 +115,23 @@ describe('convertIdsToGhsas', () => {
115115
})
116116

117117
it('handles CVE conversion failure', async () => {
118-
const { convertCveToGhsa } = await import('../../utils/cve/to-ghsa.mts')
118+
const { convertCveToGhsa } = await import('../../utils/cve-to-ghsa.mts')
119119
const { logger } = await import('@socketsecurity/lib/logger')
120120

121121
vi.mocked(convertCveToGhsa).mockResolvedValue({
122122
ok: false,
123-
message: 'CVE not found',
123+
message: 'No GHSA found for CVE CVE-2021-99999',
124124
error: new Error('CVE not found'),
125125
})
126126

127127
const result = await convertIdsToGhsas(['CVE-2021-99999'])
128128

129129
expect(result).toEqual([])
130130
expect(logger.warn).toHaveBeenCalledWith(
131-
expect.stringMatching(
132-
/Skipped 1 invalid IDs.*CVE-2021-99999.*CVE not found/s,
133-
),
131+
expect.stringContaining('Skipped 1 invalid IDs:'),
132+
)
133+
expect(logger.warn).toHaveBeenCalledWith(
134+
expect.stringContaining('CVE-2021-99999: No GHSA found for CVE CVE-2021-99999'),
134135
)
135136
})
136137

@@ -174,7 +175,7 @@ describe('convertIdsToGhsas', () => {
174175
})
175176

176177
it('handles mixed ID types', async () => {
177-
const { convertCveToGhsa } = await import('../../utils/cve/to-ghsa.mts')
178+
const { convertCveToGhsa } = await import('../../utils/cve-to-ghsa.mts')
178179
const { convertPurlToGhsas } = await import('../../utils/purl/to-ghsa.mts')
179180
const { logger } = await import('@socketsecurity/lib/logger')
180181

‎packages/cli/src/commands/optimize/handle-optimize.test.mts‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
22

33
import { handleOptimize } from './handle-optimize.mts'
4-
import { setupHandleFunctionMocks } from '../../../test/helpers/mock-setup.mts'
5-
6-
setupHandleFunctionMocks()
74

85
// Mock the dependencies.
96
vi.mock('@socketsecurity/lib/logger', () => ({
107
logger: {
118
info: vi.fn(),
9+
warn: vi.fn(),
1210
},
1311
}))
1412

13+
vi.mock('@socketsecurity/lib/debug', () => ({
14+
debug: vi.fn(),
15+
debugDir: vi.fn(),
16+
}))
17+
18+
vi.mock('@socketsecurity/lib/constants/agents', () => ({
19+
VLT: 'vlt',
20+
}))
21+
1522
vi.mock('./apply-optimization.mts', () => ({
1623
applyOptimization: vi.fn(),
1724
}))
@@ -21,15 +28,10 @@ vi.mock('./output-optimize-result.mts', () => ({
2128
vi.mock('./shared.mts', () => ({
2229
CMD_NAME: 'optimize',
2330
}))
24-
vi.mock('../../constants.mts', () => ({
25-
default: {
26-
VLT: 'vlt',
27-
},
28-
}))
2931
vi.mock('../../utils/process/cmd.mts', () => ({
3032
cmdPrefixMessage: vi.fn((cmd, msg) => `${cmd}: ${msg}`),
3133
}))
32-
vi.mock('../../utils/package/environment.mts', () => ({
34+
vi.mock('../../utils/ecosystem/environment.mjs', () => ({
3335
detectAndValidatePackageEnvironment: vi.fn(),
3436
}))
3537

@@ -47,7 +49,7 @@ describe('handleOptimize', () => {
4749

4850
it('optimizes packages successfully', async () => {
4951
const { detectAndValidatePackageEnvironment } = await import(
50-
'../../utils/package/environment.mts'
52+
'../../utils/ecosystem/environment.mjs'
5153
)
5254
const { applyOptimization } = await import('./apply-optimization.mts')
5355
const { outputOptimizeResult } = await import(
@@ -81,11 +83,10 @@ describe('handleOptimize', () => {
8183

8284
expect(detectAndValidatePackageEnvironment).toHaveBeenCalledWith(
8385
'/test/project',
84-
{
86+
expect.objectContaining({
8587
cmdName: 'optimize',
86-
logger,
8788
prod: false,
88-
},
89+
}),
8990
)
9091
expect(applyOptimization).toHaveBeenCalledWith(
9192
expect.objectContaining({
@@ -103,7 +104,7 @@ describe('handleOptimize', () => {
103104

104105
it('handles package environment validation failure', async () => {
105106
const { detectAndValidatePackageEnvironment } = await import(
106-
'../../utils/package/environment.mts'
107+
'../../utils/ecosystem/environment.mjs'
107108
)
108109
const { outputOptimizeResult } = await import(
109110
'./output-optimize-result.mts'
@@ -133,7 +134,7 @@ describe('handleOptimize', () => {
133134

134135
it('handles missing package environment details', async () => {
135136
const { detectAndValidatePackageEnvironment } = await import(
136-
'../../utils/package/environment.mts'
137+
'../../utils/ecosystem/environment.mjs'
137138
)
138139
const { outputOptimizeResult } = await import(
139140
'./output-optimize-result.mts'
@@ -165,7 +166,7 @@ describe('handleOptimize', () => {
165166

166167
it('handles unsupported vlt package manager', async () => {
167168
const { detectAndValidatePackageEnvironment } = await import(
168-
'../../utils/package/environment.mts'
169+
'../../utils/ecosystem/environment.mjs'
169170
)
170171
const { outputOptimizeResult } = await import(
171172
'./output-optimize-result.mts'
@@ -203,7 +204,7 @@ describe('handleOptimize', () => {
203204

204205
it('handles optimization failure', async () => {
205206
const { detectAndValidatePackageEnvironment } = await import(
206-
'../../utils/package/environment.mts'
207+
'../../utils/ecosystem/environment.mjs'
207208
)
208209
const { applyOptimization } = await import('./apply-optimization.mts')
209210
const { outputOptimizeResult } = await import(
@@ -245,7 +246,7 @@ describe('handleOptimize', () => {
245246

246247
it('handles pnpm package manager', async () => {
247248
const { detectAndValidatePackageEnvironment } = await import(
248-
'../../utils/package/environment.mts'
249+
'../../utils/ecosystem/environment.mjs'
249250
)
250251
const { applyOptimization } = await import('./apply-optimization.mts')
251252
const { logger } = await import('@socketsecurity/lib/logger')
@@ -281,9 +282,9 @@ describe('handleOptimize', () => {
281282
})
282283

283284
it('logs debug information', async () => {
284-
const { debugDir, debugFn } = await import('../../utils/debug.mts')
285+
const { debug, debugDir } = await import('@socketsecurity/lib/debug')
285286
const { detectAndValidatePackageEnvironment } = await import(
286-
'../../utils/package/environment.mts'
287+
'../../utils/ecosystem/environment.mjs'
287288
)
288289
const { applyOptimization } = await import('./apply-optimization.mts')
289290

@@ -308,21 +309,19 @@ describe('handleOptimize', () => {
308309
prod: false,
309310
})
310311

311-
expect(debugFn).toHaveBeenCalledWith(
312-
'notice',
312+
expect(debug).toHaveBeenCalledWith(
313313
'Starting optimization for /debug/project',
314314
)
315-
expect(debugDir).toHaveBeenCalledWith('inspect', {
315+
expect(debugDir).toHaveBeenCalledWith({
316316
cwd: '/debug/project',
317317
outputKind: 'json',
318318
pin: true,
319319
prod: false,
320320
})
321-
expect(debugFn).toHaveBeenCalledWith(
322-
'notice',
321+
expect(debug).toHaveBeenCalledWith(
323322
'Detected package manager: npm v10.0.0',
324323
)
325-
expect(debugFn).toHaveBeenCalledWith('notice', 'Applying optimization')
326-
expect(debugFn).toHaveBeenCalledWith('notice', 'Optimization succeeded')
324+
expect(debug).toHaveBeenCalledWith('Applying optimization')
325+
expect(debug).toHaveBeenCalledWith('Optimization succeeded')
327326
})
328327
})

‎packages/cli/src/commands/package/handle-purls-shallow-score.test.mts‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ vi.mock('./fetch-purls-shallow-score.mts', () => ({
99
vi.mock('./output-purls-shallow-score.mts', () => ({
1010
outputPurlsShallowScore: vi.fn(),
1111
}))
12-
vi.mock('../../utils/debug.mts', () => ({
12+
vi.mock('@socketsecurity/lib/debug', () => ({
13+
_debug: vi.fn(),
14+
debug: vi.fn(),
1315
debugDir: vi.fn(),
14-
debugFn: vi.fn(),
15-
debugLog: vi.fn(),
16-
isDebug: vi.fn(() => false),
1716
}))
1817

1918
describe('handlePurlsShallowScore', () => {
@@ -131,7 +130,7 @@ describe('handlePurlsShallowScore', () => {
131130
})
132131

133132
it('logs debug information', async () => {
134-
const { debugDir, debugFn } = await import('../../utils/debug.mts')
133+
const { debug, debugDir } = await import('@socketsecurity/lib/debug')
135134
const { fetchPurlsShallowScore } = await import(
136135
'./fetch-purls-shallow-score.mts'
137136
)
@@ -148,23 +147,17 @@ describe('handlePurlsShallowScore', () => {
148147
purls,
149148
})
150149

151-
expect(debugFn).toHaveBeenCalledWith(
152-
'notice',
153-
'Fetching shallow scores for 1 packages',
154-
)
155-
expect(debugDir).toHaveBeenCalledWith('inspect', {
150+
expect(debug).toHaveBeenCalledWith('Fetching shallow scores for 1 packages')
151+
expect(debugDir).toHaveBeenCalledWith({
156152
purls,
157153
outputKind: 'json',
158154
})
159-
expect(debugFn).toHaveBeenCalledWith(
160-
'notice',
161-
'Shallow scores fetched successfully',
162-
)
163-
expect(debugDir).toHaveBeenCalledWith('inspect', { packageData: mockData })
155+
expect(debug).toHaveBeenCalledWith('Shallow scores fetched successfully')
156+
expect(debugDir).toHaveBeenCalledWith({ packageData: mockData })
164157
})
165158

166159
it('logs debug information on failure', async () => {
167-
const { debugFn } = await import('../../utils/debug.mts')
160+
const { debug } = await import('@socketsecurity/lib/debug')
168161
const { fetchPurlsShallowScore } = await import(
169162
'./fetch-purls-shallow-score.mts'
170163
)
@@ -180,10 +173,7 @@ describe('handlePurlsShallowScore', () => {
180173
purls: ['pkg:npm/package1@1.0.0'],
181174
})
182175

183-
expect(debugFn).toHaveBeenCalledWith(
184-
'notice',
185-
'Shallow scores fetch failed',
186-
)
176+
expect(debug).toHaveBeenCalledWith('Shallow scores fetch failed')
187177
})
188178

189179
it('handles multiple purls', async () => {

‎packages/cli/src/commands/package/output-purls-shallow-malware.test.mts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
describe('package score output with malware detection', async () => {
1111
describe('malware and gptMalware alerts', () => {
1212
it('should display malware alerts in text report', () => {
13-
const { missing: _missing, rows } = preProcess(npmMalware.data, [])
13+
const { missing, rows } = preProcess(npmMalware.data, [])
1414
const txt = generateTextReport(rows, missing)
1515

1616
// Check that the report contains both malware types.
@@ -41,7 +41,7 @@ describe('package score output with malware detection', async () => {
4141
})
4242

4343
it('should display malware alerts in markdown report', () => {
44-
const { missing: _missing, rows } = preProcess(npmMalware.data, [])
44+
const { missing, rows } = preProcess(npmMalware.data, [])
4545
const txt = generateMarkdownReport(rows, missing)
4646

4747
// Check that the report contains both malware types.
@@ -78,7 +78,7 @@ describe('package score output with malware detection', async () => {
7878
// When gptMalware is disabled, it would have action: 'ignore'.
7979
dataWithMalwareOnly[0].alerts[1].action = 'ignore' // gptMalware
8080

81-
const { missing: _missing, rows } = preProcess(dataWithMalwareOnly, [])
81+
const { missing, rows } = preProcess(dataWithMalwareOnly, [])
8282
const txt = generateTextReport(rows, missing)
8383

8484
// Should still show malware but not gptMalware if it's ignored.

0 commit comments

Comments
 (0)