migrate more tests

1 files changed, 4 insertions, 18 deletions

diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go
index e177dd0cb..96b490a7f 100644
--- a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go
+++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go
@@ -49,21 +49,7 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
 })
 
 func handleConflictsFromSwap(t *TestDriver) {
-	continueMerge := func() {
-		t.ExpectPopup().Confirmation().
-			Title(Equals("continue")).
-			Content(Contains("all merge conflicts resolved. Continue?")).
-			Confirm()
-	}
-
-	acceptConflicts := func() {
-		t.ExpectPopup().Confirmation().
-			Title(Equals("Auto-merge failed")).
-			Content(Contains("Conflicts!")).
-			Confirm()
-	}
-
-	acceptConflicts()
+	t.Actions().AcknowledgeConflicts()
 
 	t.Views().Files().
 		IsFocused().
@@ -84,9 +70,9 @@ func handleConflictsFromSwap(t *TestDriver) {
 		SelectNextItem().
 		PressPrimaryAction() // pick "three"
 
-	continueMerge()
+	t.Actions().ContinueOnConflictsResolved()
 
-	acceptConflicts()
+	t.Actions().AcknowledgeConflicts()
 
 	t.Views().Files().
 		IsFocused().
@@ -107,7 +93,7 @@ func handleConflictsFromSwap(t *TestDriver) {
 		SelectNextItem().
 		PressPrimaryAction() // pick "two"
 
-	continueMerge()
+	t.Actions().ContinueOnConflictsResolved()
 
 	t.Views().Commits().
 		Focus().