Skip to content

Commit 1bd562b

Browse files
committed
Fix quoted migration recovery path assertions on Windows
1 parent 7ef214b commit 1bd562b

1 file changed

Lines changed: 18 additions & 1 deletion

File tree

‎cmd/utils_test.go‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,24 @@ func TestStackStateDir_PreservesMigrationBlockedError(t *testing.T) {
380380
assert.Contains(t, blocked.RecoveryPaths, journal)
381381
out, diagnostics := commandOutput(t, cfg, outR, errR)
382382
assert.Empty(t, out)
383-
assert.Contains(t, diagnostics, journal)
383+
assert.Contains(t, diagnostics, fmt.Sprintf("%q", journal))
384+
}
385+
386+
func TestStackStateError_PreservesWindowsRecoveryPath(t *testing.T) {
387+
journal := `C:\Users\Example Worktree\.git\worktrees\original\gh-stack-rebase-state`
388+
cause := &stack.MigrationBlockedError{RecoveryPaths: []string{journal}}
389+
cfg, outR, errR := config.NewTestConfig()
390+
391+
err := stackStateError(cfg, "migrating stack state", cause)
392+
393+
assert.ErrorIs(t, err, ErrSilent)
394+
var blocked *stack.MigrationBlockedError
395+
require.ErrorAs(t, err, &blocked)
396+
assert.Same(t, cause, blocked)
397+
assert.Equal(t, []string{journal}, blocked.RecoveryPaths)
398+
out, diagnostics := commandOutput(t, cfg, outR, errR)
399+
assert.Empty(t, out)
400+
assert.Contains(t, diagnostics, `"C:\\Users\\Example Worktree\\.git\\worktrees\\original\\gh-stack-rebase-state"`)
384401
}
385402

386403
func TestStackStateHelpers_PreserveLockError(t *testing.T) {

0 commit comments

Comments
 (0)