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

various changes to improve integration tests

Browse Source
This commit is contained in:
Jesse Duffield
2022-09-09 21:11:05 -07:00
parent 7b757d1cfe
commit 7af7af27c6
103 changed files with 2883 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,9 +84,11 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
assert.CurrentViewName("mergeConflicts")
input.PrimaryAction()
assert.MatchViewContent("information", Contains("rebasing"))
assert.InConfirm()
assert.MatchCurrentViewContent(Contains("all merge conflicts resolved. Continue?"))
input.Confirm()
assert.MatchViewContent("information", NotContains("rebasing"))
// this proves we actually have integrated the changes from second-change-branch
assert.MatchViewContent("commits", Contains("second-change-branch unrelated change"))