diff options
Diffstat (limited to 'pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go')
-rw-r--r-- | pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index 9b97be5db..9c02cc8d0 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -31,11 +31,10 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ Contains("second-change-branch unrelated change"), Contains("second change"), ). - Press(keys.Commits.CherryPickCopy) - - input.Views().Information().Content(Contains("1 commit copied")) - - input.Views().SubCommits(). + Press(keys.Commits.CherryPickCopy). + Tap(func() { + input.Views().Information().Content(Contains("1 commit copied")) + }). SelectNextItem(). Press(keys.Commits.CherryPickCopy) @@ -80,20 +79,20 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ Contains("second change"), Contains("first change"), ). - SelectNextItem() - - // because we picked 'Second change' when resolving the conflict, - // we now see this commit as having replaced First Change with Second Change, - // as opposed to replacing 'Original' with 'Second change' - input.Views().Main(). - Content(Contains("-First Change")). - Content(Contains("+Second Change")) - - input.Views().Information().Content(Contains("2 commits copied")) - - input.Views().Commits(). - PressEscape() - - input.Views().Information().Content(DoesNotContain("commits copied")) + SelectNextItem(). + Tap(func() { + // because we picked 'Second change' when resolving the conflict, + // we now see this commit as having replaced First Change with Second Change, + // as opposed to replacing 'Original' with 'Second change' + input.Views().Main(). + Content(Contains("-First Change")). + Content(Contains("+Second Change")) + + input.Views().Information().Content(Contains("2 commits copied")) + }). + PressEscape(). + Tap(func() { + input.Views().Information().Content(DoesNotContain("commits copied")) + }) }, }) |