diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-04-14 20:50:13 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-04-14 21:01:45 +1000 |
| commit | 7f5465a27bb52b9e17df35612bcaaf765de29a55 (patch) | |
| tree | 318325fdb3254e103e90d8459c3830848fa8a209 /pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go | |
| parent | 275ed1248657b85d40a77683db42e013295d64cf (diff) | |
fix flaky tests
Diffstat (limited to 'pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go')
| -rw-r--r-- | pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go index 04d160a01..04373622c 100644 --- a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go +++ b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go @@ -39,11 +39,15 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ ). // Add both files to the patch; the first will conflict, the second won't PressPrimaryAction(). + Tap(func() { + t.Views().Information().Content(Contains("building patch")) + + t.Views().PatchBuildingSecondary().Content( + Contains("+more file1 content")) + }). SelectNextItem(). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) - t.Views().PatchBuildingSecondary().Content( Contains("+more file1 content").Contains("+more file2 content")) |