mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-21 21:47:32 +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
79 lines
2.3 KiB
Go
79 lines
2.3 KiB
Go
package diff
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Create a patch from the diff between two branches and apply the patch.",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.NewBranch("branch-a")
|
|
shell.CreateFileAndAdd("file1", "first line\n")
|
|
shell.Commit("first commit")
|
|
|
|
shell.NewBranch("branch-b")
|
|
shell.UpdateFileAndAdd("file1", "first line\nsecond line\n")
|
|
shell.Commit("update")
|
|
|
|
shell.Checkout("branch-a")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Branches().
|
|
Focus().
|
|
Lines(
|
|
Contains("branch-a"),
|
|
Contains("branch-b"),
|
|
).
|
|
Press(keys.Universal.DiffingMenu)
|
|
|
|
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Equals("diff branch-a")).Confirm()
|
|
|
|
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
|
|
|
|
t.Views().Branches().
|
|
IsFocused().
|
|
SelectNextItem().
|
|
Tap(func() {
|
|
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
|
|
t.Views().Main().Content(Contains("+second line"))
|
|
}).
|
|
PressEnter()
|
|
|
|
t.Views().SubCommits().
|
|
IsFocused().
|
|
SelectedLine(Contains("update")).
|
|
Tap(func() {
|
|
t.Views().Main().Content(Contains("+second line"))
|
|
}).
|
|
PressEnter()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
SelectedLine(Contains("file1")).
|
|
Tap(func() {
|
|
t.Views().Main().Content(Contains("+second line"))
|
|
}).
|
|
PressPrimaryAction(). // add the file to the patch
|
|
Press(keys.Universal.DiffingMenu).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("exit diff mode")).Confirm()
|
|
|
|
t.Views().Information().Content(DoesNotContain("building patch"))
|
|
}).
|
|
Press(keys.Universal.CreatePatchOptionsMenu)
|
|
|
|
// adding the regex '$' here to distinguish the menu item from the 'apply patch in reverse' item
|
|
t.ExpectPopup().Menu().Title(Equals("Patch Options")).Select(MatchesRegexp("apply patch$")).Confirm()
|
|
|
|
t.Views().Files().
|
|
Focus().
|
|
SelectedLine(Contains("file1"))
|
|
|
|
t.Views().Main().Content(Contains("+second line"))
|
|
},
|
|
})
|