mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-22 15:22:51 +03: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
65 lines
1.5 KiB
Go
65 lines
1.5 KiB
Go
package reflog
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var Patch = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Build a patch from a reflog commit and apply it",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.EmptyCommit("one")
|
|
shell.EmptyCommit("two")
|
|
shell.CreateFileAndAdd("file1", "content1")
|
|
shell.CreateFileAndAdd("file2", "content2")
|
|
shell.Commit("three")
|
|
shell.HardReset("HEAD^^")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().ReflogCommits().
|
|
Focus().
|
|
Lines(
|
|
Contains("reset: moving to HEAD^^").IsSelected(),
|
|
Contains("commit: three"),
|
|
Contains("commit: two"),
|
|
Contains("commit (initial): one"),
|
|
).
|
|
SelectNextItem().
|
|
PressEnter()
|
|
|
|
t.Views().SubCommits().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("three").IsSelected(),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("file1").IsSelected(),
|
|
Contains("file2"),
|
|
).
|
|
PressPrimaryAction()
|
|
|
|
t.Views().Information().Content(Contains("building patch"))
|
|
|
|
t.Views().
|
|
CommitFiles().
|
|
Press(keys.Universal.CreatePatchOptionsMenu)
|
|
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Patch Options")).
|
|
Select(MatchesRegexp(`apply patch$`)).Confirm()
|
|
|
|
t.Views().Files().Lines(
|
|
Contains("file1"),
|
|
)
|
|
},
|
|
})
|