Commit 7e6a17a2 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Merge branch 'sh-fix-web-hook-spec-ruby-2.6' into 'master'

Fix WebHookService spec failing in Ruby 2.6

See merge request gitlab-org/gitlab-ce!25317
parents dd28b621 c220f300
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
exception ='Exception message') exception ='Exception message')
WebMock.stub_request(:post, project_hook.url).to_raise(exception) WebMock.stub_request(:post, project_hook.url).to_raise(exception)
expect(service_instance.execute).to eq({ status: :error, message: exception.message }) expect(service_instance.execute).to eq({ status: :error, message: exception.to_s })
expect { service_instance.execute }.not_to raise_error expect { service_instance.execute }.not_to raise_error
end end
end end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment