Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-02-20 12:14:50 +0300
committerRémy Coutable <remy@rymai.me>2019-02-20 12:14:50 +0300
commit7e6a17a280558af5b51a81a741a5ddf98d7ab2d3 (patch)
tree5d231611da994a0a185be82aef6a347984a11a94 /spec
parentdd28b621f986ebc2cd591e6ae39b4a018f10d622 (diff)
parentc220f300815bc9dbfe69debcbd8331fa193eeb9f (diff)
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
Diffstat (limited to 'spec')
-rw-r--r--spec/services/web_hook_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/web_hook_service_spec.rb b/spec/services/web_hook_service_spec.rb
index 5945a7dc0ad..747e04fb18c 100644
--- a/spec/services/web_hook_service_spec.rb
+++ b/spec/services/web_hook_service_spec.rb
@@ -102,7 +102,7 @@ describe WebHookService do
exception = exception_class.new('Exception message')
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
end
end