Add action property to merge request hook

1 files changed, 14 insertions, 5 deletions

diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index cebeb0644d0..dbd21143690 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -5,21 +5,30 @@ describe MergeRequests::CreateService do
   let(:user) { create(:user) }
 
   describe :execute do
-    context "valid params" do
-      before do
-        project.team << [user, :master]
-        opts = {
+    context 'valid params' do
+      let(:opts) do
+        {
           title: 'Awesome merge_request',
           description: 'please fix',
           source_branch: 'stable',
           target_branch: 'master'
         }
+      end
+      let(:service) { MergeRequests::CreateService.new(project, user, opts) }
+
+      before do
+        project.team << [user, :master]
+        service.stub(:execute_hooks)
 
-        @merge_request = MergeRequests::CreateService.new(project, user, opts).execute
+        @merge_request = service.execute
       end
 
       it { @merge_request.should be_valid }
       it { @merge_request.title.should == 'Awesome merge_request' }
+
+      it 'should execute hooks with default action' do
+        expect(service).to have_received(:execute_hooks).with(@merge_request)
+      end
     end
   end
 end