sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-09 09:22:48 +03:00
Code Activity

add tap function

Browse Source
This commit is contained in:
Jesse Duffield
2022-12-27 21:25:11 +11:00
parent b166b8f776
commit 53e06b71ae
19 changed files with 210 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/integration/tests/diff/diff.go
View File

@@ -33,35 +33,33 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
input.ExpectMenu().Title(Equals("Diffing")).Select(Contains(`diff branch-a`)).Confirm()
input.Views().Branches().
IsFocused()
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
input.Views().Branches().
SelectNextItem()
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
input.Views().Main().Content(Contains("+second line"))
input.Views().Branches().
IsFocused().
Tap(func() {
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
}).
SelectNextItem().
Tap(func() {
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
input.Views().Main().Content(Contains("+second line"))
}).
PressEnter()
input.Views().SubCommits().
IsFocused().
SelectedLine(Contains("update"))
input.Views().Main().Content(Contains("+second line"))
input.Views().SubCommits().
SelectedLine(Contains("update")).
Tap(func() {
input.Views().Main().Content(Contains("+second line"))
}).
PressEnter()
input.Views().CommitFiles().
IsFocused().
SelectedLine(Contains("file1"))
SelectedLine(Contains("file1")).
Tap(func() {
input.Views().Main().Content(Contains("+second line"))
}).
PressEscape()
input.Views().Main().Content(Contains("+second line"))
input.Views().CommitFiles().PressEscape()
input.Views().SubCommits().PressEscape()
input.Views().Branches().

40
pkg/integration/tests/diff/diff_and_apply_patch.go
View File

@@ -36,38 +36,34 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
input.Views().Branches().
IsFocused().
SelectNextItem()
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
input.Views().Main().Content(Contains("+second line"))
input.Views().Branches().
SelectNextItem().
Tap(func() {
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
input.Views().Main().Content(Contains("+second line"))
}).
PressEnter()
input.Views().SubCommits().
IsFocused().
SelectedLine(Contains("update"))
input.Views().Main().Content(Contains("+second line"))
input.Views().SubCommits().
SelectedLine(Contains("update")).
Tap(func() {
input.Views().Main().Content(Contains("+second line"))
}).
PressEnter()
input.Views().CommitFiles().
IsFocused().
SelectedLine(Contains("file1"))
input.Views().Main().Content(Contains("+second line"))
input.Views().CommitFiles().
SelectedLine(Contains("file1")).
Tap(func() {
input.Views().Main().Content(Contains("+second line"))
}).
PressPrimaryAction(). // add the file to the patch
Press(keys.Universal.DiffingMenu)
Press(keys.Universal.DiffingMenu).
Tap(func() {
input.ExpectMenu().Title(Equals("Diffing")).Select(Contains("exit diff mode")).Confirm()
input.ExpectMenu().Title(Equals("Diffing")).Select(Contains("exit diff mode")).Confirm()
input.Views().Information().Content(DoesNotContain("building patch"))
input.Views().CommitFiles().
input.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

33
pkg/integration/tests/diff/diff_commits.go
View File

@@ -22,31 +22,28 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
input.Views().Commits().
Focus().
Lines(
Contains("third commit"),
Contains("third commit").IsSelected(),
Contains("second commit"),
Contains("first commit"),
).
Press(keys.Universal.DiffingMenu)
Press(keys.Universal.DiffingMenu).
Tap(func() {
input.ExpectMenu().Title(Equals("Diffing")).Select(MatchesRegexp(`diff \w+`)).Confirm()
input.ExpectMenu().Title(Equals("Diffing")).Select(MatchesRegexp(`diff \w+`)).Confirm()
input.Views().Information().Content(Contains("showing output for: git diff"))
input.Views().Commits().
input.Views().Information().Content(Contains("showing output for: git diff"))
}).
SelectNextItem().
SelectNextItem().
SelectedLine(Contains("first commit"))
SelectedLine(Contains("first commit")).
Tap(func() {
input.Views().Main().Content(Contains("-second line\n-third line"))
}).
Press(keys.Universal.DiffingMenu).
Tap(func() {
input.ExpectMenu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
input.Views().Main().Content(Contains("-second line\n-third line"))
input.Views().Commits().
Press(keys.Universal.DiffingMenu)
input.ExpectMenu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
input.Views().Main().Content(Contains("+second line\n+third line"))
input.Views().Commits().
input.Views().Main().Content(Contains("+second line\n+third line"))
}).
PressEnter()
input.Views().CommitFiles().