sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

migrate more tests

Browse Source
This commit is contained in:
Jesse Duffield
2023-02-22 22:25:18 +11:00
parent eabe7f462a
commit 1034962c7e
369 changed files with 499 additions and 913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,10 +35,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")).
Confirm()
t.ExpectPopup().Confirmation().
Title(Equals("Auto-merge failed")).
Content(Contains("Conflicts!")).
Confirm()
t.Actions().AcknowledgeConflicts()
t.Views().Files().
IsFocused().
@ -51,10 +48,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Information().Content(Contains("rebasing"))
t.ExpectPopup().Confirmation().
Title(Equals("continue")).
Content(Contains("all merge conflicts resolved. Continue?")).
Confirm()
t.Actions().ContinueOnConflictsResolved()
t.Views().Information().Content(DoesNotContain("rebasing"))