From f7e8b2dd7194ef32f6644481c974602bd8059c9c Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 26 Feb 2023 11:49:15 +1100 Subject: cleanup integration test code --- pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/integration/tests/cherry_pick') 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() -- cgit v1.2.3