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/sync/pull_merge_conflict.go | |
| parent | 8b5d59c2380c9d4c78d148d8ee0cecdfa556f1f5 (diff) | |
cleanup integration test code
Diffstat (limited to 'pkg/integration/tests/sync/pull_merge_conflict.go')
| -rw-r--r-- | pkg/integration/tests/sync/pull_merge_conflict.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/integration/tests/sync/pull_merge_conflict.go b/pkg/integration/tests/sync/pull_merge_conflict.go index 447c11135..2b4247584 100644 --- a/pkg/integration/tests/sync/pull_merge_conflict.go +++ b/pkg/integration/tests/sync/pull_merge_conflict.go @@ -40,7 +40,7 @@ var PullMergeConflict = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Press(keys.Universal.Pull) - t.Actions().AcknowledgeConflicts() + t.Common().AcknowledgeConflicts() t.Views().Files(). IsFocused(). @@ -60,7 +60,7 @@ var PullMergeConflict = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction() // choose 'content4' - t.Actions().ContinueOnConflictsResolved() + t.Common().ContinueOnConflictsResolved() t.Views().Status().Content(Contains("↑2 repo → master")) |