mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-12 11:15:00 +02:00
63dc07fded
By constructing an arg vector manually, we no longer need to quote arguments Mandate that args must be passed when building a command Now you need to provide an args array when building a command. There are a handful of places where we need to deal with a string, such as with user-defined custom commands, and for those we now require that at the callsite they use str.ToArgv to do that. I don't want to provide a method out of the box for it because I want to discourage its use. For some reason we were invoking a command through a shell when amending a commit, and I don't believe we needed to do that as there was nothing user- supplied about the command. So I've switched to using a regular command out- side the shell there
50 lines
1.6 KiB
Go
50 lines
1.6 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var FixupSecondCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Fixup the second commit into the first (initial)",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
CreateFileAndAdd("file1.txt", "File1 Content\n").Commit("First Commit").
|
|
CreateFileAndAdd("file2.txt", "Fixup Content\n").Commit("Fixup Commit Message").
|
|
CreateFileAndAdd("file3.txt", "File3 Content\n").Commit("Third Commit")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("Third Commit"),
|
|
Contains("Fixup Commit Message"),
|
|
Contains("First Commit"),
|
|
).
|
|
NavigateToLine(Contains("Fixup Commit Message")).
|
|
Press(keys.Commits.MarkCommitAsFixup).
|
|
Tap(func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Fixup")).
|
|
Content(Equals("Are you sure you want to 'fixup' this commit? It will be merged into the commit below")).
|
|
Confirm()
|
|
}).
|
|
Lines(
|
|
Contains("Third Commit"),
|
|
Contains("First Commit").IsSelected(),
|
|
)
|
|
|
|
t.Views().Main().
|
|
// Make sure that the resulting commit message doesn't contain the
|
|
// message of the fixup commit; compare this to
|
|
// squash_down_second_commit.go, where it does.
|
|
Content(Contains("First Commit")).
|
|
Content(DoesNotContain("Fixup Commit Message")).
|
|
Content(Contains("+File1 Content")).
|
|
Content(Contains("+Fixup Content"))
|
|
},
|
|
})
|