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

refactor prompt handling in integration tests

Browse Source
This commit is contained in:
Jesse Duffield
2022-12-27 10:50:00 +11:00
parent 17140e1d8d
commit c976839a63
12 changed files with 114 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,10 @@ 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.AcceptConfirmation(Equals("Auto-merge failed"), Contains("Conflicts!"))
input.InConfirm().
Title(Equals("Auto-merge failed")).
Content(Contains("Conflicts!")).
Confirm()
assert.CurrentView().Name("files")
assert.CurrentView().SelectedLine(Contains("file"))
@ -61,7 +64,10 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
input.NextItem()
input.PrimaryAction()
input.AcceptConfirmation(Equals("continue"), Contains("all merge conflicts resolved. Continue?"))
input.InConfirm().
Title(Equals("continue")).
Content(Contains("all merge conflicts resolved. Continue?")).
Confirm()
assert.CurrentView().Name("files")
assert.WorkingTreeFileCount(0)