diff options
Diffstat (limited to 'pkg/integration/tests/cherry_pick/cherry_pick_range.go')
-rw-r--r-- | pkg/integration/tests/cherry_pick/cherry_pick_range.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_range.go b/pkg/integration/tests/cherry_pick/cherry_pick_range.go index 99b29618f..e68b9bd46 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_range.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_range.go @@ -66,20 +66,15 @@ var CherryPickRange = NewIntegrationTest(NewIntegrationTestArgs{ Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")). Confirm() }). + Tap(func() { + t.Views().Information().Content(DoesNotContain("commits copied")) + }). Lines( Contains("four"), Contains("three"), Contains("two"), Contains("one"), Contains("base"), - ). - Tap(func() { - // we need to manually exit out of cherry pick mode - t.Views().Information().Content(Contains("2 commits copied")) - }). - PressEscape(). - Tap(func() { - t.Views().Information().Content(DoesNotContain("commits copied")) - }) + ) }, }) |