1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-09 13:47:11 +02:00

Add an integration test showing a problem with autosquash during normal rebase

For users who have the rebase.autoSquash git config set to true, any regular
rebase will squash fixups in addition to rebasing. Not good -- we'll fix that in
the next commit.
This commit is contained in:
stk 2023-02-09 17:29:09 +01:00
parent c713d19383
commit e357c00d4d
2 changed files with 57 additions and 0 deletions

View File

@ -0,0 +1,56 @@
package branch
import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
var RebaseDoesNotAutosquash = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Rebase a branch that has fixups onto another branch, and verify that the fixups are not squashed even if rebase.autoSquash is enabled globally.",
ExtraCmdArgs: "",
Skip: false,
SetupConfig: func(config *config.AppConfig) {},
SetupRepo: func(shell *Shell) {
shell.SetConfig("rebase.autoSquash", "true")
shell.
EmptyCommit("base").
NewBranch("my-branch").
Checkout("master").
EmptyCommit("master commit").
Checkout("my-branch").
EmptyCommit("branch commit").
EmptyCommit("fixup! branch commit")
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Commits().
Lines(
Contains("fixup! branch commit"),
Contains("branch commit"),
Contains("base"),
)
t.Views().Branches().
Focus().
Lines(
Contains("my-branch").IsSelected(),
Contains("master"),
).
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'?")).
Confirm()
t.Views().Commits().Lines(
/* Expected the fixup to be kept, but it's gone:
Contains("fixup! branch commit"),
*/
Contains("branch commit"),
Contains("master commit"),
Contains("base"),
)
},
})

View File

@ -37,6 +37,7 @@ var tests = []*components.IntegrationTest{
branch.Delete,
branch.Rebase,
branch.RebaseAndDrop,
branch.RebaseDoesNotAutosquash,
branch.Suggestions,
branch.Reset,
branch.DetachedHead,