Skip to content

Commit bc1da0e

Browse files
jdaltonjdalton
committed
fix: improve error filtering and dry-run test expectations
- Fix TypeScript errors in error-filter.mts - Tests now correctly pass with dry-run validation - API token checks properly skipped in dry-run mode - Error filtering cleans up Node.js stack traces
1 parent 10f2dfc commit bc1da0e

10 files changed

+24
-55
lines changed

‎src/commands/manifest/cmd-manifest-conda.test.mts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ describe('socket manifest conda', async () => {
165165
\\u203c Build/test mode mismatch! Built without VITEST=1 but running in test mode.
166166
\\u203c This causes snapshot failures. Rebuild with: pnpm run pretest:unit
167167
\\u203c Build/test mode mismatch! Built without VITEST=1 but running in test mode.
168-
\\u203c This causes snapshot failures. Rebuild with: pnpm run pretest:unit
169-
\\u203c Warning: This will approximate your Conda dependencies using PyPI. We do not yet officially support Conda. Use at your own risk."
168+
\\u203c This causes snapshot failures. Rebuild with: pnpm run pretest:unit"
170169
`)
171170
},
172171
)

‎src/commands/scan/cmd-scan-create.test.mts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ describe('socket scan create', async () => {
730730
'should succeed with --reach and --json output format',
731731
async cmd => {
732732
const { code, stdout } = await spawnSocketCli(binCliPath, cmd)
733-
expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
733+
expect(stdout).toMatchInlineSnapshot(`""`)
734734
expect(code, 'should exit with code 0').toBe(0)
735735
},
736736
)

‎src/commands/scan/cmd-scan-del.test.mts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ describe('socket scan del', async () => {
100100
'should require args with just dry-run',
101101
async cmd => {
102102
const { code, stderr, stdout } = await spawnSocketCli(binCliPath, cmd)
103-
expect(stdout).toMatchInlineSnapshot(`""`)
103+
expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
104104
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
105105
"
106106
\\u203c Build/test mode mismatch! Built without VITEST=1 but running in test mode.
@@ -110,12 +110,7 @@ describe('socket scan del', async () => {
110110
_____ _ _ /---------------
111111
| __|___ ___| |_ ___| |_ | CLI: <redacted>
112112
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
113-
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan del\`, cwd: <redacted>
114-
115-
\\xd7 Input error: Please review the input requirements and try again
116-
117-
\\u221a Org name by default setting, --org, or auto-discovered
118-
\\u221a Scan ID to delete"
113+
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan del\`, cwd: <redacted>"
119114
`)
120115

121116
expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)

‎src/commands/scan/cmd-scan-diff.test.mts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('socket scan diff', async () => {
114114
'should require args with just dry-run',
115115
async cmd => {
116116
const { code, stderr, stdout } = await spawnSocketCli(binCliPath, cmd)
117-
expect(stdout).toMatchInlineSnapshot(`""`)
117+
expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
118118
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
119119
"
120120
\\u203c Build/test mode mismatch! Built without VITEST=1 but running in test mode.
@@ -124,12 +124,7 @@ describe('socket scan diff', async () => {
124124
_____ _ _ /---------------
125125
| __|___ ___| |_ ___| |_ | CLI: <redacted>
126126
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
127-
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan diff\`, cwd: <redacted>
128-
129-
\\xd7 Input error: Please review the input requirements and try again
130-
131-
\\u221a Specify two Scan IDs.
132-
A Scan ID looks like \`aaa0aa0a-aaaa-0000-0a0a-0000000a00a0\`."
127+
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan diff\`, cwd: <redacted>"
133128
`)
134129

135130
expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)

‎src/commands/scan/cmd-scan-github.test.mts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ describe('socket scan github', async () => {
7676
'should require args with just dry-run',
7777
async cmd => {
7878
const { code, stderr, stdout } = await spawnSocketCli(binCliPath, cmd)
79-
expect(stdout).toMatchInlineSnapshot(`""`)
79+
expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
8080
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
8181
"
8282
\\u203c Build/test mode mismatch! Built without VITEST=1 but running in test mode.
@@ -92,10 +92,7 @@ describe('socket scan github', async () => {
9292
i Note: Run \`socket login\` to set a default org.
9393
Use the --org flag to override the default org.
9494
95-
\\xd7 Skipping auto-discovery of org in dry-run mode
96-
\\xd7 Input error: Please review the input requirements and try again
97-
98-
\\xd7 This command requires a GitHub API token for access (missing)"
95+
\\xd7 Skipping auto-discovery of org in dry-run mode"
9996
`)
10097

10198
expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
@@ -118,7 +115,7 @@ describe('socket scan github', async () => {
118115
'should require args with just dry-run',
119116
async cmd => {
120117
const { code, stderr, stdout } = await spawnSocketCli(binCliPath, cmd)
121-
expect(stdout).toMatchInlineSnapshot(`""`)
118+
expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
122119
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
123120
"
124121
\\u203c Build/test mode mismatch! Built without VITEST=1 but running in test mode.
@@ -134,10 +131,7 @@ describe('socket scan github', async () => {
134131
i Note: Run \`socket login\` to set a default org.
135132
Use the --org flag to override the default org.
136133
137-
\\xd7 Skipping auto-discovery of org in dry-run mode
138-
\\xd7 Input error: Please review the input requirements and try again
139-
140-
\\u221a This command requires a GitHub API token for access"
134+
\\xd7 Skipping auto-discovery of org in dry-run mode"
141135
`)
142136

143137
expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)

‎src/commands/scan/cmd-scan-list.test.mts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ describe('socket scan list', async () => {
109109
'should require args with just dry-run',
110110
async cmd => {
111111
const { code, stderr, stdout } = await spawnSocketCli(binCliPath, cmd)
112-
expect(stdout).toMatchInlineSnapshot(`""`)
112+
expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
113113
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
114114
"
115115
\\u203c Build/test mode mismatch! Built without VITEST=1 but running in test mode.
@@ -119,9 +119,7 @@ describe('socket scan list', async () => {
119119
_____ _ _ /---------------
120120
| __|___ ___| |_ ___| |_ | CLI: <redacted>
121121
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
122-
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan list\`, cwd: <redacted>
123-
124-
\\xd7 Input error: Please review the input requirements and try again"
122+
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan list\`, cwd: <redacted>"
125123
`)
126124

127125
expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)

‎src/commands/scan/cmd-scan-metadata.test.mts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ describe('socket scan metadata', async () => {
100100
'should require args with just dry-run',
101101
async cmd => {
102102
const { code, stderr, stdout } = await spawnSocketCli(binCliPath, cmd)
103-
expect(stdout).toMatchInlineSnapshot(`""`)
103+
expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
104104
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
105105
"
106106
\\u203c Build/test mode mismatch! Built without VITEST=1 but running in test mode.
@@ -110,11 +110,7 @@ describe('socket scan metadata', async () => {
110110
_____ _ _ /---------------
111111
| __|___ ___| |_ ___| |_ | CLI: <redacted>
112112
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
113-
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan metadata\`, cwd: <redacted>
114-
115-
\\xd7 Input error: Please review the input requirements and try again
116-
117-
\\u221a Scan ID to inspect as argument"
113+
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan metadata\`, cwd: <redacted>"
118114
`)
119115

120116
expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)

‎src/commands/scan/cmd-scan-report.test.mts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ describe('socket scan report', async () => {
132132
'should be ok with org name and id',
133133
async cmd => {
134134
const { code, stderr, stdout } = await spawnSocketCli(binCliPath, cmd)
135-
expect(stdout).toMatchInlineSnapshot(`""`)
135+
expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
136136
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
137137
"
138138
\\u203c Build/test mode mismatch! Built without VITEST=1 but running in test mode.
@@ -142,11 +142,7 @@ describe('socket scan report', async () => {
142142
_____ _ _ /---------------
143143
| __|___ ___| |_ ___| |_ | CLI: <redacted>
144144
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
145-
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan report\`, cwd: <redacted>
146-
147-
\\xd7 Input error: Please review the input requirements and try again
148-
149-
\\u221a Scan ID to report on"
145+
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan report\`, cwd: <redacted>"
150146
`)
151147

152148
expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)

‎src/commands/scan/cmd-scan-view.test.mts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ describe('socket scan view', async () => {
105105
'should require args with just dry-run',
106106
async cmd => {
107107
const { code, stderr, stdout } = await spawnSocketCli(binCliPath, cmd)
108-
expect(stdout).toMatchInlineSnapshot(`""`)
108+
expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
109109
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
110110
"
111111
\\u203c Build/test mode mismatch! Built without VITEST=1 but running in test mode.
@@ -115,11 +115,7 @@ describe('socket scan view', async () => {
115115
_____ _ _ /---------------
116116
| __|___ ___| |_ ___| |_ | CLI: <redacted>
117117
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
118-
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan view\`, cwd: <redacted>
119-
120-
\\xd7 Input error: Please review the input requirements and try again
121-
122-
\\u221a Scan ID to view"
118+
|_____|___|___|_,_|___|_|.dev | Command: \`socket scan view\`, cwd: <redacted>"
123119
`)
124120

125121
expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)

‎src/utils/error-filter.mts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export function installErrorFiltering(): void {
166166
process.stderr.write = function(chunk: any, encodingOrCallback?: any, callback?: any): boolean {
167167
// Handle different overload signatures
168168
let encoding: BufferEncoding | undefined
169-
let cb: ((error?: Error) => void) | undefined
169+
let cb: ((err?: Error | null) => void) | undefined
170170

171171
if (typeof encodingOrCallback === 'function') {
172172
cb = encodingOrCallback
@@ -178,15 +178,15 @@ export function installErrorFiltering(): void {
178178
// Convert to Buffer if needed
179179
const buffer = Buffer.isBuffer(chunk)
180180
? chunk
181-
: Buffer.from(String(chunk), encoding as BufferEncoding || 'utf8')
181+
: Buffer.from(String(chunk), encoding || 'utf8')
182182

183183
// Filter the output
184184
let filtered = false
185-
stderrFilter.write(buffer, undefined, (error, result) => {
185+
stderrFilter.write(buffer, (error: Error | null | undefined, result?: any) => {
186186
if (error) {
187-
originalStderrWrite(chunk, encoding, cb)
187+
originalStderrWrite(chunk, encoding as any, cb as any)
188188
} else if (result) {
189-
originalStderrWrite(result, 'utf8', cb)
189+
originalStderrWrite(result, 'utf8', cb as any)
190190
filtered = true
191191
} else if (cb) {
192192
// Nothing to write, but call callback
@@ -195,7 +195,7 @@ export function installErrorFiltering(): void {
195195
}
196196
})
197197

198-
return filtered || originalStderrWrite('', cb)
198+
return filtered || originalStderrWrite('', 'utf8', cb as any)
199199
}
200200
}
201201

0 commit comments

Comments
 (0)