Commit 6152d7a3 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'ce-6117-unify-preview-mailer' into 'master'

CE: Resolve "Extract EE specific files/lines for spec/mailers, app/mailers/preview"

See merge request gitlab-org/gitlab-ce!20508
parents 1f526071 220f37a0
...@@ -314,6 +314,17 @@ describe Notify do ...@@ -314,6 +314,17 @@ describe Notify do
end end
end end
describe 'that are new with a description' do
subject { described_class.new_merge_request_email(merge_request.assignee_id, merge_request.id) }
it_behaves_like 'it should show Gmail Actions View Merge request link'
it_behaves_like "an unsubscribeable thread"
it 'contains the description' do
is_expected.to have_body_text(merge_request.description)
end
end
describe 'that have been relabeled' do describe 'that have been relabeled' do
subject { described_class.relabeled_merge_request_email(recipient.id, merge_request.id, %w[foo bar baz], current_user.id) } subject { described_class.relabeled_merge_request_email(recipient.id, merge_request.id, %w[foo bar baz], current_user.id) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment