mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-29 22:07:13 +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
64 lines
2.2 KiB
Go
64 lines
2.2 KiB
Go
package file
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Verify that we can't ignore the .gitignore file, then ignore/exclude other files",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {
|
|
},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateFile(".gitignore", "")
|
|
shell.CreateFile("toExclude", "")
|
|
shell.CreateFile("toIgnore", "")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Lines(
|
|
Contains(`?? .gitignore`).IsSelected(),
|
|
Contains(`?? toExclude`),
|
|
Contains(`?? toIgnore`),
|
|
).
|
|
Press(keys.Files.IgnoreFile).
|
|
// ensure we can't exclude the .gitignore file
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm()
|
|
|
|
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot exclude .gitignore")).Confirm()
|
|
}).
|
|
Press(keys.Files.IgnoreFile).
|
|
// ensure we can't ignore the .gitignore file
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm()
|
|
|
|
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot ignore .gitignore")).Confirm()
|
|
|
|
t.FileSystem().FileContent(".gitignore", Equals(""))
|
|
t.FileSystem().FileContent(".git/info/exclude", DoesNotContain(".gitignore"))
|
|
}).
|
|
SelectNextItem().
|
|
Press(keys.Files.IgnoreFile).
|
|
// exclude a file
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm()
|
|
|
|
t.FileSystem().FileContent(".gitignore", Equals(""))
|
|
t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude"))
|
|
}).
|
|
SelectNextItem().
|
|
Press(keys.Files.IgnoreFile).
|
|
// ignore a file
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm()
|
|
|
|
t.FileSystem().FileContent(".gitignore", Equals("toIgnore\n"))
|
|
t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude"))
|
|
})
|
|
},
|
|
})
|