diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-12-27 11:21:44 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-12-27 21:26:18 +1100 |
| commit | 8052ac4fd6f4ea96fbfb7a3ff16799ba981be82a (patch) | |
| tree | 7ad44f3389865072f67bcd3aeb111da3b5ad3822 /pkg/integration/tests/cherry_pick | |
| parent | c976839a632c61917bcc81dbaea8ec32cf5249e8 (diff) | |
add prompt asserter
Diffstat (limited to 'pkg/integration/tests/cherry_pick')
| -rw-r--r-- | pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index 1359c1d66..31c64664f 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -47,7 +47,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ input.Press(keys.Commits.PasteCommits) input.Alert(Equals("Cherry-Pick"), Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")) - input.InConfirm(). + input.Confirmation(). Title(Equals("Auto-merge failed")). Content(Contains("Conflicts!")). Confirm() @@ -64,7 +64,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ input.NextItem() input.PrimaryAction() - input.InConfirm(). + input.Confirmation(). Title(Equals("continue")). Content(Contains("all merge conflicts resolved. Continue?")). Confirm() |