mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 12:55:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Extend squash_fixups_in_current_branch test to check the selection

Browse source 
This shows a problem with the wrong commit being selected after squashing.
This commit is contained in:
Stefan Haller 2024-01-31 12:16:55 +01:00
parent 314efe2539
commit dfb45ba893
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/integration/tests/interactive_rebase/squash_fixups_in_current_branch.go
View file

@ -27,10 +27,12 @@ var SquashFixupsInCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{
Run: func(t *TestDriver, keys config.KeybindingConfig) { Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Commits(). t.Views().Commits().
Focus(). Focus().
SelectNextItem().
SelectNextItem().
Lines( Lines(
Contains("fixup! commit 01"), Contains("fixup! commit 01"),
Contains("commit 02"), Contains("commit 02"),
Contains("commit 01"), Contains("commit 01").IsSelected(),
Contains("fixup! master commit"), Contains("fixup! master commit"),
Contains("master commit"), Contains("master commit"),
). ).
@ -44,7 +46,7 @@ var SquashFixupsInCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{
Lines( Lines(
Contains("commit 02"), Contains("commit 02"),
Contains("commit 01"), Contains("commit 01"),
Contains("fixup! master commit"), Contains("fixup! master commit").IsSelected(), // wrong, we want the previous line
Contains("master commit"), Contains("master commit"),
). ).
NavigateToLine(Contains("commit 01")) NavigateToLine(Contains("commit 01"))