mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 18:24:17 -05:00
Stefan Haller
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.
64 lines
1.9 KiB
Go
64 lines
1.9 KiB
Go
package bisect
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var Basic = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Start a git bisect to find a bad commit",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
NewBranch("mybranch").
|
|
CreateNCommits(10)
|
|
},
|
|
SetupConfig: func(cfg *config.AppConfig) {
|
|
cfg.GetUserConfig().Git.Log.ShowGraph = "never"
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
markCommitAsBad := func() {
|
|
t.Views().Commits().
|
|
Press(keys.Commits.ViewBisectOptions)
|
|
|
|
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as bad`)).Confirm()
|
|
}
|
|
|
|
markCommitAsGood := func() {
|
|
t.Views().Commits().
|
|
Press(keys.Commits.ViewBisectOptions)
|
|
|
|
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as good`)).Confirm()
|
|
}
|
|
|
|
t.Views().Commits().
|
|
Focus().
|
|
SelectedLine(Contains("CI commit-10")).
|
|
NavigateToLine(Contains("CI commit-09")).
|
|
Tap(func() {
|
|
markCommitAsBad()
|
|
|
|
t.Views().Information().Content(Contains("Bisecting"))
|
|
}).
|
|
SelectedLine(Contains("<-- bad")).
|
|
NavigateToLine(Contains("CI commit-02")).
|
|
Tap(markCommitAsGood).
|
|
TopLines(Contains("CI commit-10")).
|
|
// lazygit will land us in the commit between our good and bad commits.
|
|
SelectedLine(Contains("CI commit-05").Contains("<-- current")).
|
|
Tap(markCommitAsBad).
|
|
SelectedLine(Contains("CI commit-04").Contains("<-- current")).
|
|
Tap(func() {
|
|
markCommitAsGood()
|
|
|
|
// commit 5 is the culprit because we marked 4 as good and 5 as bad.
|
|
t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit-05.*Do you want to reset")).Confirm()
|
|
}).
|
|
IsFocused().
|
|
Content(Contains("CI commit-04"))
|
|
|
|
t.Views().Information().Content(DoesNotContain("Bisecting"))
|
|
},
|
|
})
|