From eb6f089a2a595a0600e6e439c4681c84a2c3e093 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Wed, 21 Jun 2023 21:51:32 +0200 Subject: [PATCH] Add author short names to commits in test This allow us to check not only whether a given commit has the branch head marker, but also that other commits _don't_ have it, which is important. --- .../drop_todo_commit_with_update_ref.go | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go b/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go index 163973226..2302a3b69 100644 --- a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go +++ b/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go @@ -25,26 +25,26 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 07").IsSelected(), - Contains("commit 06"), - Contains("commit 05"), - Contains("commit 04"), - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("CI commit 07").IsSelected(), + Contains("CI commit 06"), + Contains("CI commit 05"), + Contains("CI commit 04"), + Contains("CI commit 03"), + Contains("CI commit 02"), + Contains("CI commit 01"), ). NavigateToLine(Contains("commit 02")). Press(keys.Universal.Edit). Focus(). Lines( - Contains("pick").Contains("commit 07"), - Contains("pick").Contains("commit 06"), - Contains("pick").Contains("commit 05"), + Contains("pick").Contains("CI commit 07"), + Contains("pick").Contains("CI commit 06"), + Contains("pick").Contains("CI commit 05"), Contains("update-ref").Contains("branch1"), - Contains("pick").Contains("commit 04"), - Contains("pick").Contains("commit 03"), + Contains("pick").Contains("CI commit 04"), + Contains("pick").Contains("CI commit 03"), Contains("<-- YOU ARE HERE --- commit 02"), - Contains("commit 01"), + Contains("CI commit 01"), ). NavigateToLine(Contains("commit 06")). Press(keys.Universal.Remove) @@ -54,12 +54,12 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). IsFocused(). Lines( - Contains("commit 07"), - Contains("commit 05"), - Contains("commit 04"), - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("CI commit 07"), + Contains("CI commit 05"), + Contains("CI commit 04"), + Contains("CI commit 03"), + Contains("CI commit 02"), + Contains("CI commit 01"), ) }, })