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
35 lines
1.1 KiB
Go
35 lines
1.1 KiB
Go
package file
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var DirWithUntrackedFile = NewIntegrationTest(NewIntegrationTestArgs{
|
|
// notably, we currently _don't_ actually see the untracked file in the diff. Not sure how to get around that.
|
|
Description: "When selecting a directory that contains an untracked file, we should not get an error",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateDir("dir")
|
|
shell.CreateFile("dir/file", "foo")
|
|
shell.GitAddAll()
|
|
shell.Commit("first commit")
|
|
shell.CreateFile("dir/untracked", "bar")
|
|
shell.UpdateFile("dir/file", "baz")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Lines(
|
|
Contains("first commit"),
|
|
)
|
|
|
|
t.Views().Main().
|
|
Content(DoesNotContain("error: Could not access")).
|
|
// we show baz because it's a modified file but we don't show bar because it's untracked
|
|
// (though it would be cool if we could show that too)
|
|
Content(Contains("baz"))
|
|
},
|
|
})
|