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
57 lines
1.4 KiB
Go
57 lines
1.4 KiB
Go
package git_commands
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestGitCommandBuilder(t *testing.T) {
|
|
scenarios := []struct {
|
|
input []string
|
|
expected []string
|
|
}{
|
|
{
|
|
input: NewGitCmd("push").
|
|
Arg("--force-with-lease").
|
|
Arg("--set-upstream").
|
|
Arg("origin").
|
|
Arg("master").
|
|
ToArgv(),
|
|
expected: []string{"git", "push", "--force-with-lease", "--set-upstream", "origin", "master"},
|
|
},
|
|
{
|
|
input: NewGitCmd("push").ArgIf(true, "--test").ToArgv(),
|
|
expected: []string{"git", "push", "--test"},
|
|
},
|
|
{
|
|
input: NewGitCmd("push").ArgIf(false, "--test").ToArgv(),
|
|
expected: []string{"git", "push"},
|
|
},
|
|
{
|
|
input: NewGitCmd("push").ArgIfElse(true, "-b", "-a").ToArgv(),
|
|
expected: []string{"git", "push", "-b"},
|
|
},
|
|
{
|
|
input: NewGitCmd("push").ArgIfElse(false, "-a", "-b").ToArgv(),
|
|
expected: []string{"git", "push", "-b"},
|
|
},
|
|
{
|
|
input: NewGitCmd("push").Arg("-a", "-b").ToArgv(),
|
|
expected: []string{"git", "push", "-a", "-b"},
|
|
},
|
|
{
|
|
input: NewGitCmd("push").Config("user.name=foo").Config("user.email=bar").ToArgv(),
|
|
expected: []string{"git", "-c", "user.email=bar", "-c", "user.name=foo", "push"},
|
|
},
|
|
{
|
|
input: NewGitCmd("push").RepoPath("a/b/c").ToArgv(),
|
|
expected: []string{"git", "-C", "a/b/c", "push"},
|
|
},
|
|
}
|
|
|
|
for _, s := range scenarios {
|
|
assert.Equal(t, s.input, s.expected)
|
|
}
|
|
}
|