diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-22 21:15:03 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-22 21:15:03 +1100 |
| commit | 22c10479d528d3d9982f142139f82a8c764a550d (patch) | |
| tree | 553e4fcec0da411783d114dfc363c9c59a5472f1 /pkg/integration/tests/cherry_pick | |
| parent | f0572238cb577656edb18ea9688af3c243b7d25d (diff) | |
migrate reflog integration tests
Diffstat (limited to 'pkg/integration/tests/cherry_pick')
| -rw-r--r-- | pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index df9988c2a..eaf9862d6 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{ ). Press(keys.Commits.PasteCommits) - t.ExpectPopup().Alert().Title(Equals("Cherry-Pick")).Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).Confirm() + t.ExpectPopup().Alert(). + Title(Equals("Cherry-Pick")). + Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")). + Confirm() t.ExpectPopup().Confirmation(). Title(Equals("Auto-merge failed")). |