diff options
| author | AzraelSec <federicogerardi94@gmail.com> | 2023-03-29 15:45:06 +0200 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-04-15 17:26:08 +1000 |
| commit | 3422b1e21875461ecf76309df66b0f5b2cd929ba (patch) | |
| tree | 73084f168ea20145e70b58a2895b83885f56b02b /pkg/integration | |
| parent | a3fdf91714c460f0496627e48a86a697107f40fb (diff) | |
test: update the UI to follow the new rebase type selection instead of confirm the previous popup
Diffstat (limited to 'pkg/integration')
| -rw-r--r-- | pkg/integration/tests/branch/rebase.go | 6 | ||||
| -rw-r--r-- | pkg/integration/tests/branch/rebase_and_drop.go | 6 | ||||
| -rw-r--r-- | pkg/integration/tests/branch/rebase_does_not_autosquash.go | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go index 07b9037a3..f2c0e3287 100644 --- 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 index 298636c59..c1fc6ab2f 100644 --- 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 index 78c957a13..4465bc93b 100644 --- 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( |