diff --git a/pkg/integration/tests/commit/find_base_commit_for_fixup.go b/pkg/integration/tests/commit/find_base_commit_for_fixup.go index 4440932e9..22b6b4ed9 100644 --- a/pkg/integration/tests/commit/find_base_commit_for_fixup.go +++ b/pkg/integration/tests/commit/find_base_commit_for_fixup.go @@ -36,9 +36,9 @@ var FindBaseCommitForFixup = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Alert(). Title(Equals("Error")). Content( - Contains("Multiple base commits found"). - Contains("2nd commit"). - Contains("3rd commit"), + MatchesRegexp("Multiple base commits found.*\n\n" + + ".*2nd commit\n" + + ".*3rd commit"), ). Confirm() diff --git a/pkg/integration/tests/commit/find_base_commit_for_fixup_only_added_lines.go b/pkg/integration/tests/commit/find_base_commit_for_fixup_only_added_lines.go index 281fe72f9..6b1c96150 100644 --- a/pkg/integration/tests/commit/find_base_commit_for_fixup_only_added_lines.go +++ b/pkg/integration/tests/commit/find_base_commit_for_fixup_only_added_lines.go @@ -39,9 +39,11 @@ var FindBaseCommitForFixupOnlyAddedLines = NewIntegrationTest(NewIntegrationTest t.ExpectPopup().Alert(). Title(Equals("Error")). Content( - Contains("Multiple base commits found"). - Contains("3rd commit"). - Contains("4th commit"), + MatchesRegexp( + "Multiple base commits found.*\n\n" + + ".*4th commit\n" + + ".*3rd commit", + ), ). Confirm()