mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-19 17:02:18 +03:00
f15be32756
Previously we would render the diff for a directory to the main/secondary pair, but a diff for a file to the staging/stagingSecondary pair. (And similar for commit files: main/secondary for directories, but patchBuilding/patchBuildingSecondary for files.) I always found this confusing and couldn't really understand why we are doing this; but now it gets in my way because I want to attach a controller to main/secondary so that they can be focused. So change it to always use the main context pair for everything we render from a side panel.
65 lines
1.4 KiB
Go
65 lines
1.4 KiB
Go
package patch_building
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var Apply = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Apply a custom 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").IsSelected(),
|
|
Contains("branch-b"),
|
|
).
|
|
Press(keys.Universal.NextItem).
|
|
PressEnter()
|
|
|
|
t.Views().SubCommits().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("update").IsSelected(),
|
|
Contains("first commit"),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("M file1").IsSelected(),
|
|
).
|
|
PressPrimaryAction()
|
|
|
|
t.Views().Information().Content(Contains("Building patch"))
|
|
|
|
t.Views().Secondary().Content(Contains("second line"))
|
|
|
|
t.Common().SelectPatchOption(MatchesRegexp(`Apply patch$`))
|
|
|
|
t.Views().Files().
|
|
Focus().
|
|
Lines(
|
|
Contains("file1").IsSelected(),
|
|
)
|
|
|
|
t.Views().Main().
|
|
Content(Contains("second line"))
|
|
},
|
|
})
|