mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 02:24:49 -05:00
Stefan Haller
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).
77 lines
2.3 KiB
Go
77 lines
2.3 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Delete an update-ref item from 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.Universal.Remove).
|
|
Tap(func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Drop commit")).
|
|
Content(Contains("Are you sure you want to delete the selected update-ref todo(s)?")).
|
|
Confirm()
|
|
}).
|
|
Lines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("CI commit-06"),
|
|
Contains("pick").Contains("CI commit-05"),
|
|
Contains("pick").Contains("CI commit-04"),
|
|
Contains("pick").Contains("CI commit-03").IsSelected(),
|
|
Contains("pick").Contains("CI commit-02"),
|
|
Contains("─── Commits"),
|
|
Contains("CI ○ commit-01"),
|
|
).
|
|
NavigateToLine(Contains("commit-02")).
|
|
Press(keys.Universal.Remove).
|
|
Tap(func() {
|
|
t.Common().ContinueRebase()
|
|
}).
|
|
Lines(
|
|
Contains("CI ○ commit-06"),
|
|
Contains("CI ○ commit-05"),
|
|
Contains("CI ○ commit-04"),
|
|
Contains("CI ○ commit-03"), // No star on this commit, so there's no branch head here
|
|
Contains("CI ○ commit-01"),
|
|
)
|
|
|
|
t.Views().Branches().
|
|
Lines(
|
|
Contains("branch2"),
|
|
Contains("branch1"),
|
|
)
|
|
},
|
|
})
|