summaryrefslogtreecommitdiff
path: root/spec/models/hooks
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-08 12:47:09 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-08 12:47:09 +0100
commit048605bd33935cd2b37c72bf2b725e9c37e1f6e8 (patch)
treecaf35eb873412ae71721e9244c1f899e351cff3e /spec/models/hooks
parenta426fb1596978221510c8c78a17703658ad7d161 (diff)
parentf5430e48b42227f1c1874ca27c6907f0f704be28 (diff)
downloadgitlab-ce-issue-closing-docs.tar.gz
Merge branch 'master' into issue-closing-docsissue-closing-docs
Diffstat (limited to 'spec/models/hooks')
-rw-r--r--spec/models/hooks/web_hook_spec.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/models/hooks/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb
index 2fdc49f02ee..35042788c65 100644
--- a/spec/models/hooks/web_hook_spec.rb
+++ b/spec/models/hooks/web_hook_spec.rb
@@ -71,5 +71,11 @@ describe ProjectHook do
expect { @project_hook.execute(@data, 'push_hooks') }.to raise_error(RuntimeError)
end
+
+ it "handles SSL exceptions" do
+ expect(WebHook).to receive(:post).and_raise(OpenSSL::SSL::SSLError.new('SSL error'))
+
+ expect(@project_hook.execute(@data, 'push_hooks')).to eq([false, 'SSL error'])
+ end
end
end