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

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index a9a45367b4a..effbfb1ba84 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -314,6 +314,17 @@ describe Notify do
         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
         subject { described_class.relabeled_merge_request_email(recipient.id, merge_request.id, %w[foo bar baz], current_user.id) }