Handle custom Git hook result in GitLab UI

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 1b0396eb686..2f72cd60071 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -65,6 +65,16 @@ describe MergeRequests::MergeService, services: true do
 
         expect(merge_request.merge_error).to eq("Something went wrong during merge")
       end
+
+      it 'saves error if there is an PreReceiveError exception' do
+        allow(service).to receive(:repository).and_raise(GitHooksService::PreReceiveError, "error")
+
+        allow(service).to receive(:execute_hooks)
+
+        service.execute(merge_request)
+
+        expect(merge_request.merge_error).to eq("error")
+      end
     end
   end
 end