From 22c10479d528d3d9982f142139f82a8c764a550d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 22 Feb 2023 21:15:03 +1100 Subject: migrate reflog integration tests --- pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkg/integration/tests/cherry_pick') 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")). -- cgit v1.2.3