diff options
author | Nick Thomas <nick@gitlab.com> | 2018-05-02 16:02:43 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-05-02 16:02:43 +0000 |
commit | 59f79383a7f8dadd9c356f3872133e7675dd61c5 (patch) | |
tree | be37a7cf50e2963ab25721360ad27471370c1868 /spec/services | |
parent | dbe12754be46786f4ac71d2e45e39f525c74f0cb (diff) | |
parent | d973872072097152bf16ebb808a2c65912b9f3d0 (diff) | |
download | gitlab-ce-59f79383a7f8dadd9c356f3872133e7675dd61c5.tar.gz |
Merge branch 'jprovazn-generic-error' into 'master'
Save and expose only generic merge error
See merge request gitlab-org/gitlab-ce!18646
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 c38ddf4612b..e8568bf8bb3 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -219,7 +219,7 @@ describe MergeRequests::MergeService do service.execute(merge_request) - expect(merge_request.merge_error).to include(error_message) + expect(merge_request.merge_error).to include('Something went wrong during merge') expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message)) end @@ -231,7 +231,7 @@ describe MergeRequests::MergeService do service.execute(merge_request) - expect(merge_request.merge_error).to include(error_message) + expect(merge_request.merge_error).to include('Something went wrong during merge pre-receive hook') expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message)) end |