Skip to content

Commit ff715ef

Browse files
jfblaajfblaa
committed
Make the CLI-banner-version test normalization suffix-aware
Root cause of the flaky snapshot mismatches on this PR: whether the CLI itself redacts its version banner (VITEST baked in at build time) or prints the real one and leaves redaction to this test helper depends on env propagation into the build step, not just the test run - so the same source can produce either "<redacted>" or the real "vX.Y.Z-prerelease" depending on how it was built. normalizeBanner's regex only stripped a bare "vX.Y.Z", leaving a trailing prerelease suffix dangling in one case but not the other. Broadened it to match a trailing prerelease/build suffix and to be idempotent on an already-redacted value, so both cases normalize identically. Refreshed the now-correct snapshots.
1 parent 0ce3863 commit ff715ef

8 files changed

Lines changed: 25 additions & 19 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('socket manifest auto', async () => {
4242
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
4343
"
4444
_____ _ _ /---------------
45-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
45+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
4646
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
4747
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest auto\`, cwd: <redacted>"
4848
`)
@@ -63,7 +63,7 @@ describe('socket manifest auto', async () => {
6363
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
6464
"
6565
_____ _ _ /---------------
66-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
66+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
6767
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
6868
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest auto\`, cwd: <redacted>"
6969
`)

‎src/commands/manifest/cmd-manifest-dynamic-sbom-inference.test.mts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('socket manifest dynamic-sbom-inference', async () => {
4242
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
4343
"
4444
_____ _ _ /---------------
45-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
45+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
4646
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
4747
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest dynamic-sbom-inference\`, cwd: <redacted>"
4848
`)
@@ -65,7 +65,7 @@ describe('socket manifest dynamic-sbom-inference', async () => {
6565
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
6666
"
6767
_____ _ _ /---------------
68-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
68+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
6969
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
7070
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest dynamic-sbom-inference\`, cwd: <redacted>"
7171
`)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ describe('socket manifest gradle', async () => {
6565
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
6666
"
6767
_____ _ _ /---------------
68-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
68+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
6969
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
7070
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest gradle\`, cwd: <redacted>"
7171
`)
@@ -86,7 +86,7 @@ describe('socket manifest gradle', async () => {
8686
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
8787
"
8888
_____ _ _ /---------------
89-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
89+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
9090
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
9191
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest gradle\`, cwd: <redacted>"
9292
`)
@@ -104,7 +104,7 @@ describe('socket manifest gradle', async () => {
104104
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
105105
"
106106
_____ _ _ /---------------
107-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
107+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
108108
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
109109
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest gradle\`, cwd: <redacted>"
110110
`)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ describe('socket manifest kotlin', async () => {
6565
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
6666
"
6767
_____ _ _ /---------------
68-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
68+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
6969
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
7070
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest kotlin\`, cwd: <redacted>"
7171
`)
@@ -86,7 +86,7 @@ describe('socket manifest kotlin', async () => {
8686
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
8787
"
8888
_____ _ _ /---------------
89-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
89+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
9090
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
9191
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest kotlin\`, cwd: <redacted>"
9292
`)
@@ -104,7 +104,7 @@ describe('socket manifest kotlin', async () => {
104104
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
105105
"
106106
_____ _ _ /---------------
107-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
107+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
108108
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
109109
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest kotlin\`, cwd: <redacted>"
110110
`)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('socket manifest maven', async () => {
5353
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
5454
"
5555
_____ _ _ /---------------
56-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
56+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
5757
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
5858
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest maven\`, cwd: <redacted>"
5959
`)
@@ -74,7 +74,7 @@ describe('socket manifest maven', async () => {
7474
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
7575
"
7676
_____ _ _ /---------------
77-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
77+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
7878
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
7979
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest maven\`, cwd: <redacted>"
8080
`)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ describe('socket manifest scala', async () => {
7979
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
8080
"
8181
_____ _ _ /---------------
82-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
82+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
8383
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
8484
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest scala\`, cwd: <redacted>"
8585
`)
@@ -100,7 +100,7 @@ describe('socket manifest scala', async () => {
100100
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
101101
"
102102
_____ _ _ /---------------
103-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
103+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
104104
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
105105
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest scala\`, cwd: <redacted>"
106106
`)
@@ -118,7 +118,7 @@ describe('socket manifest scala', async () => {
118118
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
119119
"
120120
_____ _ _ /---------------
121-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
121+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
122122
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
123123
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest scala\`, cwd: <redacted>"
124124
`)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe('socket manifest setup', async () => {
5252
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
5353
"
5454
_____ _ _ /---------------
55-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
55+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
5656
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
5757
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest setup\`, cwd: <redacted>"
5858
`)
@@ -73,7 +73,7 @@ describe('socket manifest setup', async () => {
7373
expect(`\n ${stderr}`).toMatchInlineSnapshot(`
7474
"
7575
_____ _ _ /---------------
76-
| __|___ ___| |_ ___| |_ | CLI: <redacted>-prerelease
76+
| __|___ ___| |_ ___| |_ | CLI: <redacted>
7777
|__ | * | _| '_| -_| _| | token: <redacted>, org: <redacted>
7878
|_____|___|___|_,_|___|_|.dev | Command: \`socket manifest setup\`, cwd: <redacted>"
7979
`)

‎test/utils.mts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,14 @@ function normalizeCoanaVersion(str: string): string {
6969
function normalizeBanner(str: string): string {
7070
return (
7171
str
72-
// Replace CLI version like "v1.1.67" with "<redacted>".
73-
.replace(/\| CLI: v[\d.]+/g, '| CLI: <redacted>')
72+
// Replace a version like "v1.1.67" or "v1.1.67-prerelease" with
73+
// "<redacted>" - also matches an already-redacted value, since whether
74+
// the CLI itself redacts depends on env baked in at build time, not
75+
// just this test run.
76+
.replace(
77+
/\| CLI: (?:v[\d.]+(?:[-+][\w.]+)?|<redacted>)/g,
78+
'| CLI: <redacted>',
79+
)
7480
// Replace token and org info with "<redacted>".
7581
.replace(
7682
/\| (?:Node: [^,]+, )?token: [^,]+, (?:org: [^\n"]+)/g,

0 commit comments

Comments
 (0)