mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-08-10 22:42:00 +02:00
Add test demonstrating the current (undesired) behavior
This commit is contained in:
@@ -0,0 +1,56 @@
|
|||||||
|
package interactive_rebase
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/jesseduffield/lazygit/pkg/config"
|
||||||
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||||
|
)
|
||||||
|
|
||||||
|
var DontShowBranchHeadsForTodoItems = NewIntegrationTest(NewIntegrationTestArgs{
|
||||||
|
Description: "Check that branch heads are shown for normal commits during interactive rebase, but not for todo items",
|
||||||
|
ExtraCmdArgs: []string{},
|
||||||
|
Skip: false,
|
||||||
|
GitVersion: AtLeast("2.38.0"),
|
||||||
|
SetupConfig: func(config *config.AppConfig) {
|
||||||
|
config.AppState.GitLogShowGraph = "never"
|
||||||
|
},
|
||||||
|
SetupRepo: func(shell *Shell) {
|
||||||
|
shell.
|
||||||
|
NewBranch("branch1").
|
||||||
|
CreateNCommits(2).
|
||||||
|
NewBranch("branch2").
|
||||||
|
CreateNCommitsStartingAt(4, 3).
|
||||||
|
NewBranch("branch3").
|
||||||
|
CreateNCommitsStartingAt(3, 7)
|
||||||
|
|
||||||
|
shell.SetConfig("rebase.updateRefs", "true")
|
||||||
|
},
|
||||||
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||||
|
t.Views().Commits().
|
||||||
|
Focus().
|
||||||
|
Lines(
|
||||||
|
Contains("CI commit 09"),
|
||||||
|
Contains("CI commit 08"),
|
||||||
|
Contains("CI commit 07"),
|
||||||
|
Contains("CI * commit 06"),
|
||||||
|
Contains("CI commit 05"),
|
||||||
|
Contains("CI commit 04"),
|
||||||
|
Contains("CI commit 03"),
|
||||||
|
Contains("CI * commit 02"),
|
||||||
|
Contains("CI commit 01"),
|
||||||
|
).
|
||||||
|
NavigateToLine(Contains("commit 04")).
|
||||||
|
Press(keys.Universal.Edit).
|
||||||
|
Lines(
|
||||||
|
Contains("pick").Contains("CI commit 09"),
|
||||||
|
Contains("pick").Contains("CI commit 08"),
|
||||||
|
Contains("pick").Contains("CI commit 07"),
|
||||||
|
Contains("update-ref").Contains("branch2"),
|
||||||
|
Contains("pick").Contains("CI * commit 06"), // the star is undesired here; it's confusing because of the update-ref right above
|
||||||
|
Contains("pick").Contains("CI commit 05"),
|
||||||
|
Contains("CI <-- YOU ARE HERE --- commit 04"),
|
||||||
|
Contains("CI commit 03"),
|
||||||
|
Contains("CI * commit 02"), // this star is fine though
|
||||||
|
Contains("CI commit 01"),
|
||||||
|
)
|
||||||
|
},
|
||||||
|
})
|
@@ -162,6 +162,7 @@ var tests = []*components.IntegrationTest{
|
|||||||
interactive_rebase.AmendHeadCommitDuringRebase,
|
interactive_rebase.AmendHeadCommitDuringRebase,
|
||||||
interactive_rebase.AmendMerge,
|
interactive_rebase.AmendMerge,
|
||||||
interactive_rebase.AmendNonHeadCommitDuringRebase,
|
interactive_rebase.AmendNonHeadCommitDuringRebase,
|
||||||
|
interactive_rebase.DontShowBranchHeadsForTodoItems,
|
||||||
interactive_rebase.DropTodoCommitWithUpdateRef,
|
interactive_rebase.DropTodoCommitWithUpdateRef,
|
||||||
interactive_rebase.DropWithCustomCommentChar,
|
interactive_rebase.DropWithCustomCommentChar,
|
||||||
interactive_rebase.EditFirstCommit,
|
interactive_rebase.EditFirstCommit,
|
||||||
|
Reference in New Issue
Block a user