go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-06 22:33:07 +02:00
Code Issues Releases Activity

add switch-to-view methods

Browse Source
This commit is contained in:
Jesse Duffield
2022-12-26 16:49:54 +11:00
parent 9a6f21ce42
commit c841ba8237
22 changed files with 77 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go
View File

@ -15,8 +15,8 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
shared.MergeConflictsSetup(shell)
},
Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
input.SwitchToBranchesWindow()
assert.CurrentView().Name("localBranches").Lines(
input.SwitchToBranchesView()
assert.CurrentView().Lines(
Contains("first-change-branch"),
Contains("second-change-branch"),
Contains("original-branch"),
@ -38,9 +38,9 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
input.Press(keys.Commits.CherryPickCopy)
assert.View("information").Content(Contains("2 commits copied"))
input.SwitchToCommitsWindow()
input.SwitchToCommitsView()
assert.CurrentView().Name("commits").TopLines(
assert.CurrentView().TopLines(
Contains("first change"),
)
@ -66,9 +66,9 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
assert.CurrentView().Name("files")
assert.WorkingTreeFileCount(0)
input.SwitchToCommitsWindow()
input.SwitchToCommitsView()
assert.CurrentView().Name("commits").TopLines(
assert.CurrentView().TopLines(
Contains("second-change-branch unrelated change"),
Contains("second change"),
Contains("first change"),