Add action property to merge request hook

1 files changed, 44 insertions, 0 deletions

diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
new file mode 100644
index 00000000000..5f61fd3187b
--- /dev/null
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe MergeRequests::MergeService do
+  let(:user) { create(:user) }
+  let(:user2) { create(:user) }
+  let(:merge_request) { create(:merge_request, assignee: user2) }
+  let(:project) { merge_request.project }
+
+  before do
+    project.team << [user, :master]
+    project.team << [user2, :developer]
+  end
+
+  describe :execute do
+    context 'valid params' do
+      let(:service) { MergeRequests::MergeService.new(project, user, {}) }
+
+      before do
+        service.stub(:execute_hooks)
+
+        service.execute(merge_request, 'Awesome message')
+      end
+
+      it { merge_request.should be_valid }
+      it { merge_request.should be_merged }
+
+      it 'should execute hooks with merge action' do
+        expect(service).to have_received(:execute_hooks).
+                               with(merge_request, 'merge')
+      end
+
+      it 'should send email to user2 about merge of new merge_request' do
+        email = ActionMailer::Base.deliveries.last
+        email.to.first.should == user2.email
+        email.subject.should include(merge_request.title)
+      end
+
+      it 'should create system note about merge_request merge' do
+        note = merge_request.notes.last
+        note.note.should include 'Status changed to merged'
+      end
+    end
+  end
+end