summaryrefslogtreecommitdiff
path: root/spec/models/hooks
diff options
context:
space:
mode:
authorbugagazavr <kirik910@gmail.com>2015-01-24 03:10:43 +0300
committerKirill Zaitsev <kirik910@gmail.com>2015-04-25 21:31:52 +0300
commit548f182814acd0f7a110e6c165c186e345901b00 (patch)
tree26bb991cb343dd48c81f1004016817e634ee5039 /spec/models/hooks
parent5cb325b50188fb2ba6483e710a29350c4b0b06ae (diff)
downloadgitlab-ce-548f182814acd0f7a110e6c165c186e345901b00.tar.gz
Added X-GitLab-Event header for web hooks
Diffstat (limited to 'spec/models/hooks')
-rw-r--r--spec/models/hooks/web_hook_spec.rb14
1 files changed, 9 insertions, 5 deletions
diff --git a/spec/models/hooks/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb
index 67ec9193ad7..14f873e6b5a 100644
--- a/spec/models/hooks/web_hook_spec.rb
+++ b/spec/models/hooks/web_hook_spec.rb
@@ -52,22 +52,26 @@ describe ProjectHook do
end
it "POSTs to the web hook URL" do
- @project_hook.execute(@data)
- expect(WebMock).to have_requested(:post, @project_hook.url).once
+ @project_hook.execute(@data, 'push_hooks')
+ expect(WebMock).to have_requested(:post, @project_hook.url).
+ with(headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Push Hook'}).
+ once
end
it "POSTs the data as JSON" do
json = @data.to_json
- @project_hook.execute(@data)
- expect(WebMock).to have_requested(:post, @project_hook.url).with(body: json).once
+ @project_hook.execute(@data, 'push_hooks')
+ expect(WebMock).to have_requested(:post, @project_hook.url).
+ with(headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Push Hook'}).
+ once
end
it "catches exceptions" do
expect(WebHook).to receive(:post).and_raise("Some HTTP Post error")
expect {
- @project_hook.execute(@data)
+ @project_hook.execute(@data, 'push_hooks')
}.to raise_error
end
end