diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2023-03-03 15:44:11 +0100 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2023-06-22 18:57:43 +0200 |
| commit | cddf056f4d88e23ba7c2aa2263b9a2b1608ff651 (patch) | |
| tree | b4d1130666210e92811c5b787bad7210e4be8128 /pkg/integration | |
| parent | 41b00c8313fd46aea665a59af580736bed29eef3 (diff) | |
Extend test to expect what commits we want to be listed when there's a conflict
Diffstat (limited to 'pkg/integration')
| -rw-r--r-- | pkg/integration/tests/interactive_rebase/shared.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/integration/tests/interactive_rebase/shared.go b/pkg/integration/tests/interactive_rebase/shared.go index db45f42e3..2d3746af4 100644 --- a/pkg/integration/tests/interactive_rebase/shared.go +++ b/pkg/integration/tests/interactive_rebase/shared.go @@ -7,6 +7,13 @@ import ( func handleConflictsFromSwap(t *TestDriver) { t.Common().AcknowledgeConflicts() + t.Views().Commits(). + Lines( + Contains("pick").Contains("commit two"), + // Would be nice to see "three" here, it's the one that conflicted + Contains("<-- YOU ARE HERE --- commit one"), + ) + t.Views().Files(). IsFocused(). Lines( |