Skip to content

Commit df771e6

Browse files
committed
chore(git): reconcile default branch before fleet cascade
2 parents 30ab6f7 + 19b7619 commit df771e6

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

.config/repo/socket-wheelhouse.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,19 +174,15 @@
174174
]
175175
},
176176
"workspace": {
177-
"catalogDriftIgnore": [
178-
"typescript"
179-
]
177+
"catalogDriftIgnore": ["typescript"]
180178
},
181179
"vitest": {
182180
"lanes": {
183181
"mid": [
184182
"packages/cli/test/unit/commands/**",
185183
"packages/cli/test/unit/meow.test.mts"
186184
],
187-
"slow": [
188-
"packages/cli/test/integration/**"
189-
]
185+
"slow": ["packages/cli/test/integration/**"]
190186
}
191187
}
192188
}

packages/cli/test/unit/util/cli/with-subcommands.test.mts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,7 @@ describe('meow-with-subcommands', () => {
888888
})
889889

890890
it('handles dryRun without --help', async () => {
891+
const exitSpy = vi.spyOn(process, 'exit')
891892
const subcommands = {
892893
scan: {
893894
description: 'scan',
@@ -902,7 +903,7 @@ describe('meow-with-subcommands', () => {
902903
subcommands,
903904
}),
904905
).rejects.toBe(processExitError)
905-
expect(process.exit).toHaveBeenCalledWith(0)
906+
expect(exitSpy).toHaveBeenCalledWith(0)
906907
expect(subcommands.scan.run).not.toHaveBeenCalled()
907908
})
908909

0 commit comments

Comments
 (0)