diff options
Diffstat (limited to 'spec/services/merge_requests/ff_merge_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/ff_merge_service_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/services/merge_requests/ff_merge_service_spec.rb b/spec/services/merge_requests/ff_merge_service_spec.rb index aa5d6dcd1fb..5027acbba0a 100644 --- a/spec/services/merge_requests/ff_merge_service_spec.rb +++ b/spec/services/merge_requests/ff_merge_service_spec.rb @@ -108,7 +108,8 @@ RSpec.describe MergeRequests::FfMergeService do service.execute(merge_request) - expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message)) + expect(Gitlab::AppLogger).to have_received(:error) + .with(hash_including(message: a_string_matching(error_message))) end it 'logs and saves error if there is an PreReceiveError exception' do @@ -122,7 +123,8 @@ RSpec.describe MergeRequests::FfMergeService do service.execute(merge_request) expect(merge_request.merge_error).to include(error_message) - expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message)) + expect(Gitlab::AppLogger).to have_received(:error) + .with(hash_including(message: a_string_matching(error_message))) end it 'does not update squash_commit_sha if squash merge is not successful' do |