mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -04:00
d181615c31
Some tests assert that a specific commit subject does or doesn't occur
in the main view; interactive_rebase/outside_rebase_range_select.go is
an example for this, it asserts `t.Views().Main().Content(
DoesNotContain("commit 06"))`. The problem with this kind of assertion
and our test commit naming scheme is that the diff view begins with a
"commit <hash>" line, and when that hash happens to start with "06" the
assertion matched it and failed spuriously. This was usually masked by
our MaxAttempts=2 that we currently use for integration tests (it's
quite unlikely that the commit gets a hash beginning with "06" twice in
a row). However, we want to get to a state where we can set MaxAttempts
to 1, so make this more robust by changing our naming scheme.
55 lines
1.6 KiB
Go
55 lines
1.6 KiB
Go
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"}
|
|
config.GetUserConfig().Git.Log.ShowGraph = "never"
|
|
},
|
|
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("--- Pending rebase todos ---"),
|
|
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("--- Commits ---"),
|
|
Contains("CI commit-01"),
|
|
)
|
|
},
|
|
})
|