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/branch | |
| parent | eabe7f462a1f950d05b66306c19a00855e3fa175 (diff) | |
migrate more tests
Diffstat (limited to 'pkg/integration/tests/branch')
| -rw-r--r-- | pkg/integration/tests/branch/rebase.go | 10 | ||||
| -rw-r--r-- | pkg/integration/tests/branch/rebase_and_drop.go | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go index e59aa8cb2..211dca839 100644 --- a/pkg/integration/tests/branch/rebase.go +++ b/pkg/integration/tests/branch/rebase.go @@ -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")) diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go index 5f5341d66..04c2246ab 100644 --- a/pkg/integration/tests/branch/rebase_and_drop.go +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -43,10 +43,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Information().Content(Contains("rebasing")) - t.ExpectPopup().Confirmation(). - Title(Equals("Auto-merge failed")). - Content(Contains("Conflicts!")). - Confirm() + t.Actions().AcknowledgeConflicts() t.Views().Files().IsFocused(). SelectedLine(MatchesRegexp("UU.*file")) @@ -78,10 +75,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). PressPrimaryAction() - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Confirm() + t.Actions().ContinueOnConflictsResolved() t.Views().Information().Content(DoesNotContain("rebasing")) |