diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-13 15:08:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-13 15:08:49 +0300 |
| commit | 988424215cf104d9ee24bb1751141424cffb32d1 (patch) | |
| tree | 9d2525571ecc693902b949ac8441e8c97b299c3c /spec/mailers | |
| parent | 2705a15deaef07b1a38a53b9539d02f8ad499ce3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/mailers')
| -rw-r--r-- | spec/mailers/emails/merge_requests_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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 |