mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-02-05 13:24:54 +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
99 lines
2.4 KiB
Go
99 lines
2.4 KiB
Go
package patch_building
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var MoveToIndexPartial = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Move a patch from a commit to the index. This is different from the MoveToIndex test in that we're only selecting a partial patch from a file",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateFileAndAdd("file1", "first line\nsecond line\nthird line\n")
|
|
shell.Commit("first commit")
|
|
|
|
shell.UpdateFileAndAdd("file1", "first line2\nsecond line\nthird line2\n")
|
|
shell.Commit("second commit")
|
|
|
|
shell.CreateFileAndAdd("file2", "file1 content")
|
|
shell.Commit("third commit")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("third commit").IsSelected(),
|
|
Contains("second commit"),
|
|
Contains("first commit"),
|
|
).
|
|
NavigateToLine(Contains("second commit")).
|
|
PressEnter()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("file1").IsSelected(),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().PatchBuilding().
|
|
IsFocused().
|
|
ContainsLines(
|
|
Contains(`-first line`).IsSelected(),
|
|
Contains(`+first line2`),
|
|
Contains(` second line`),
|
|
Contains(`-third line`),
|
|
Contains(`+third line2`),
|
|
).
|
|
PressPrimaryAction().
|
|
SelectNextItem().
|
|
PressPrimaryAction().
|
|
Tap(func() {
|
|
t.Views().Information().Content(Contains("building patch"))
|
|
|
|
t.Views().PatchBuildingSecondary().
|
|
ContainsLines(
|
|
Contains(`-first line`),
|
|
Contains(`+first line2`),
|
|
Contains(` second line`),
|
|
Contains(` third line`),
|
|
)
|
|
|
|
t.Common().SelectPatchOption(Contains("move patch out into index"))
|
|
|
|
t.Views().Files().
|
|
Lines(
|
|
Contains("M").Contains("file1"),
|
|
)
|
|
})
|
|
|
|
// Focus is automatically returned to the commit files panel. Arguably it shouldn't be.
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("file1"),
|
|
)
|
|
|
|
t.Views().Main().
|
|
ContainsLines(
|
|
Contains(` first line`),
|
|
Contains(` second line`),
|
|
Contains(`-third line`),
|
|
Contains(`+third line2`),
|
|
)
|
|
|
|
t.Views().Files().
|
|
Focus()
|
|
|
|
t.Views().Main().
|
|
ContainsLines(
|
|
Contains(`-first line`),
|
|
Contains(`+first line2`),
|
|
Contains(` second line`),
|
|
Contains(` third line2`),
|
|
)
|
|
},
|
|
})
|