diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-12-27 11:34:41 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-12-27 21:26:18 +1100 |
| commit | 926ed7b9b2f8119079c0d57f65e67dc4b93ecf7e (patch) | |
| tree | 0ca30be6a6578dd1345d41444e4816254bdbb94a /pkg/integration/tests/cherry_pick | |
| parent | 8052ac4fd6f4ea96fbfb7a3ff16799ba981be82a (diff) | |
more refactoring of popup stuff
Diffstat (limited to 'pkg/integration/tests/cherry_pick')
| -rw-r--r-- | pkg/integration/tests/cherry_pick/cherry_pick.go | 5 | ||||
| -rw-r--r-- | pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkg/integration/tests/cherry_pick/cherry_pick.go b/pkg/integration/tests/cherry_pick/cherry_pick.go index e79e35b19..631685577 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick.go @@ -58,7 +58,10 @@ var CherryPick = 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.Alert(). + Title(Equals("Cherry-Pick")). + Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")). + Confirm() assert.CurrentView().Name("commits").Lines( Contains("four"), diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index 31c64664f..8efb94e5d 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -45,7 +45,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.Alert().Title(Equals("Cherry-Pick")).Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).Confirm() input.Confirmation(). Title(Equals("Auto-merge failed")). |