mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-17 22:32:58 +02:00
0b5504aa98
Assert the entire lines using Equals instead of Contains. This makes the tests a bit easier to read, and it makes it much easier to decide how they need to be changed when we change the layout (like we do in the last commit of this branch). It is true that this requires changing all these tests for any future UI changes, but I think this is a good price to pay; those adaptions are trivial and can be done without thinking.
90 lines
2.1 KiB
Go
90 lines
2.1 KiB
Go
package patch_building
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var MoveToEarlierCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Move a patch from a commit to an earlier commit",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
GitVersion: AtLeast("2.26.0"),
|
|
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.CreateFileAndAdd("unrelated-file", "")
|
|
shell.Commit("destination 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")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("commit to move from").IsSelected(),
|
|
Contains("destination commit"),
|
|
Contains("first commit"),
|
|
).
|
|
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.Views().Commits().
|
|
IsFocused().
|
|
SelectNextItem()
|
|
|
|
t.Common().SelectPatchOption(Contains("Move patch to selected commit"))
|
|
|
|
t.Views().Commits().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("commit to move from"),
|
|
Contains("destination commit").IsSelected(),
|
|
Contains("first commit"),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Equals("▼ dir").IsSelected(),
|
|
Equals(" M file1"),
|
|
Equals(" D file2"),
|
|
Equals(" A file3"),
|
|
Equals("A unrelated-file"),
|
|
).
|
|
PressEscape()
|
|
|
|
t.Views().Commits().
|
|
IsFocused().
|
|
SelectPreviousItem().
|
|
PressEnter()
|
|
|
|
// the original commit has no more files in it
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("(none)"),
|
|
)
|
|
},
|
|
})
|