test: update the UI to follow the new rebase type selection instead o…

…f confirm the previous popup
noahziheng · Apr 15, 2023 · 3422b1e · 3422b1e
1 parent a3fdf91
commit 3422b1e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go
@@ -30,9 +30,9 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
 			SelectNextItem().
 			Press(keys.Branches.RebaseBranch)
 
-		t.ExpectPopup().Confirmation().
-			Title(Equals("Rebasing")).
-			Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")).
+		t.ExpectPopup().Menu().
+			Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
+			Select(Contains("Simple rebase")).
 			Confirm()
 
 		t.Common().AcknowledgeConflicts()

diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go
@@ -36,9 +36,9 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
 			SelectNextItem().
 			Press(keys.Branches.RebaseBranch)
 
-		t.ExpectPopup().Confirmation().
-			Title(Equals("Rebasing")).
-			Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")).
+		t.ExpectPopup().Menu().
+			Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
+			Select(Contains("Simple rebase")).
 			Confirm()
 
 		t.Views().Information().Content(Contains("rebasing"))

diff --git a/pkg/integration/tests/branch/rebase_does_not_autosquash.go b/pkg/integration/tests/branch/rebase_does_not_autosquash.go
@@ -39,9 +39,9 @@ var RebaseDoesNotAutosquash = NewIntegrationTest(NewIntegrationTestArgs{
 			SelectNextItem().
 			Press(keys.Branches.RebaseBranch)
 
-		t.ExpectPopup().Confirmation().
-			Title(Equals("Rebasing")).
-			Content(Contains("Are you sure you want to rebase 'my-branch' on top of 'master'?")).
+		t.ExpectPopup().Menu().
+			Title(Equals("Rebase 'my-branch' onto 'master'")).
+			Select(Contains("Simple rebase")).
 			Confirm()
 
 		t.Views().Commits().Lines(