mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-21 22:43:27 +02:00
Add tests for preserving the selection when pressing 'i'
Preserving the selection for a non-range selection already works as expected; however, the test for a selection range shows an undesired behavior.
This commit is contained in:
parent
f226a277bf
commit
d28a2ec059
@ -0,0 +1,51 @@
|
|||||||
|
package interactive_rebase
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/jesseduffield/lazygit/pkg/config"
|
||||||
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||||
|
)
|
||||||
|
|
||||||
|
var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{
|
||||||
|
Description: "Starts an interactive rebase and checks that the same commit stays selected",
|
||||||
|
ExtraCmdArgs: []string{},
|
||||||
|
Skip: false,
|
||||||
|
GitVersion: AtLeast("2.38.0"),
|
||||||
|
SetupConfig: func(config *config.AppConfig) {
|
||||||
|
config.GetUserConfig().Git.MainBranches = []string{"master"}
|
||||||
|
},
|
||||||
|
SetupRepo: func(shell *Shell) {
|
||||||
|
shell.
|
||||||
|
CreateNCommits(1).
|
||||||
|
NewBranch("branch1").
|
||||||
|
CreateNCommitsStartingAt(3, 2).
|
||||||
|
NewBranch("branch2").
|
||||||
|
CreateNCommitsStartingAt(3, 5)
|
||||||
|
|
||||||
|
shell.SetConfig("rebase.updateRefs", "true")
|
||||||
|
},
|
||||||
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||||
|
t.Views().Commits().
|
||||||
|
Focus().
|
||||||
|
Lines(
|
||||||
|
Contains("CI commit 07").IsSelected(),
|
||||||
|
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 02")).
|
||||||
|
Press(keys.Commits.StartInteractiveRebase).
|
||||||
|
Lines(
|
||||||
|
Contains("pick").Contains("CI commit 07"),
|
||||||
|
Contains("pick").Contains("CI commit 06"),
|
||||||
|
Contains("pick").Contains("CI commit 05"),
|
||||||
|
Contains("update-ref").Contains("branch1"),
|
||||||
|
Contains("pick").Contains("CI * commit 04"),
|
||||||
|
Contains("pick").Contains("CI commit 03"),
|
||||||
|
Contains("CI commit 02").IsSelected(),
|
||||||
|
Contains("CI <-- YOU ARE HERE --- commit 01"),
|
||||||
|
)
|
||||||
|
},
|
||||||
|
})
|
@ -0,0 +1,57 @@
|
|||||||
|
package interactive_rebase
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/jesseduffield/lazygit/pkg/config"
|
||||||
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||||
|
)
|
||||||
|
|
||||||
|
var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{
|
||||||
|
Description: "Starts an interactive rebase and checks that the same commit range stays selected",
|
||||||
|
ExtraCmdArgs: []string{},
|
||||||
|
Skip: false,
|
||||||
|
GitVersion: AtLeast("2.38.0"),
|
||||||
|
SetupConfig: func(config *config.AppConfig) {
|
||||||
|
config.GetUserConfig().Git.MainBranches = []string{"master"}
|
||||||
|
},
|
||||||
|
SetupRepo: func(shell *Shell) {
|
||||||
|
shell.
|
||||||
|
CreateNCommits(1).
|
||||||
|
NewBranch("branch1").
|
||||||
|
CreateNCommitsStartingAt(2, 2).
|
||||||
|
NewBranch("branch2").
|
||||||
|
CreateNCommitsStartingAt(2, 4).
|
||||||
|
NewBranch("branch3").
|
||||||
|
CreateNCommitsStartingAt(2, 6)
|
||||||
|
|
||||||
|
shell.SetConfig("rebase.updateRefs", "true")
|
||||||
|
},
|
||||||
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||||
|
t.Views().Commits().
|
||||||
|
Focus().
|
||||||
|
NavigateToLine(Contains("commit 04")).
|
||||||
|
Press(keys.Universal.RangeSelectDown).
|
||||||
|
Press(keys.Universal.RangeSelectDown).
|
||||||
|
Lines(
|
||||||
|
Contains("CI commit 07"),
|
||||||
|
Contains("CI commit 06"),
|
||||||
|
Contains("CI * commit 05"),
|
||||||
|
Contains("CI commit 04").IsSelected(),
|
||||||
|
Contains("CI * commit 03").IsSelected(),
|
||||||
|
Contains("CI commit 02").IsSelected(),
|
||||||
|
Contains("CI commit 01"),
|
||||||
|
).
|
||||||
|
Press(keys.Commits.StartInteractiveRebase).
|
||||||
|
Lines(
|
||||||
|
Contains("CI commit 07"),
|
||||||
|
Contains("CI commit 06"),
|
||||||
|
Contains("update-ref").Contains("branch2"),
|
||||||
|
Contains("CI * commit 05"),
|
||||||
|
// Only 01 remains selected, but we want 04 through 01 to stay selected:
|
||||||
|
Contains("CI commit 04"),
|
||||||
|
Contains("update-ref").Contains("branch1"),
|
||||||
|
Contains("CI * commit 03"),
|
||||||
|
Contains("CI commit 02").IsSelected(),
|
||||||
|
Contains("CI <-- YOU ARE HERE --- commit 01"),
|
||||||
|
)
|
||||||
|
},
|
||||||
|
})
|
@ -172,6 +172,8 @@ var tests = []*components.IntegrationTest{
|
|||||||
interactive_rebase.OutsideRebaseRangeSelect,
|
interactive_rebase.OutsideRebaseRangeSelect,
|
||||||
interactive_rebase.PickRescheduled,
|
interactive_rebase.PickRescheduled,
|
||||||
interactive_rebase.QuickStart,
|
interactive_rebase.QuickStart,
|
||||||
|
interactive_rebase.QuickStartKeepSelection,
|
||||||
|
interactive_rebase.QuickStartKeepSelectionRange,
|
||||||
interactive_rebase.Rebase,
|
interactive_rebase.Rebase,
|
||||||
interactive_rebase.RewordCommitWithEditorAndFail,
|
interactive_rebase.RewordCommitWithEditorAndFail,
|
||||||
interactive_rebase.RewordFirstCommit,
|
interactive_rebase.RewordFirstCommit,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user