diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-05-02 19:51:20 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-05-02 19:51:20 +0200 |
| commit | 15bb2f9178975740c7bc4f8b8bf79553fc53546a (patch) | |
| tree | 6e676e251cd4970b52be977565115f063aa5e953 /spec/services | |
| parent | d03cd7b40a15b1b92717cbe9de42107d84ff0a36 (diff) | |
| parent | c7c9f38d01938963a8cdf7f5a3bd12ea53e22e59 (diff) | |
| download | gitlab-ce-15bb2f9178975740c7bc4f8b8bf79553fc53546a.tar.gz | |
Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
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 |