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).
211 lines
7.2 KiB
Go
211 lines
7.2 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Do various things with range selection in the commits view when mid-rebase",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
CreateNCommits(10)
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
TopLines(
|
|
Contains("commit-10").IsSelected(),
|
|
).
|
|
NavigateToLine(Contains("commit-05")).
|
|
// Start a rebase
|
|
Press(keys.Universal.Edit).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("pick").Contains("commit-07"),
|
|
Contains("pick").Contains("commit-06"),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05").IsSelected(),
|
|
Contains("commit-04"),
|
|
).
|
|
SelectPreviousItem().
|
|
// perform various actions on a range of commits
|
|
Press(keys.Universal.RangeSelectUp).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("pick").Contains("commit-07").IsSelected(),
|
|
Contains("pick").Contains("commit-06").IsSelected(),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05"),
|
|
Contains("commit-04"),
|
|
).
|
|
Press(keys.Commits.MarkCommitAsFixup).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("fixup").Contains("commit-07").IsSelected(),
|
|
Contains("fixup").Contains("commit-06").IsSelected(),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05"),
|
|
Contains("commit-04"),
|
|
).
|
|
Press(keys.Commits.PickCommit).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("pick").Contains("commit-07").IsSelected(),
|
|
Contains("pick").Contains("commit-06").IsSelected(),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05"),
|
|
Contains("commit-04"),
|
|
).
|
|
Press(keys.Universal.Edit).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("edit").Contains("commit-07").IsSelected(),
|
|
Contains("edit").Contains("commit-06").IsSelected(),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05"),
|
|
Contains("commit-04"),
|
|
).
|
|
Press(keys.Commits.SquashDown).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("squash").Contains("commit-07").IsSelected(),
|
|
Contains("squash").Contains("commit-06").IsSelected(),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05"),
|
|
Contains("commit-04"),
|
|
).
|
|
Press(keys.Commits.MoveDownCommit).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("squash").Contains("commit-07").IsSelected(),
|
|
Contains("squash").Contains("commit-06").IsSelected(),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05"),
|
|
Contains("commit-04"),
|
|
).
|
|
Tap(func() {
|
|
t.ExpectToast(Contains("Disabled: Cannot move any further"))
|
|
}).
|
|
Press(keys.Commits.MoveUpCommit).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("squash").Contains("commit-07").IsSelected(),
|
|
Contains("squash").Contains("commit-06").IsSelected(),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05"),
|
|
Contains("commit-04"),
|
|
).
|
|
Press(keys.Commits.MoveUpCommit).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("squash").Contains("commit-07").IsSelected(),
|
|
Contains("squash").Contains("commit-06").IsSelected(),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05"),
|
|
Contains("commit-04"),
|
|
).
|
|
Press(keys.Commits.MoveUpCommit).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("squash").Contains("commit-07").IsSelected(),
|
|
Contains("squash").Contains("commit-06").IsSelected(),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05"),
|
|
Contains("commit-04"),
|
|
).
|
|
Press(keys.Commits.MoveUpCommit).
|
|
Tap(func() {
|
|
t.ExpectToast(Contains("Disabled: Cannot move any further"))
|
|
}).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("squash").Contains("commit-07").IsSelected(),
|
|
Contains("squash").Contains("commit-06").IsSelected(),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08"),
|
|
Contains("─── Commits"),
|
|
Contains("commit-05"),
|
|
Contains("commit-04"),
|
|
).
|
|
// Verify we can't perform an action on a range that includes both
|
|
// TODO and non-TODO commits
|
|
NavigateToLine(Contains("commit-08")).
|
|
Press(keys.Universal.RangeSelectDown).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("squash").Contains("commit-07"),
|
|
Contains("squash").Contains("commit-06"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08").IsSelected(),
|
|
Contains("─── Commits").IsSelected(),
|
|
Contains("commit-05").IsSelected(),
|
|
Contains("commit-04"),
|
|
).
|
|
Press(keys.Commits.MarkCommitAsFixup).
|
|
Tap(func() {
|
|
t.ExpectToast(Contains("Disabled: When rebasing, this action only works on a selection of TODO commits."))
|
|
}).
|
|
TopLines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("squash").Contains("commit-07"),
|
|
Contains("squash").Contains("commit-06"),
|
|
Contains("pick").Contains("commit-10"),
|
|
Contains("pick").Contains("commit-09"),
|
|
Contains("pick").Contains("commit-08").IsSelected(),
|
|
Contains("─── Commits").IsSelected(),
|
|
Contains("commit-05").IsSelected(),
|
|
Contains("commit-04"),
|
|
).
|
|
// continue the rebase
|
|
Tap(func() {
|
|
t.Common().ContinueRebase()
|
|
}).
|
|
TopLines(
|
|
Contains("commit-10"),
|
|
Contains("commit-09"),
|
|
Contains("commit-08"),
|
|
Contains("commit-05"),
|
|
// selected indexes are retained, though we may want to clear it
|
|
// in future (not sure what the best behaviour is right now)
|
|
Contains("commit-04").IsSelected(),
|
|
Contains("commit-03").IsSelected(),
|
|
)
|
|
},
|
|
})
|