diff options
Diffstat (limited to 'spec/services/merge_requests/squash_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/squash_service_spec.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/spec/services/merge_requests/squash_service_spec.rb b/spec/services/merge_requests/squash_service_spec.rb index 387be8471b5..9210242a11e 100644 --- a/spec/services/merge_requests/squash_service_spec.rb +++ b/spec/services/merge_requests/squash_service_spec.rb @@ -222,11 +222,13 @@ RSpec.describe MergeRequests::SquashService do it 'logs the error' do expect(service).to receive(:log_error).with(exception: exception, message: 'Failed to squash merge request').and_call_original expect(Gitlab::ErrorTracking).to receive(:track_exception).with(exception, - class: described_class.to_s, - merge_request: merge_request_ref, - merge_request_id: merge_request.id, - message: 'Failed to squash merge request', - save_message_on_model: false).and_call_original + { + class: described_class.to_s, + merge_request: merge_request_ref, + merge_request_id: merge_request.id, + message: 'Failed to squash merge request', + save_message_on_model: false + }).and_call_original service.execute end |