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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index 3e82de065..a0030c2f9 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -52,7 +52,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")). Confirm() - t.Actions().AcknowledgeConflicts() + t.Common().AcknowledgeConflicts() t.Views().Files(). IsFocused(). @@ -65,7 +65,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). PressPrimaryAction() - t.Actions().ContinueOnConflictsResolved() + t.Common().ContinueOnConflictsResolved() t.Views().Files().IsEmpty() |