go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-04 10:34:55 +02:00
Code Issues Releases Activity

test: update the UI to follow the new rebase type selection instead of confirm the previous popup

Browse Source
This commit is contained in:
AzraelSec 2023-03-29 15:45:06 +02:00 committed by Jesse Duffield
parent a3fdf91714
commit 3422b1e218
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/integration/tests/branch/rebase.go
View File

@ -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()

6
pkg/integration/tests/branch/rebase_and_drop.go
View File

@ -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"))

6
pkg/integration/tests/branch/rebase_does_not_autosquash.go
View File

@ -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(