mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-12 04:45:47 +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
47 lines
1.4 KiB
Go
47 lines
1.4 KiB
Go
package commit
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var CommitWithPrefix = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Commit with defined config commitPrefix",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(testConfig *config.AppConfig) {
|
|
testConfig.UserConfig.Git.CommitPrefixes = map[string]config.CommitPrefixConfig{"repo": {Pattern: "^\\w+\\/(\\w+-\\w+).*", Replace: "[$1]: "}}
|
|
},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.NewBranch("feature/TEST-001")
|
|
shell.CreateFile("test-commit-prefix", "This is foo bar")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
IsEmpty()
|
|
|
|
t.Views().Files().
|
|
IsFocused().
|
|
PressPrimaryAction().
|
|
Press(keys.Files.CommitChanges)
|
|
|
|
t.ExpectPopup().CommitMessagePanel().
|
|
Title(Equals("Commit summary")).
|
|
InitialText(Equals("[TEST-001]: ")).
|
|
Type("my commit message").
|
|
Cancel()
|
|
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Press(keys.Files.CommitChanges)
|
|
|
|
t.ExpectPopup().CommitMessagePanel().
|
|
Title(Equals("Commit summary")).
|
|
InitialText(Equals("[TEST-001]: my commit message")).
|
|
Type(". Added something else").
|
|
Confirm()
|
|
|
|
t.Views().Commits().Focus()
|
|
t.Views().Main().Content(Contains("[TEST-001]: my commit message. Added something else"))
|
|
},
|
|
})
|