diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-22 22:25:18 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-22 22:29:01 +1100 |
| commit | 1034962c7edad578427d056b7421c9195c29a457 (patch) | |
| tree | c901a2309df784d3cdbe4d337c8b03acf61e20d2 /pkg/integration/tests/file/discard_changes.go | |
| parent | eabe7f462a1f950d05b66306c19a00855e3fa175 (diff) | |
migrate more tests
Diffstat (limited to 'pkg/integration/tests/file/discard_changes.go')
| -rw-r--r-- | pkg/integration/tests/file/discard_changes.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkg/integration/tests/file/discard_changes.go b/pkg/integration/tests/file/discard_changes.go index f3fc11a01..7a05f4466 100644 --- a/pkg/integration/tests/file/discard_changes.go +++ b/pkg/integration/tests/file/discard_changes.go @@ -99,10 +99,7 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{ {status: "DU", label: "deleted-us.txt", menuTitle: "deleted-us.txt"}, }) - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Cancel() + t.Actions().ContinueOnConflictsResolved() discardOneByOne([]statusFile{ {status: "MD", label: "change-delete.txt", menuTitle: "change-delete.txt"}, |