mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-05 00:59:19 +02:00
039831a27a
While it's true that the behavior is a little different from the staging panel, where the staged lines are actually removed from the view and in many cases the selection stays more or less in the same place, it is still very useful to move to the next stageable thing in the custom patch building view too.
98 lines
2.4 KiB
Go
98 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().
|
|
PressPrimaryAction().
|
|
Tap(func() {
|
|
t.Views().Information().Content(Contains("Building patch"))
|
|
|
|
t.Views().Secondary().
|
|
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`),
|
|
)
|
|
},
|
|
})
|