diff options
author | Stan Hu <stanhu@gmail.com> | 2016-10-18 21:26:20 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-10-18 21:26:20 -0700 |
commit | 47b0edbe746d5ca2a1502d3f0bf0213fe1789567 (patch) | |
tree | 8d26a1f4005849652211f408817966af3bce56e7 /spec/services | |
parent | f64e36c44832db125beab5923c0177ff69ccedba (diff) | |
download | gitlab-ce-47b0edbe746d5ca2a1502d3f0bf0213fe1789567.tar.gz |
Improve error logging of MergeService
Relates to #23505
Diffstat (limited to 'spec/services')
-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 ee53e110aee..9163c0c104e 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -120,13 +120,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 |