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

more refactoring of popup stuff

Browse Source
This commit is contained in:
Jesse Duffield
2022-12-27 11:34:41 +11:00
parent 8052ac4fd6
commit 926ed7b9b2
23 changed files with 173 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
)
input.Press(keys.Commits.PasteCommits)
input.Alert(Equals("Cherry-Pick"), Contains("Are you sure you want to cherry-pick the copied commits onto this branch?"))
input.Alert().Title(Equals("Cherry-Pick")).Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).Confirm()
input.Confirmation().
Title(Equals("Auto-merge failed")).