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
46 lines
1.2 KiB
Go
46 lines
1.2 KiB
Go
package submodule
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var Remove = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Remove a submodule",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.EmptyCommit("first commit")
|
|
shell.CloneIntoSubmodule("my_submodule")
|
|
shell.GitAddAll()
|
|
shell.Commit("add submodule")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Submodules().Focus().
|
|
Lines(
|
|
Contains("my_submodule").IsSelected(),
|
|
).
|
|
Press(keys.Universal.Remove).
|
|
Tap(func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Remove submodule")).
|
|
Content(Equals("Are you sure you want to remove submodule 'my_submodule' and its corresponding directory? This is irreversible.")).
|
|
Confirm()
|
|
}).
|
|
IsEmpty()
|
|
|
|
t.Views().Files().Focus().
|
|
Lines(
|
|
MatchesRegexp(`M.*\.gitmodules`).IsSelected(),
|
|
MatchesRegexp(`D.*my_submodule`),
|
|
)
|
|
|
|
t.Views().Main().Content(
|
|
Contains("-[submodule \"my_submodule\"]").
|
|
Contains("- path = my_submodule").
|
|
Contains("- url = ../other_repo"),
|
|
)
|
|
},
|
|
})
|