Add latest changes from gitlab-org/gitlab@master

2 files changed, 38 insertions, 32 deletions

diff --git a/spec/mailers/emails/merge_requests_spec.rb b/spec/mailers/emails/merge_requests_spec.rb
index 5ab0265203e..1a61d3c4362 100644
--- a/spec/mailers/emails/merge_requests_spec.rb
+++ b/spec/mailers/emails/merge_requests_spec.rb
@@ -6,7 +6,8 @@ require 'email_spec'
 RSpec.describe Emails::MergeRequests do
   include EmailSpec::Matchers
 
-  let_it_be(:recipient) { create(:user) }
+  include_context 'gitlab email notification'
+
   let_it_be(:current_user) { create(:user) }
   let_it_be(:assignee, reload: true) { create(:user, email: 'assignee@example.com', name: 'John Doe') }
   let_it_be(:reviewer, reload: true) { create(:user, email: 'reviewer@example.com', name: 'Jane Doe') }
@@ -20,6 +21,42 @@ RSpec.describe Emails::MergeRequests do
                            description: 'Awesome description')
   end
 
+  let(:recipient) { assignee }
+
+  describe '#merged_merge_request_email' do
+    let(:merge_author) { assignee }
+
+    subject { Notify.merged_merge_request_email(recipient.id, merge_request.id, merge_author.id) }
+
+    it_behaves_like 'a multiple recipients email'
+    it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
+      let(:model) { merge_request }
+    end
+
+    it_behaves_like 'it should show Gmail Actions View Merge request link'
+    it_behaves_like 'an unsubscribeable thread'
+    it_behaves_like 'appearance header and footer enabled'
+    it_behaves_like 'appearance header and footer not enabled'
+
+    it 'is sent as the merge author' do
+      sender = subject.header[:from].addrs[0]
+      expect(sender.display_name).to eq(merge_author.name)
+      expect(sender.address).to eq(gitlab_sender)
+    end
+
+    it 'has the correct subject and body' do
+      aggregate_failures do
+        is_expected.to have_referable_subject(merge_request, reply: true)
+        is_expected.to have_body_text('merged')
+        is_expected.to have_body_text(project_merge_request_path(project, merge_request))
+        is_expected.to have_link(merge_request.to_reference, href: project_merge_request_url(merge_request.target_project, merge_request))
+
+        expect(subject.text_part).to have_content(assignee.name)
+        expect(subject.text_part).to have_content(reviewer.name)
+      end
+    end
+  end
+
   describe "#merge_when_pipeline_succeeds_email" do
     let(:title) { "Merge request #{merge_request.to_reference} was scheduled to merge after pipeline succeeds by #{current_user.name}" }
 
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index a965980271b..762c57615b8 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -495,37 +495,6 @@ RSpec.describe Notify do
         end
       end
 
-      describe 'that are merged' do
-        let(:merge_author) { create(:user) }
-
-        subject { described_class.merged_merge_request_email(recipient.id, merge_request.id, merge_author.id) }
-
-        it_behaves_like 'a multiple recipients email'
-        it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
-          let(:model) { merge_request }
-        end
-
-        it_behaves_like 'it should show Gmail Actions View Merge request link'
-        it_behaves_like 'an unsubscribeable thread'
-        it_behaves_like 'appearance header and footer enabled'
-        it_behaves_like 'appearance header and footer not enabled'
-
-        it 'is sent as the merge author' do
-          sender = subject.header[:from].addrs[0]
-          expect(sender.display_name).to eq(merge_author.name)
-          expect(sender.address).to eq(gitlab_sender)
-        end
-
-        it 'has the correct subject and body' do
-          aggregate_failures do
-            is_expected.to have_referable_subject(merge_request, reply: true)
-            is_expected.to have_body_text('merged')
-            is_expected.to have_body_text(project_merge_request_path(project, merge_request))
-            is_expected.to have_link(merge_request.to_reference, href: project_merge_request_url(merge_request.target_project, merge_request))
-          end
-        end
-      end
-
       describe 'that are unmergeable' do
         let_it_be(:merge_request) do
           create(:merge_request, :conflict,