mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-08-08 22:36:49 +02:00
Regression test for renaming the last commit of a stacked branch
I almost broke this during the development of this branch, so add a test to guard against that. The point here is that the stack remains intact, i.e. the renamed commit is the head of the lower branch, and thus shows the "*".
This commit is contained in:
@ -0,0 +1,55 @@
|
||||
package interactive_rebase
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
)
|
||||
|
||||
var RewordLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Rewords the last commit of a branch in the middle of a stack",
|
||||
ExtraCmdArgs: []string{},
|
||||
Skip: false,
|
||||
GitVersion: AtLeast("2.38.0"),
|
||||
SetupConfig: func(config *config.AppConfig) {
|
||||
config.GetUserConfig().Git.MainBranches = []string{"master"}
|
||||
config.GetAppState().GitLogShowGraph = "never"
|
||||
},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shell.
|
||||
CreateNCommits(1).
|
||||
NewBranch("branch1").
|
||||
CreateNCommitsStartingAt(2, 2).
|
||||
NewBranch("branch2").
|
||||
CreateNCommitsStartingAt(2, 4)
|
||||
|
||||
shell.SetConfig("rebase.updateRefs", "true")
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Commits().
|
||||
Focus().
|
||||
Lines(
|
||||
Contains("CI commit 05").IsSelected(),
|
||||
Contains("CI commit 04"),
|
||||
Contains("CI * commit 03"),
|
||||
Contains("CI commit 02"),
|
||||
Contains("CI commit 01"),
|
||||
).
|
||||
NavigateToLine(Contains("commit 03")).
|
||||
Press(keys.Commits.RenameCommit).
|
||||
Tap(func() {
|
||||
t.ExpectPopup().CommitMessagePanel().
|
||||
Title(Equals("Reword commit")).
|
||||
InitialText(Equals("commit 03")).
|
||||
Clear().
|
||||
Type("renamed 03").
|
||||
Confirm()
|
||||
}).
|
||||
Lines(
|
||||
Contains("CI commit 05"),
|
||||
Contains("CI commit 04"),
|
||||
Contains("CI * renamed 03"),
|
||||
Contains("CI commit 02"),
|
||||
Contains("CI commit 01"),
|
||||
)
|
||||
},
|
||||
})
|
@ -274,6 +274,7 @@ var tests = []*components.IntegrationTest{
|
||||
interactive_rebase.RewordCommitWithEditorAndFail,
|
||||
interactive_rebase.RewordFirstCommit,
|
||||
interactive_rebase.RewordLastCommit,
|
||||
interactive_rebase.RewordLastCommitOfStackedBranch,
|
||||
interactive_rebase.RewordYouAreHereCommit,
|
||||
interactive_rebase.RewordYouAreHereCommitWithEditor,
|
||||
interactive_rebase.ShowExecTodos,
|
||||
|
Reference in New Issue
Block a user