From 988424215cf104d9ee24bb1751141424cffb32d1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 13 May 2022 12:08:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/mailers/emails/merge_requests_spec.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'spec/mailers') diff --git a/spec/mailers/emails/merge_requests_spec.rb b/spec/mailers/emails/merge_requests_spec.rb index d4dc7a76516..7682cf39450 100644 --- a/spec/mailers/emails/merge_requests_spec.rb +++ b/spec/mailers/emails/merge_requests_spec.rb @@ -65,7 +65,9 @@ RSpec.describe Emails::MergeRequests do is_expected.to have_body_text('due to conflict.') is_expected.to have_link(merge_request.to_reference, href: project_merge_request_url(merge_request.target_project, merge_request)) is_expected.to have_text_part_content(assignee.name) + is_expected.to have_html_part_content(assignee.name) is_expected.to have_text_part_content(reviewer.name) + is_expected.to have_html_part_content(reviewer.name) end end end -- cgit v1.2.3