mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-19 12:12:42 +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
58 lines
1.5 KiB
Go
58 lines
1.5 KiB
Go
package commit
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var DiscardOldFileChange = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Discarding a single file from an old commit (does rebase in background to remove the file but retain the other one)",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateFileAndAdd("file0", "file0")
|
|
shell.Commit("first commit")
|
|
|
|
shell.CreateFileAndAdd("file1", "file2")
|
|
shell.CreateFileAndAdd("fileToRemove", "fileToRemove")
|
|
shell.Commit("commit to change")
|
|
|
|
shell.CreateFileAndAdd("file3", "file3")
|
|
shell.Commit("third commit")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("third commit").IsSelected(),
|
|
Contains("commit to change"),
|
|
Contains("first commit"),
|
|
).
|
|
SelectNextItem().
|
|
PressEnter()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("file1").IsSelected(),
|
|
Contains("fileToRemove"),
|
|
).
|
|
SelectNextItem().
|
|
Press(keys.Universal.Remove)
|
|
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Discard file changes")).
|
|
Content(Contains("Are you sure you want to discard this commit's changes to this file?")).
|
|
Confirm()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("file1").IsSelected(),
|
|
)
|
|
|
|
t.FileSystem().PathNotPresent("fileToRemove")
|
|
},
|
|
})
|