sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

combine assert and input structs, clean up interface

Browse Source
This commit is contained in:
Jesse Duffield
2022-12-27 16:27:36 +11:00
parent c5c9f5bb94
commit b166b8f776
47 changed files with 1021 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,48 +21,62 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
shell.Checkout("branch-a")
},
Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
input.SwitchToBranchesView()
assert.Views().Current().Lines(
Contains("branch-a"),
Contains("branch-b"),
)
Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) {
input.Views().Branches().
Focus().
Lines(
Contains("branch-a"),
Contains("branch-b"),
).
Press(keys.Universal.DiffingMenu)
input.Press(keys.Universal.DiffingMenu)
input.ExpectMenu().Title(Equals("Diffing")).Select(Equals("diff branch-a")).Confirm()
input.Menu().Title(Equals("Diffing")).Select(Equals("diff branch-a")).Confirm()
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
assert.Views().Current().Name("localBranches")
input.Views().Branches().
IsFocused().
SelectNextItem()
assert.Views().ByName("information").Content(Contains("showing output for: git diff branch-a branch-a"))
input.NextItem()
assert.Views().ByName("information").Content(Contains("showing output for: git diff branch-a branch-b"))
assert.Views().Main().Content(Contains("+second line"))
input.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
input.Views().Main().Content(Contains("+second line"))
input.Enter()
assert.Views().Current().Name("subCommits")
assert.Views().Main().Content(Contains("+second line"))
assert.Views().Current().SelectedLine(Contains("update"))
input.Enter()
assert.Views().Current().Name("commitFiles")
assert.Views().Current().SelectedLine(Contains("file1"))
assert.Views().Main().Content(Contains("+second line"))
input.Views().Branches().
PressEnter()
// add the file to the patch
input.PrimaryAction()
input.Views().SubCommits().
IsFocused().
SelectedLine(Contains("update"))
input.Press(keys.Universal.DiffingMenu)
input.Menu().Title(Equals("Diffing")).Select(Contains("exit diff mode")).Confirm()
input.Views().Main().Content(Contains("+second line"))
assert.Views().ByName("information").Content(DoesNotContain("building patch"))
input.Views().SubCommits().
PressEnter()
input.Views().CommitFiles().
IsFocused().
SelectedLine(Contains("file1"))
input.Views().Main().Content(Contains("+second line"))
input.Views().CommitFiles().
PressPrimaryAction(). // add the file to the patch
Press(keys.Universal.DiffingMenu)
input.ExpectMenu().Title(Equals("Diffing")).Select(Contains("exit diff mode")).Confirm()
input.Views().Information().Content(DoesNotContain("building patch"))
input.Views().CommitFiles().
Press(keys.Universal.CreatePatchOptionsMenu)
input.Press(keys.Universal.CreatePatchOptionsMenu)
// adding the regex '$' here to distinguish the menu item from the 'apply patch in reverse' item
input.Menu().Title(Equals("Patch Options")).Select(MatchesRegexp("apply patch$")).Confirm()
input.ExpectMenu().Title(Equals("Patch Options")).Select(MatchesRegexp("apply patch$")).Confirm()
input.SwitchToFilesView()
input.Views().Files().
Focus().
SelectedLine(Contains("file1"))
assert.Views().Current().SelectedLine(Contains("file1"))
assert.Views().Main().Content(Contains("+second line"))
input.Views().Main().Content(Contains("+second line"))
},
})