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

refactor to not have Match at the start of assert method names, because it reads better that way

Browse Source
This commit is contained in:
Jesse Duffield
2022-12-24 17:01:26 +11:00
parent c19f52255c
commit aedfce2845
36 changed files with 208 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,28 +25,28 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
input.SwitchToBranchesWindow()
assert.CurrentViewName("localBranches")
assert.MatchSelectedLine(Contains("branch-a"))
assert.SelectedLine(Contains("branch-a"))
input.PressKeys(keys.Universal.DiffingMenu)
assert.InMenu()
assert.MatchCurrentViewTitle(Equals("Diffing"))
assert.MatchSelectedLine(Contains("diff branch-a"))
assert.CurrentViewTitle(Equals("Diffing"))
assert.SelectedLine(Contains("diff branch-a"))
input.Confirm()
assert.CurrentViewName("localBranches")
assert.MatchViewContent("information", Contains("showing output for: git diff branch-a branch-a"))
assert.ViewContent("information", Contains("showing output for: git diff branch-a branch-a"))
input.NextItem()
assert.MatchViewContent("information", Contains("showing output for: git diff branch-a branch-b"))
assert.MatchMainViewContent(Contains("+second line"))
assert.ViewContent("information", Contains("showing output for: git diff branch-a branch-b"))
assert.MainViewContent(Contains("+second line"))
input.Enter()
assert.CurrentViewName("subCommits")
assert.MatchMainViewContent(Contains("+second line"))
assert.MatchSelectedLine(Contains("update"))
assert.MainViewContent(Contains("+second line"))
assert.SelectedLine(Contains("update"))
input.Enter()
assert.CurrentViewName("commitFiles")
assert.MatchSelectedLine(Contains("file1"))
assert.MatchMainViewContent(Contains("+second line"))
assert.SelectedLine(Contains("file1"))
assert.MainViewContent(Contains("+second line"))
input.PressKeys(keys.Universal.Return)
input.PressKeys(keys.Universal.Return)
@ -56,7 +56,7 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
assert.InMenu()
input.NavigateToListItemContainingText("reverse diff direction")
input.Confirm()
assert.MatchViewContent("information", Contains("showing output for: git diff branch-a branch-b -R"))
assert.MatchMainViewContent(Contains("-second line"))
assert.ViewContent("information", Contains("showing output for: git diff branch-a branch-b -R"))
assert.MainViewContent(Contains("-second line"))
},
})

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

@ -25,50 +25,50 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
input.SwitchToBranchesWindow()
assert.CurrentViewName("localBranches")
assert.MatchSelectedLine(Contains("branch-a"))
assert.SelectedLine(Contains("branch-a"))
input.PressKeys(keys.Universal.DiffingMenu)
assert.InMenu()
assert.MatchCurrentViewTitle(Equals("Diffing"))
assert.MatchSelectedLine(Contains("diff branch-a"))
assert.CurrentViewTitle(Equals("Diffing"))
assert.SelectedLine(Contains("diff branch-a"))
input.Confirm()
assert.CurrentViewName("localBranches")
assert.MatchViewContent("information", Contains("showing output for: git diff branch-a branch-a"))
assert.ViewContent("information", Contains("showing output for: git diff branch-a branch-a"))
input.NextItem()
assert.MatchViewContent("information", Contains("showing output for: git diff branch-a branch-b"))
assert.MatchMainViewContent(Contains("+second line"))
assert.ViewContent("information", Contains("showing output for: git diff branch-a branch-b"))
assert.MainViewContent(Contains("+second line"))
input.Enter()
assert.CurrentViewName("subCommits")
assert.MatchMainViewContent(Contains("+second line"))
assert.MatchSelectedLine(Contains("update"))
assert.MainViewContent(Contains("+second line"))
assert.SelectedLine(Contains("update"))
input.Enter()
assert.CurrentViewName("commitFiles")
assert.MatchSelectedLine(Contains("file1"))
assert.MatchMainViewContent(Contains("+second line"))
assert.SelectedLine(Contains("file1"))
assert.MainViewContent(Contains("+second line"))
// add the file to the patch
input.PrimaryAction()
input.PressKeys(keys.Universal.DiffingMenu)
assert.InMenu()
assert.MatchCurrentViewTitle(Equals("Diffing"))
assert.CurrentViewTitle(Equals("Diffing"))
input.NavigateToListItemContainingText("exit diff mode")
input.Confirm()
assert.MatchViewContent("information", NotContains("building patch"))
assert.ViewContent("information", NotContains("building patch"))
input.PressKeys(keys.Universal.CreatePatchOptionsMenu)
assert.InMenu()
assert.MatchCurrentViewTitle(Equals("Patch Options"))
assert.CurrentViewTitle(Equals("Patch Options"))
// including the keybinding 'a' here to distinguish the menu item from the 'apply patch in reverse' item
input.NavigateToListItemContainingText("a apply patch")
input.Confirm()
input.SwitchToFilesWindow()
assert.MatchSelectedLine(Contains("file1"))
assert.MatchMainViewContent(Contains("+second line"))
assert.SelectedLine(Contains("file1"))
assert.MainViewContent(Contains("+second line"))
},
})

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

@ -22,35 +22,35 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
input.SwitchToCommitsWindow()
assert.CurrentViewName("commits")
assert.MatchSelectedLine(Contains("third commit"))
assert.SelectedLine(Contains("third commit"))
input.PressKeys(keys.Universal.DiffingMenu)
assert.InMenu()
assert.MatchCurrentViewTitle(Equals("Diffing"))
assert.MatchSelectedLine(Contains("diff"))
assert.CurrentViewTitle(Equals("Diffing"))
assert.SelectedLine(Contains("diff"))
input.Confirm()
assert.NotInPopup()
assert.MatchViewContent("information", Contains("showing output for: git diff"))
assert.ViewContent("information", Contains("showing output for: git diff"))
input.NextItem()
input.NextItem()
assert.MatchSelectedLine(Contains("first commit"))
assert.SelectedLine(Contains("first commit"))
assert.MatchMainViewContent(Contains("-second line\n-third line"))
assert.MainViewContent(Contains("-second line\n-third line"))
input.PressKeys(keys.Universal.DiffingMenu)
assert.InMenu()
input.NavigateToListItemContainingText("reverse diff direction")
input.Confirm()
assert.MatchMainViewContent(Contains("+second line\n+third line"))
assert.MainViewContent(Contains("+second line\n+third line"))
input.Enter()
assert.CurrentViewName("commitFiles")
assert.MatchSelectedLine(Contains("file1"))
assert.MatchMainViewContent(Contains("+second line\n+third line"))
assert.SelectedLine(Contains("file1"))
assert.MainViewContent(Contains("+second line\n+third line"))
},
})