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.
51 lines
1.5 KiB
Go
51 lines
1.5 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var AmendFixupCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Amends a staged file to a fixup commit, and checks that other unrelated fixup commits are not auto-squashed.",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
CreateNCommits(1).
|
|
CreateFileAndAdd("first-fixup-file", "").Commit("fixup! commit-01").
|
|
CreateNCommitsStartingAt(2, 2).
|
|
CreateFileAndAdd("unrelated-fixup-file", "fixup 03").Commit("fixup! commit-03").
|
|
CreateFileAndAdd("fixup-file", "fixup 01")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("fixup! commit-03"),
|
|
Contains("commit-03"),
|
|
Contains("commit-02"),
|
|
Contains("fixup! commit-01"),
|
|
Contains("commit-01"),
|
|
).
|
|
NavigateToLine(Contains("fixup! commit-01")).
|
|
Press(keys.Commits.AmendToCommit).
|
|
Tap(func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Amend commit")).
|
|
Content(Contains("Are you sure you want to amend this commit with your staged files?")).
|
|
Confirm()
|
|
}).
|
|
Lines(
|
|
Contains("fixup! commit-03"),
|
|
Contains("commit-03"),
|
|
Contains("commit-02"),
|
|
Contains("fixup! commit-01").IsSelected(),
|
|
Contains("commit-01"),
|
|
)
|
|
|
|
t.Views().Main().
|
|
Content(Contains("fixup 01"))
|
|
},
|
|
})
|