go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-12-01 22:52:01 +02:00
Code Issues Releases Activity

cleanup integration test code

Browse Source
This commit is contained in:
Jesse Duffield
2023-02-26 11:49:15 +11:00
parent 8b5d59c238
commit f7e8b2dd71
70 changed files with 322 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/integration/tests/sync/pull_merge_conflict.go
View File

@@ -40,7 +40,7 @@ var PullMergeConflict = NewIntegrationTest(NewIntegrationTestArgs{
IsFocused().
Press(keys.Universal.Pull)
t.Actions().AcknowledgeConflicts()
t.Common().AcknowledgeConflicts()
t.Views().Files().
IsFocused().
@@ -60,7 +60,7 @@ var PullMergeConflict = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction() // choose 'content4'
t.Actions().ContinueOnConflictsResolved()
t.Common().ContinueOnConflictsResolved()
t.Views().Status().Content(Contains("↑2 repo → master"))