mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -04:00
31cbabe48f
I'm not a skilled UI designer, so I suspect there may be even better options, but it's definitely already better than the raw ASCII "---" we had before. Put the line only at the beginning because it looks bad if the line after the label is misaligned when labels don't have the same width (e.g. "Remote" vs. "Local" in the divergence view).
66 lines
2 KiB
Go
66 lines
2 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var MoveUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Move an update-ref item in the rebase todo list",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
GitVersion: AtLeast("2.38.0"),
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
NewBranch("branch1").
|
|
CreateNCommits(3).
|
|
NewBranch("branch2").
|
|
CreateNCommitsStartingAt(3, 4)
|
|
|
|
shell.SetConfig("rebase.updateRefs", "true")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
NavigateToLine(Contains("commit-01")).
|
|
Press(keys.Universal.Edit).
|
|
Lines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("CI commit-06"),
|
|
Contains("pick").Contains("CI commit-05"),
|
|
Contains("pick").Contains("CI commit-04"),
|
|
Contains("update-ref").Contains("branch1"),
|
|
Contains("pick").Contains("CI commit-03"),
|
|
Contains("pick").Contains("CI commit-02"),
|
|
Contains("─── Commits"),
|
|
Contains("CI ○ commit-01"),
|
|
).
|
|
NavigateToLine(Contains("update-ref")).
|
|
Press(keys.Commits.MoveUpCommit).
|
|
Press(keys.Commits.MoveUpCommit).
|
|
Lines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("CI commit-06"),
|
|
Contains("update-ref").Contains("branch1"),
|
|
Contains("pick").Contains("CI commit-05"),
|
|
Contains("pick").Contains("CI commit-04"),
|
|
Contains("pick").Contains("CI commit-03"),
|
|
Contains("pick").Contains("CI commit-02"),
|
|
Contains("─── Commits"),
|
|
Contains("CI ○ commit-01"),
|
|
).
|
|
Tap(func() {
|
|
t.Common().ContinueRebase()
|
|
}).
|
|
Lines(
|
|
Contains("CI ○ commit-06"),
|
|
Contains("CI ○ * commit-05"),
|
|
Contains("CI ○ commit-04"),
|
|
Contains("CI ○ commit-03"),
|
|
Contains("CI ○ commit-02"),
|
|
Contains("CI ○ commit-01"),
|
|
)
|
|
},
|
|
})
|