2 files changed, 78 insertions, 5 deletions
diff --git a/spec/helpers/emails_helper_spec.rb b/spec/helpers/emails_helper_spec.rb
index 03b4c19ec22..0434af25866 100644
--- a/spec/helpers/emails_helper_spec.rb
+++ b/spec/helpers/emails_helper_spec.rb
@@ -1,6 +1,45 @@
 require 'spec_helper'
 
 describe EmailsHelper do
+  describe 'closure_reason_text' do
+    context 'when given a MergeRequest' do
+      let(:merge_request) { create(:merge_request) }
+      let(:merge_request_presenter) { merge_request.present }
+
+      context "and format is text" do
+        it "returns plain text" do
+          expect(closure_reason_text(merge_request, format: :text)).to eq(" via merge request #{merge_request.to_reference} (#{merge_request_presenter.web_url})")
+        end
+      end
+
+      context "and format is HTML" do
+        it "returns HTML" do
+          expect(closure_reason_text(merge_request, format: :html)).to eq(" via merge request #{link_to(merge_request.to_reference, merge_request_presenter.web_url)}")
+        end
+      end
+
+      context "and format is unknown" do
+        it "returns plain text" do
+          expect(closure_reason_text(merge_request, format: :text)).to eq(" via merge request #{merge_request.to_reference} (#{merge_request_presenter.web_url})")
+        end
+      end
+    end
+
+    context 'when given a String' do
+      let(:closed_via) { "5a0eb6fd7e0f133044378c662fcbbc0d0c16dbfa" }
+
+      it "returns plain text" do
+        expect(closure_reason_text(closed_via)).to eq(" via #{closed_via}")
+      end
+    end
+
+    context 'when not given anything' do
+      it "returns empty string" do
+        expect(closure_reason_text(nil)).to eq("")
+      end
+    end
+  end
+
   describe 'sanitize_name' do
     context 'when name contains a valid URL string' do
       it 'returns name with `.` replaced with `_` to prevent mail clients from auto-linking URLs' do
diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb
index fce9eed8b08..6874a8a0929 100644
--- a/spec/services/issues/close_service_spec.rb
+++ b/spec/services/issues/close_service_spec.rb
@@ -3,11 +3,13 @@
 require 'spec_helper'
 
 describe Issues::CloseService do
-  let(:user) { create(:user) }
-  let(:user2) { create(:user) }
+  let(:project) { create(:project, :repository) }
+  let(:user) { create(:user, email: "user@example.com") }
+  let(:user2) { create(:user, email: "user2@example.com") }
   let(:guest) { create(:user) }
-  let(:issue) { create(:issue, assignees: [user2], author: create(:user)) }
-  let(:project) { issue.project }
+  let(:issue) { create(:issue, title: "My issue", project: project, assignees: [user2], author: create(:user)) }
+  let(:closing_merge_request) { create(:merge_request, source_project: project) }
+  let(:closing_commit) { create(:commit, project: project) }
   let!(:todo) { create(:todo, :assigned, user: user, project: project, target: issue, author: user2) }
 
   before do
@@ -39,7 +41,7 @@ describe Issues::CloseService do
         .and_return(true)
 
       expect(service).to receive(:close_issue)
-        .with(issue, commit: nil, notifications: true, system_note: true)
+        .with(issue, closed_via: nil, notifications: true, system_note: true)
 
       service.execute(issue)
     end
@@ -57,6 +59,38 @@ describe Issues::CloseService do
   end
 
   describe '#close_issue' do
+    context "closed by a merge request" do
+      before do
+        perform_enqueued_jobs do
+          described_class.new(project, user).close_issue(issue, closed_via: closing_merge_request)
+        end
+      end
+
+      it 'mentions closure via a merge request' do
+        email = ActionMailer::Base.deliveries.last
+
+        expect(email.to.first).to eq(user2.email)
+        expect(email.subject).to include(issue.title)
+        expect(email.body.parts.map(&:body)).to all(include(closing_merge_request.to_reference))
+      end
+    end
+
+    context "closed by a commit" do
+      before do
+        perform_enqueued_jobs do
+          described_class.new(project, user).close_issue(issue, closed_via: closing_commit)
+        end
+      end
+
+      it 'mentions closure via a commit' do
+        email = ActionMailer::Base.deliveries.last
+
+        expect(email.to.first).to eq(user2.email)
+        expect(email.subject).to include(issue.title)
+        expect(email.body.parts.map(&:body)).to all(include(closing_commit.id))
+      end
+    end
+
     context "valid params" do
       before do
         perform_enqueued_jobs do