mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-04 10:34:55 +02:00
test: update the UI to follow the new rebase type selection instead of confirm the previous popup
This commit is contained in:
parent
a3fdf91714
commit
3422b1e218
@ -30,9 +30,9 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
SelectNextItem().
|
SelectNextItem().
|
||||||
Press(keys.Branches.RebaseBranch)
|
Press(keys.Branches.RebaseBranch)
|
||||||
|
|
||||||
t.ExpectPopup().Confirmation().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Rebasing")).
|
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
|
||||||
Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")).
|
Select(Contains("Simple rebase")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.Common().AcknowledgeConflicts()
|
t.Common().AcknowledgeConflicts()
|
||||||
|
@ -36,9 +36,9 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
SelectNextItem().
|
SelectNextItem().
|
||||||
Press(keys.Branches.RebaseBranch)
|
Press(keys.Branches.RebaseBranch)
|
||||||
|
|
||||||
t.ExpectPopup().Confirmation().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Rebasing")).
|
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
|
||||||
Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")).
|
Select(Contains("Simple rebase")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.Views().Information().Content(Contains("rebasing"))
|
t.Views().Information().Content(Contains("rebasing"))
|
||||||
|
@ -39,9 +39,9 @@ var RebaseDoesNotAutosquash = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
SelectNextItem().
|
SelectNextItem().
|
||||||
Press(keys.Branches.RebaseBranch)
|
Press(keys.Branches.RebaseBranch)
|
||||||
|
|
||||||
t.ExpectPopup().Confirmation().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Rebasing")).
|
Title(Equals("Rebase 'my-branch' onto 'master'")).
|
||||||
Content(Contains("Are you sure you want to rebase 'my-branch' on top of 'master'?")).
|
Select(Contains("Simple rebase")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.Views().Commits().Lines(
|
t.Views().Commits().Lines(
|
||||||
|
Loading…
Reference in New Issue
Block a user