Skip to content

Commit 2482299

Browse files
jdaltonjdalton
committed
test: update snapshots after @socketsecurity/lib changes
Update test snapshots after bundling @socketsecurity/lib changes. Also update @socketsecurity/lib dependency version.
1 parent 88807c1 commit 2482299

31 files changed

Lines changed: 472 additions & 316 deletions

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"devDependencies": {
66
"@babel/core": "7.28.4",
7-
"@babel/parser": "7.28.4",
7+
"@babel/parser": "catalog:",
88
"@babel/plugin-proposal-export-default-from": "7.27.1",
99
"@babel/plugin-transform-export-namespace-from": "7.27.1",
1010
"@babel/plugin-transform-runtime": "7.28.3",
@@ -76,7 +76,7 @@
7676
"ink-table": "3.1.0",
7777
"js-yaml": "npm:@zkochan/js-yaml@0.0.10",
7878
"lint-staged": "16.1.6",
79-
"magic-string": "0.30.19",
79+
"magic-string": "catalog:",
8080
"micromatch": "4.0.8",
8181
"mock-fs": "5.5.0",
8282
"nanotar": "0.2.0",
@@ -131,7 +131,7 @@
131131
"isarray": "npm:@socketregistry/isarray@^1.0.8",
132132
"lodash": "4.17.21",
133133
"npm-package-arg": "13.0.0",
134-
"packageurl-js": "npm:@socketregistry/packageurl-js@^1.3.3",
134+
"packageurl-js": "npm:@socketregistry/packageurl-js@^1.3.2",
135135
"path-parse": "npm:@socketregistry/path-parse@^1.0.8",
136136
"safe-buffer": "npm:@socketregistry/safe-buffer@^1.0.9",
137137
"safer-buffer": "npm:@socketregistry/safer-buffer@^1.0.10",

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,19 @@ vi.mock('@socketsecurity/lib/debug', () => ({
1010
debugLog: vi.fn(),
1111
isDebug: vi.fn(() => false),
1212
}))
13+
14+
const mockLogger = vi.hoisted(() => ({
15+
fail: vi.fn(),
16+
log: vi.fn(),
17+
info: vi.fn(),
18+
success: vi.fn(),
19+
warn: vi.fn(),
20+
error: vi.fn(),
21+
}))
22+
1323
vi.mock('@socketsecurity/lib/logger', () => ({
14-
logger: {
15-
log: vi.fn(),
16-
},
24+
getDefaultLogger: () => mockLogger,
25+
logger: mockLogger,
1726
}))
1827
vi.mock('./fetch-default-org-slug.mts', () => ({
1928
getDefaultOrgSlug: vi.fn(),
@@ -170,7 +179,7 @@ describe('handleCi', () => {
170179

171180
expect(process.exitCode).toBe(401)
172181
expect(serializeResultJson).toHaveBeenCalledWith(error)
173-
expect(getDefaultLogger().log).toHaveBeenCalledWith(JSON.stringify(error))
182+
expect(mockLogger.log).toHaveBeenCalledWith(JSON.stringify(error))
174183
expect(handleCreateNewScan).not.toHaveBeenCalled()
175184
})
176185

@@ -190,7 +199,7 @@ describe('handleCi', () => {
190199
await handleCi(false)
191200

192201
expect(process.exitCode).toBe(1)
193-
expect(getDefaultLogger().log).toHaveBeenCalled()
202+
expect(mockLogger.log).toHaveBeenCalled()
194203
})
195204

196205
it('logs debug information', async () => {

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

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ import { convertIdsToGhsas } from './handle-fix.mts'
66
vi.mock('@socketsecurity/lib/arrays', () => ({
77
joinAnd: vi.fn(arr => arr.join(' and ')),
88
}))
9+
10+
const mockLogger = vi.hoisted(() => ({
11+
fail: vi.fn(),
12+
log: vi.fn(),
13+
info: vi.fn(),
14+
success: vi.fn(),
15+
warn: vi.fn(),
16+
error: vi.fn(),
17+
}))
18+
919
vi.mock('@socketsecurity/lib/logger', () => ({
10-
logger: {
11-
error: vi.fn(),
12-
info: vi.fn(),
13-
success: vi.fn(),
14-
warn: vi.fn(),
15-
},
20+
getDefaultLogger: () => mockLogger,
21+
logger: mockLogger,
1622
}))
1723
vi.mock('./coana-fix.mts', () => ({
1824
coanaFix: vi.fn(),
@@ -55,10 +61,10 @@ describe('convertIdsToGhsas', () => {
5561

5662
expect(convertCveToGhsa).toHaveBeenCalledWith('CVE-2021-12345')
5763
expect(convertCveToGhsa).toHaveBeenCalledWith('CVE-2022-98765')
58-
expect(getDefaultLogger().info).toHaveBeenCalledWith(
64+
expect(mockLogger.info).toHaveBeenCalledWith(
5965
'Converted CVE-2021-12345 to GHSA-1234-5678-9abc',
6066
)
61-
expect(getDefaultLogger().info).toHaveBeenCalledWith(
67+
expect(mockLogger.info).toHaveBeenCalledWith(
6268
'Converted CVE-2022-98765 to GHSA-abcd-efgh-ijkl',
6369
)
6470
expect(result).toEqual(['GHSA-1234-5678-9abc', 'GHSA-abcd-efgh-ijkl'])
@@ -85,7 +91,7 @@ describe('convertIdsToGhsas', () => {
8591
])
8692

8793
expect(result).toEqual(['GHSA-1234-5678-9abc'])
88-
expect(getDefaultLogger().warn).toHaveBeenCalledWith(
94+
expect(mockLogger.warn).toHaveBeenCalledWith(
8995
expect.stringMatching(
9096
/Skipped 1 invalid IDs.*Invalid GHSA format: GHSA-invalid/s,
9197
),
@@ -103,7 +109,7 @@ describe('convertIdsToGhsas', () => {
103109
const result = await convertIdsToGhsas(['CVE-invalid', 'CVE-2021-12345'])
104110

105111
expect(result).toEqual(['GHSA-1234-5678-9abc'])
106-
expect(getDefaultLogger().warn).toHaveBeenCalledWith(
112+
expect(mockLogger.warn).toHaveBeenCalledWith(
107113
expect.stringMatching(
108114
/Skipped 1 invalid IDs.*Invalid CVE format: CVE-invalid/s,
109115
),
@@ -122,10 +128,10 @@ describe('convertIdsToGhsas', () => {
122128
const result = await convertIdsToGhsas(['CVE-2021-99999'])
123129

124130
expect(result).toEqual([])
125-
expect(getDefaultLogger().warn).toHaveBeenCalledWith(
131+
expect(mockLogger.warn).toHaveBeenCalledWith(
126132
expect.stringContaining('Skipped 1 invalid IDs:'),
127133
)
128-
expect(getDefaultLogger().warn).toHaveBeenCalledWith(
134+
expect(mockLogger.warn).toHaveBeenCalledWith(
129135
expect.stringContaining(
130136
'CVE-2021-99999: No GHSA found for CVE CVE-2021-99999',
131137
),
@@ -144,7 +150,7 @@ describe('convertIdsToGhsas', () => {
144150
const result = await convertIdsToGhsas(['pkg:npm/nonexistent@1.0.0'])
145151

146152
expect(result).toEqual([])
147-
expect(getDefaultLogger().warn).toHaveBeenCalledWith(
153+
expect(mockLogger.warn).toHaveBeenCalledWith(
148154
expect.stringMatching(
149155
/Skipped 1 invalid IDs.*pkg:npm\/nonexistent@1\.0\.0.*Package not found/s,
150156
),
@@ -162,7 +168,7 @@ describe('convertIdsToGhsas', () => {
162168
const result = await convertIdsToGhsas(['pkg:npm/safe-package@1.0.0'])
163169

164170
expect(result).toEqual([])
165-
expect(getDefaultLogger().warn).toHaveBeenCalledWith(
171+
expect(mockLogger.warn).toHaveBeenCalledWith(
166172
expect.stringMatching(
167173
/Skipped 1 invalid IDs.*pkg:npm\/safe-package@1\.0\.0.*No GHSAs found/s,
168174
),
@@ -193,10 +199,10 @@ describe('convertIdsToGhsas', () => {
193199
'GHSA-from-cve-test',
194200
'GHSA-from-purl-test',
195201
])
196-
expect(getDefaultLogger().info).toHaveBeenCalledWith(
202+
expect(mockLogger.info).toHaveBeenCalledWith(
197203
'Converted CVE-2021-12345 to GHSA-from-cve-test',
198204
)
199-
expect(getDefaultLogger().info).toHaveBeenCalledWith(
205+
expect(mockLogger.info).toHaveBeenCalledWith(
200206
expect.stringContaining('Converted pkg:npm/package@1.0.0 to 1 GHSA(s)'),
201207
)
202208
})

‎packages/cli/src/commands/fix/pr-lifecycle-logger.test.mts‎

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

3-
import { logPrEvent } from './pr-lifecycle-getDefaultLogger().mts'
3+
import { logPrEvent } from './pr-lifecycle-logger.mts'
44

55
// Mock logger.
6+
const mockLogger = vi.hoisted(() => ({
7+
success: vi.fn(),
8+
info: vi.fn(),
9+
warn: vi.fn(),
10+
error: vi.fn(),
11+
log: vi.fn(),
12+
fail: vi.fn(),
13+
}))
14+
615
vi.mock('@socketsecurity/lib/logger', () => ({
7-
logger: {
8-
success: vi.fn(),
9-
info: vi.fn(),
10-
warn: vi.fn(),
11-
error: vi.fn(),
12-
},
16+
logger: mockLogger,
17+
getDefaultLogger: () => mockLogger,
1318
}))
1419

1520
// Mock colors.
@@ -38,92 +43,92 @@ describe('pr-lifecycle-logger', () => {
3843
'https://github.com/org/repo/pull/123',
3944
)
4045

41-
expect(getDefaultLogger().success).toHaveBeenCalledWith(
46+
expect(mockLogger.success).toHaveBeenCalledWith(
4247
expect.stringContaining('PR #123'),
4348
)
44-
expect(getDefaultLogger().success).toHaveBeenCalledWith(
49+
expect(mockLogger.success).toHaveBeenCalledWith(
4550
expect.stringContaining('GHSA-1234-5678-90ab'),
4651
)
47-
expect(getDefaultLogger().success).toHaveBeenCalledWith(
52+
expect(mockLogger.success).toHaveBeenCalledWith(
4853
expect.stringContaining('https://github.com/org/repo/pull/123'),
4954
)
5055
})
5156

5257
it('logs merged event with success logger', async () => {
5358
logPrEvent('merged', 456, 'GHSA-abcd-efgh-ijkl', 'Branch cleaned up')
5459

55-
expect(getDefaultLogger().success).toHaveBeenCalledWith(
60+
expect(mockLogger.success).toHaveBeenCalledWith(
5661
expect.stringContaining('PR #456'),
5762
)
58-
expect(getDefaultLogger().success).toHaveBeenCalledWith(
63+
expect(mockLogger.success).toHaveBeenCalledWith(
5964
expect.stringContaining('GHSA-abcd-efgh-ijkl'),
6065
)
61-
expect(getDefaultLogger().success).toHaveBeenCalledWith(
66+
expect(mockLogger.success).toHaveBeenCalledWith(
6267
expect.stringContaining('Branch cleaned up'),
6368
)
6469
})
6570

6671
it('logs closed event with info logger', async () => {
6772
logPrEvent('closed', 789, 'GHSA-test-test-test')
6873

69-
expect(getDefaultLogger().info).toHaveBeenCalledWith(
74+
expect(mockLogger.info).toHaveBeenCalledWith(
7075
expect.stringContaining('PR #789'),
7176
)
72-
expect(getDefaultLogger().info).toHaveBeenCalledWith(
77+
expect(mockLogger.info).toHaveBeenCalledWith(
7378
expect.stringContaining('GHSA-test-test-test'),
7479
)
7580
})
7681

7782
it('logs updated event with info logger', async () => {
7883
logPrEvent('updated', 111, 'GHSA-update-test', 'Updated from base branch')
7984

80-
expect(getDefaultLogger().info).toHaveBeenCalledWith(
85+
expect(mockLogger.info).toHaveBeenCalledWith(
8186
expect.stringContaining('PR #111'),
8287
)
83-
expect(getDefaultLogger().info).toHaveBeenCalledWith(
88+
expect(mockLogger.info).toHaveBeenCalledWith(
8489
expect.stringContaining('GHSA-update-test'),
8590
)
86-
expect(getDefaultLogger().info).toHaveBeenCalledWith(
91+
expect(mockLogger.info).toHaveBeenCalledWith(
8792
expect.stringContaining('Updated from base branch'),
8893
)
8994
})
9095

9196
it('logs superseded event with warn logger', async () => {
9297
logPrEvent('superseded', 222, 'GHSA-supersede')
9398

94-
expect(getDefaultLogger().warn).toHaveBeenCalledWith(
99+
expect(mockLogger.warn).toHaveBeenCalledWith(
95100
expect.stringContaining('PR #222'),
96101
)
97-
expect(getDefaultLogger().warn).toHaveBeenCalledWith(
102+
expect(mockLogger.warn).toHaveBeenCalledWith(
98103
expect.stringContaining('GHSA-supersede'),
99104
)
100105
})
101106

102107
it('logs failed event with error logger', async () => {
103108
logPrEvent('failed', 333, 'GHSA-fail-test', 'API error')
104109

105-
expect(getDefaultLogger().error).toHaveBeenCalledWith(
110+
expect(mockLogger.error).toHaveBeenCalledWith(
106111
expect.stringContaining('PR #333'),
107112
)
108-
expect(getDefaultLogger().error).toHaveBeenCalledWith(
113+
expect(mockLogger.error).toHaveBeenCalledWith(
109114
expect.stringContaining('GHSA-fail-test'),
110115
)
111-
expect(getDefaultLogger().error).toHaveBeenCalledWith(
116+
expect(mockLogger.error).toHaveBeenCalledWith(
112117
expect.stringContaining('API error'),
113118
)
114119
})
115120

116121
it('handles missing details parameter', async () => {
117122
logPrEvent('created', 444, 'GHSA-no-details')
118123

119-
expect(getDefaultLogger().success).toHaveBeenCalledWith(
124+
expect(mockLogger.success).toHaveBeenCalledWith(
120125
expect.stringContaining('PR #444'),
121126
)
122-
expect(getDefaultLogger().success).toHaveBeenCalledWith(
127+
expect(mockLogger.success).toHaveBeenCalledWith(
123128
expect.stringContaining('GHSA-no-details'),
124129
)
125130
// Should not include a colon when no details.
126-
expect(getDefaultLogger().success).toHaveBeenCalledWith(
131+
expect(mockLogger.success).toHaveBeenCalledWith(
127132
expect.not.stringContaining(': undefined'),
128133
)
129134
})
@@ -132,7 +137,7 @@ describe('pr-lifecycle-logger', () => {
132137
logPrEvent('created', 100, 'GHSA-colors')
133138

134139
// Should include colored checkmark for success.
135-
expect(getDefaultLogger().success).toHaveBeenCalledWith(
140+
expect(mockLogger.success).toHaveBeenCalledWith(
136141
expect.stringContaining('[green]✓[/green]'),
137142
)
138143
})

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,18 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
33
import { handleOptimize } from './handle-optimize.mts'
44

55
// Mock the dependencies.
6+
const mockLogger = vi.hoisted(() => ({
7+
fail: vi.fn(),
8+
log: vi.fn(),
9+
info: vi.fn(),
10+
success: vi.fn(),
11+
warn: vi.fn(),
12+
error: vi.fn(),
13+
}))
14+
615
vi.mock('@socketsecurity/lib/logger', () => ({
7-
logger: {
8-
info: vi.fn(),
9-
warn: vi.fn(),
10-
},
16+
getDefaultLogger: () => mockLogger,
17+
logger: mockLogger,
1118
}))
1219

1320
vi.mock('@socketsecurity/lib/debug', () => ({
@@ -270,7 +277,7 @@ describe('handleOptimize', () => {
270277
prod: false,
271278
})
272279

273-
expect(getDefaultLogger().info).toHaveBeenCalledWith(
280+
expect(mockLogger.info).toHaveBeenCalledWith(
274281
'Optimizing packages for pnpm v8.0.0.\n',
275282
)
276283
expect(applyOptimization).toHaveBeenCalledWith(

‎packages/cli/src/commands/organization/output-dependencies.test.mts‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ import type { CResult } from '../../types.mts'
1010
import type { SocketSdkSuccessResult } from '@socketsecurity/sdk'
1111

1212
// Mock the dependencies.
13-
vi.mock('@socketsecurity/lib/logger', async importOriginal => {
14-
const original = await importOriginal()
15-
const mockLogger = {
16-
fail: vi.fn(),
17-
log: vi.fn(),
18-
}
19-
return {
20-
...original,
21-
getDefaultLogger: () => mockLogger,
22-
logger: mockLogger,
23-
}
24-
})
13+
const mockLogger = vi.hoisted(() => ({
14+
fail: vi.fn(),
15+
log: vi.fn(),
16+
info: vi.fn(),
17+
success: vi.fn(),
18+
warn: vi.fn(),
19+
error: vi.fn(),
20+
}))
21+
22+
vi.mock('@socketsecurity/lib/logger', () => ({
23+
getDefaultLogger: () => mockLogger,
24+
logger: mockLogger,
25+
}))
2526

2627
vi.mock('../../utils/output/result-json.mjs', () => ({
2728
serializeResultJson: vi.fn(result => JSON.stringify(result)),

0 commit comments

Comments
 (0)