diff options
author | Robert Speicher <robert@gitlab.com> | 2016-10-19 13:07:56 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-20 18:13:05 +0300 |
commit | 227a9b44cf0dffcdbbf0d65ccfb96818870afc2c (patch) | |
tree | b7f9bc9e7a551919f551b153efd4b54d60756154 /spec | |
parent | 9c783a60ba6cbfd8525948e0016b37ce0f0448f1 (diff) |
Merge branch 'sh-improve-merge-service-logging' into 'master'
Improve error logging of MergeService
Relates to #23505
See merge request !6975
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index 47d5536818e..f93d7732a9a 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -132,13 +132,13 @@ describe MergeRequests::MergeService, services: true do let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') } it 'saves error if there is an exception' do - allow(service).to receive(:repository).and_raise("error") + allow(service).to receive(:repository).and_raise("error message") allow(service).to receive(:execute_hooks) service.execute(merge_request) - expect(merge_request.merge_error).to eq("Something went wrong during merge") + expect(merge_request.merge_error).to eq("Something went wrong during merge: error message") end it 'saves error if there is an PreReceiveError exception' do |