Add specs

1 files changed, 123 insertions, 19 deletions

diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 01246f87dff..fcbbc3166ed 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -63,7 +63,7 @@ describe Notify do
 
             it 'contains a link to note author' do
               is_expected.to have_html_escaped_body_text(issue.author_name)
-              is_expected.to have_body_text 'wrote:'
+              is_expected.to have_body_text 'created an issue:'
             end
           end
         end
@@ -215,7 +215,7 @@ describe Notify do
 
             it 'contains a link to note author' do
               is_expected.to have_html_escaped_body_text merge_request.author_name
-              is_expected.to have_body_text 'wrote:'
+              is_expected.to have_body_text 'created a merge request:'
             end
           end
         end
@@ -536,8 +536,6 @@ describe Notify do
         allow(Note).to receive(:find).with(note.id).and_return(note)
       end
 
-      # TODO: Test discussions
-
       shared_examples 'a note email' do
         it_behaves_like 'it should have Gmail Actions links'
 
@@ -556,7 +554,7 @@ describe Notify do
         end
 
         it 'does not contain note author' do
-          is_expected.not_to have_body_text 'wrote:'
+          is_expected.not_to have_body_text note.author_name
         end
 
         context 'when enabled email_author_in_body' do
@@ -566,7 +564,6 @@ describe Notify do
 
           it 'contains a link to note author' do
             is_expected.to have_html_escaped_body_text note.author_name
-            is_expected.to have_body_text 'wrote:'
           end
         end
       end
@@ -639,7 +636,7 @@ describe Notify do
       end
     end
 
-    context 'items that are noteable, emails for a note on a diff' do
+    context 'items that are noteable, the email for a discussion note' do
       let(:project) { create(:project, :repository) }
       let(:note_author) { create(:user, name: 'author_name') }
 
@@ -647,7 +644,117 @@ describe Notify do
         allow(Note).to receive(:find).with(note.id).and_return(note)
       end
 
-      shared_examples 'a note email on a diff' do  |model|
+      shared_examples 'a discussion note email' do |model|
+        it_behaves_like 'it should have Gmail Actions links'
+
+        it 'is sent as the author' do
+          sender = subject.header[:from].addrs[0]
+          expect(sender.display_name).to eq(note_author.name)
+          expect(sender.address).to eq(gitlab_sender)
+        end
+
+        it 'is sent to the given recipient' do
+          is_expected.to deliver_to recipient.notification_email
+        end
+
+        it 'contains the message from the note' do
+          is_expected.to have_body_text note.note
+        end
+
+        it 'contains an introduction' do
+          is_expected.to have_body_text 'started a new discussion'
+        end
+
+        context 'when a comment on an existing discussion' do
+          let!(:second_note) { create(model, author: note_author, noteable: nil, in_reply_to: note) }
+
+          it 'contains an introduction' do
+            is_expected.to have_body_text 'commented on a'
+          end
+        end
+      end
+
+      describe 'on a commit' do
+        let(:commit) { project.commit }
+        let(:note) { create(:discussion_note_on_commit, commit_id: commit.id, project: project, author: note_author) }
+
+        before(:each) { allow(note).to receive(:noteable).and_return(commit) }
+
+        subject { Notify.note_commit_email(recipient.id, note.id) }
+
+        it_behaves_like 'a discussion note email', :discussion_note_on_commit
+        it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
+          let(:model) { commit }
+        end
+        it_behaves_like 'it should show Gmail Actions View Commit link'
+        it_behaves_like 'a user cannot unsubscribe through footer link'
+
+        it 'has the correct subject' do
+          is_expected.to have_subject "Re: #{project.name} | #{commit.title.strip} (#{commit.short_id})"
+        end
+
+        it 'contains a link to the commit' do
+          is_expected.to have_body_text commit.short_id
+        end
+      end
+
+      describe 'on a merge request' do
+        let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
+        let(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project, author: note_author) }
+        let(:note_on_merge_request_path) { namespace_project_merge_request_path(project.namespace, project, merge_request, anchor: "note_#{note.id}") }
+        before(:each) { allow(note).to receive(:noteable).and_return(merge_request) }
+
+        subject { Notify.note_merge_request_email(recipient.id, note.id) }
+
+        it_behaves_like 'a discussion note email', :discussion_note_on_merge_request
+        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 'has the correct subject' do
+          is_expected.to have_referable_subject(merge_request, reply: true)
+        end
+
+        it 'contains a link to the merge request note' do
+          is_expected.to have_body_text note_on_merge_request_path
+        end
+      end
+
+      describe 'on an issue' do
+        let(:issue) { create(:issue, project: project) }
+        let(:note) { create(:discussion_note_on_issue, noteable: issue, project: project, author: note_author) }
+        let(:note_on_issue_path) { namespace_project_issue_path(project.namespace, project, issue, anchor: "note_#{note.id}") }
+        before(:each) { allow(note).to receive(:noteable).and_return(issue) }
+
+        subject { Notify.note_issue_email(recipient.id, note.id) }
+
+        it_behaves_like 'a discussion note email', :discussion_note_on_issue
+        it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
+          let(:model) { issue }
+        end
+        it_behaves_like 'it should show Gmail Actions View Issue link'
+        it_behaves_like 'an unsubscribeable thread'
+
+        it 'has the correct subject' do
+          is_expected.to have_referable_subject(issue, reply: true)
+        end
+
+        it 'contains a link to the issue note' do
+          is_expected.to have_body_text note_on_issue_path
+        end
+      end
+    end
+
+    context 'items that are noteable, the email for a diff discussion note' do
+      let(:note_author) { create(:user, name: 'author_name') }
+
+      before :each do
+        allow(Note).to receive(:find).with(note.id).and_return(note)
+      end
+
+      shared_examples 'an email for a note on a diff discussion' do  |model|
         let(:note) { create(model, project: project, author: note_author) }
 
         it "includes diffs with character-level highlighting" do
@@ -674,18 +781,15 @@ describe Notify do
           is_expected.to have_html_escaped_body_text note.note
         end
 
-        it 'does not contain note author' do
-          is_expected.not_to have_body_text 'wrote:'
+        it 'contains an introduction' do
+          is_expected.to have_body_text 'started a new discussion on'
         end
 
-        context 'when enabled email_author_in_body' do
-          before do
-            stub_application_setting(email_author_in_body: true)
-          end
+        context 'when a comment on an existing discussion' do
+          let!(:second_note) { create(model, author: note_author, noteable: nil, in_reply_to: note) }
 
-          it 'contains a link to note author' do
-            is_expected.to have_html_escaped_body_text note.author_name
-            is_expected.to have_body_text 'wrote:'
+          it 'contains an introduction' do
+            is_expected.to have_body_text 'commented on a discussion on'
           end
         end
       end
@@ -696,7 +800,7 @@ describe Notify do
 
         subject { Notify.note_commit_email(recipient.id, note.id) }
 
-        it_behaves_like 'a note email on a diff', :diff_note_on_commit
+        it_behaves_like 'an email for a note on a diff discussion', :diff_note_on_commit
         it_behaves_like 'it should show Gmail Actions View Commit link'
         it_behaves_like 'a user cannot unsubscribe through footer link'
       end
@@ -707,7 +811,7 @@ describe Notify do
 
         subject { Notify.note_merge_request_email(recipient.id, note.id) }
 
-        it_behaves_like 'a note email on a diff', :diff_note_on_merge_request
+        it_behaves_like 'an email for a note on a diff discussion', :diff_note_on_merge_request
         it_behaves_like 'it should show Gmail Actions View Merge request link'
         it_behaves_like 'an unsubscribeable thread'
       end