mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-14 11:23:09 +02:00
d772c9f1d4
We have not been good at consistent casing so far. Now we use 'Sentence case' everywhere. EVERYWHERE. Also Removing 'Lc' prefix from i18n field names: the 'Lc' stood for lowercase but now that everything is in 'Sentence case' there's no need for the distinction. I've got a couple lower case things I've kept: namely, things that show up in parentheses.
92 lines
2.3 KiB
Go
92 lines
2.3 KiB
Go
package patch_building
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var MoveToNewCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Move a patch from a commit to a new commit",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateDir("dir")
|
|
shell.CreateFileAndAdd("dir/file1", "file1 content")
|
|
shell.CreateFileAndAdd("dir/file2", "file2 content")
|
|
shell.Commit("first commit")
|
|
|
|
shell.UpdateFileAndAdd("dir/file1", "file1 content with old changes")
|
|
shell.DeleteFileAndAdd("dir/file2")
|
|
shell.CreateFileAndAdd("dir/file3", "file3 content")
|
|
shell.Commit("commit to move from")
|
|
|
|
shell.UpdateFileAndAdd("dir/file1", "file1 content with new changes")
|
|
shell.Commit("third commit")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("third commit").IsSelected(),
|
|
Contains("commit to move from"),
|
|
Contains("first commit"),
|
|
).
|
|
SelectNextItem().
|
|
PressEnter()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("dir").IsSelected(),
|
|
Contains(" M file1"),
|
|
Contains(" D file2"),
|
|
Contains(" A file3"),
|
|
).
|
|
PressPrimaryAction().
|
|
PressEscape()
|
|
|
|
t.Views().Information().Content(Contains("Building patch"))
|
|
|
|
t.Common().SelectPatchOption(Contains("Move patch into new commit"))
|
|
|
|
t.Views().Commits().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("third commit"),
|
|
Contains(`Split from "commit to move from"`).IsSelected(),
|
|
Contains("commit to move from"),
|
|
Contains("first commit"),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("dir").IsSelected(),
|
|
Contains(" M file1"),
|
|
Contains(" D file2"),
|
|
Contains(" A file3"),
|
|
).
|
|
PressEscape()
|
|
|
|
t.Views().Commits().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("third commit"),
|
|
Contains(`Split from "commit to move from"`).IsSelected(),
|
|
Contains("commit to move from"),
|
|
Contains("first commit"),
|
|
).
|
|
SelectNextItem().
|
|
PressEnter()
|
|
|
|
// the original commit has no more files in it
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("(none)"),
|
|
)
|
|
},
|
|
})
|