ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

rename input to t

Browse Source
This commit is contained in:
Jesse Duffield
2022-12-27 21:35:36 +11:00
parent 53e06b71ae
commit 78b495f50a
45 changed files with 376 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,8 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
shell.Checkout("branch-a")
},
Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) {
input.Views().Branches().
Run: func(shell *Shell, t *TestDriver, keys config.KeybindingConfig) {
t.Views().Branches().
Focus().
TopLines(
Contains("branch-a"),
@@ -30,44 +30,44 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Universal.DiffingMenu)
input.ExpectMenu().Title(Equals("Diffing")).Select(Contains(`diff branch-a`)).Confirm()
t.ExpectMenu().Title(Equals("Diffing")).Select(Contains(`diff branch-a`)).Confirm()
input.Views().Branches().
t.Views().Branches().
IsFocused().
Tap(func() {
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
t.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"))
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
t.Views().Main().Content(Contains("+second line"))
}).
PressEnter()
input.Views().SubCommits().
t.Views().SubCommits().
IsFocused().
SelectedLine(Contains("update")).
Tap(func() {
input.Views().Main().Content(Contains("+second line"))
t.Views().Main().Content(Contains("+second line"))
}).
PressEnter()
input.Views().CommitFiles().
t.Views().CommitFiles().
IsFocused().
SelectedLine(Contains("file1")).
Tap(func() {
input.Views().Main().Content(Contains("+second line"))
t.Views().Main().Content(Contains("+second line"))
}).
PressEscape()
input.Views().SubCommits().PressEscape()
t.Views().SubCommits().PressEscape()
input.Views().Branches().
t.Views().Branches().
IsFocused().
Press(keys.Universal.DiffingMenu)
input.ExpectMenu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b -R"))
input.Views().Main().Content(Contains("-second line"))
t.ExpectMenu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b -R"))
t.Views().Main().Content(Contains("-second line"))
},
})

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

@@ -21,8 +21,8 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
shell.Checkout("branch-a")
},
Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) {
input.Views().Branches().
Run: func(shell *Shell, t *TestDriver, keys config.KeybindingConfig) {
t.Views().Branches().
Focus().
Lines(
Contains("branch-a"),
@@ -30,49 +30,49 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Universal.DiffingMenu)
input.ExpectMenu().Title(Equals("Diffing")).Select(Equals("diff branch-a")).Confirm()
t.ExpectMenu().Title(Equals("Diffing")).Select(Equals("diff branch-a")).Confirm()
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
input.Views().Branches().
t.Views().Branches().
IsFocused().
SelectNextItem().
Tap(func() {
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
input.Views().Main().Content(Contains("+second line"))
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
t.Views().Main().Content(Contains("+second line"))
}).
PressEnter()
input.Views().SubCommits().
t.Views().SubCommits().
IsFocused().
SelectedLine(Contains("update")).
Tap(func() {
input.Views().Main().Content(Contains("+second line"))
t.Views().Main().Content(Contains("+second line"))
}).
PressEnter()
input.Views().CommitFiles().
t.Views().CommitFiles().
IsFocused().
SelectedLine(Contains("file1")).
Tap(func() {
input.Views().Main().Content(Contains("+second line"))
t.Views().Main().Content(Contains("+second line"))
}).
PressPrimaryAction(). // add the file to the patch
Press(keys.Universal.DiffingMenu).
Tap(func() {
input.ExpectMenu().Title(Equals("Diffing")).Select(Contains("exit diff mode")).Confirm()
t.ExpectMenu().Title(Equals("Diffing")).Select(Contains("exit diff mode")).Confirm()
input.Views().Information().Content(DoesNotContain("building patch"))
t.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
input.ExpectMenu().Title(Equals("Patch Options")).Select(MatchesRegexp("apply patch$")).Confirm()
t.ExpectMenu().Title(Equals("Patch Options")).Select(MatchesRegexp("apply patch$")).Confirm()
input.Views().Files().
t.Views().Files().
Focus().
SelectedLine(Contains("file1"))
input.Views().Main().Content(Contains("+second line"))
t.Views().Main().Content(Contains("+second line"))
},
})

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

@@ -18,8 +18,8 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
shell.UpdateFileAndAdd("file1", "first line\nsecond line\nthird line\n")
shell.Commit("third commit")
},
Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) {
input.Views().Commits().
Run: func(shell *Shell, t *TestDriver, keys config.KeybindingConfig) {
t.Views().Commits().
Focus().
Lines(
Contains("third commit").IsSelected(),
@@ -28,28 +28,28 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Universal.DiffingMenu).
Tap(func() {
input.ExpectMenu().Title(Equals("Diffing")).Select(MatchesRegexp(`diff \w+`)).Confirm()
t.ExpectMenu().Title(Equals("Diffing")).Select(MatchesRegexp(`diff \w+`)).Confirm()
input.Views().Information().Content(Contains("showing output for: git diff"))
t.Views().Information().Content(Contains("showing output for: git diff"))
}).
SelectNextItem().
SelectNextItem().
SelectedLine(Contains("first commit")).
Tap(func() {
input.Views().Main().Content(Contains("-second line\n-third line"))
t.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()
t.ExpectMenu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
input.Views().Main().Content(Contains("+second line\n+third line"))
t.Views().Main().Content(Contains("+second line\n+third line"))
}).
PressEnter()
input.Views().CommitFiles().
t.Views().CommitFiles().
IsFocused().
SelectedLine(Contains("file1"))
input.Views().Main().Content(Contains("+second line\n+third line"))
t.Views().Main().Content(Contains("+second line\n+third line"))
},
})