ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

Allow showing Disabled errors as error panel instead of toast

Browse Source
This commit is contained in:
Stefan Haller
2024-01-13 20:30:18 +01:00
parent 84e1d15079
commit 83337d9fa8
5 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/integration/tests/interactive_rebase/quick_start.go
View File

@@ -52,7 +52,10 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{
// Verify we can't quick start from main
Press(keys.Commits.StartInteractiveRebase)
t.ExpectToast(Equals("Disabled: Cannot start interactive rebase: the HEAD commit is a merge commit or is present on the main branch, so there is no appropriate base commit to start the rebase from. You can start an interactive rebase from a specific commit by selecting the commit and pressing `e`."))
t.ExpectPopup().Alert().
Title(Equals("Error")).
Content(Equals("Cannot start interactive rebase: the HEAD commit is a merge commit or is present on the main branch, so there is no appropriate base commit to start the rebase from. You can start an interactive rebase from a specific commit by selecting the commit and pressing `e`.")).
Confirm()
t.Views().Branches().
Focus().