ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

add prompt asserter

Browse Source
This commit is contained in:
Jesse Duffield
2022-12-27 11:21:44 +11:00
parent c976839a63
commit 8052ac4fd6
18 changed files with 86 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/integration/tests/branch/rebase.go
View File

@@ -31,11 +31,11 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
input.NextItem()
input.Press(keys.Branches.RebaseBranch)
input.InConfirm().
input.Confirmation().
Title(Equals("Rebasing")).
Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")).
Confirm()
input.InConfirm().
input.Confirmation().
Title(Equals("Auto-merge failed")).
Content(Contains("Conflicts!")).
Confirm()
@@ -51,7 +51,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
assert.View("information").Content(Contains("rebasing"))
input.InConfirm().
input.Confirmation().
Title(Equals("continue")).
Content(Contains("all merge conflicts resolved. Continue?")).
Confirm()