From dfb45ba893200f09cdeceef281de65169757059c Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Wed, 31 Jan 2024 12:16:55 +0100 Subject: [PATCH] Extend squash_fixups_in_current_branch test to check the selection This shows a problem with the wrong commit being selected after squashing. --- .../interactive_rebase/squash_fixups_in_current_branch.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/integration/tests/interactive_rebase/squash_fixups_in_current_branch.go b/pkg/integration/tests/interactive_rebase/squash_fixups_in_current_branch.go index 636810533..75bfbf159 100644 --- a/pkg/integration/tests/interactive_rebase/squash_fixups_in_current_branch.go +++ b/pkg/integration/tests/interactive_rebase/squash_fixups_in_current_branch.go @@ -27,10 +27,12 @@ var SquashFixupsInCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). Focus(). + SelectNextItem(). + SelectNextItem(). Lines( Contains("fixup! commit 01"), Contains("commit 02"), - Contains("commit 01"), + Contains("commit 01").IsSelected(), Contains("fixup! master commit"), Contains("master commit"), ). @@ -44,7 +46,7 @@ var SquashFixupsInCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Contains("commit 02"), Contains("commit 01"), - Contains("fixup! master commit"), + Contains("fixup! master commit").IsSelected(), // wrong, we want the previous line Contains("master commit"), ). NavigateToLine(Contains("commit 01"))