go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-04 10:34:55 +02:00
Code Issues Releases Activity

Fix conflict test

Browse Source 
The test apply_in_reverse_with_conflict.go fails in git versions 2.30.8 and
earlier. Apparently the output "Applied patch to 'file2' cleanly" was only added
more recently. It's not essential that we check this output.
This commit is contained in:
Ryooooooga 2023-03-22 23:02:32 +09:00 committed by Stefan Haller
parent 30ce7c8085
commit 85f7aa9d7b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go
View File

@ -55,8 +55,7 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Alert(). t.ExpectPopup().Alert().
Title(Equals("Error")). Title(Equals("Error")).
Content(Contains("Applied patch to 'file1' with conflicts."). Content(Contains("Applied patch to 'file1' with conflicts.")).
Contains("Applied patch to 'file2' cleanly.")).
Confirm() Confirm()
t.Views().Files(). t.Views().Files().