diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-26 11:49:15 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-26 12:54:13 +1100 |
| commit | f7e8b2dd7194ef32f6644481c974602bd8059c9c (patch) | |
| tree | 492a01ffb1367311bec75099cb21e5383e6ced0f /pkg/integration/tests/cherry_pick | |
| parent | 8b5d59c2380c9d4c78d148d8ee0cecdfa556f1f5 (diff) | |
cleanup integration test code
Diffstat (limited to 'pkg/integration/tests/cherry_pick')
| -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() |