diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-12-27 10:50:00 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-12-27 21:26:17 +1100 |
| commit | c976839a632c61917bcc81dbaea8ec32cf5249e8 (patch) | |
| tree | 9854468690e2f77c044061f9a4521a2f7e62ae23 /pkg/integration/tests/cherry_pick | |
| parent | 17140e1d8dd84de6dca12fce8d0e7ed9b57d6177 (diff) | |
refactor prompt handling in integration tests
Diffstat (limited to 'pkg/integration/tests/cherry_pick')
| -rw-r--r-- | pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go | 10 |
1 files changed, 8 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 4ed310e1d..1359c1d66 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -47,7 +47,10 @@ 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.AcceptConfirmation(Equals("Auto-merge failed"), Contains("Conflicts!")) + input.InConfirm(). + Title(Equals("Auto-merge failed")). + Content(Contains("Conflicts!")). + Confirm() assert.CurrentView().Name("files") assert.CurrentView().SelectedLine(Contains("file")) @@ -61,7 +64,10 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ input.NextItem() input.PrimaryAction() - input.AcceptConfirmation(Equals("continue"), Contains("all merge conflicts resolved. Continue?")) + input.InConfirm(). + Title(Equals("continue")). + Content(Contains("all merge conflicts resolved. Continue?")). + Confirm() assert.CurrentView().Name("files") assert.WorkingTreeFileCount(0) |