diff options
author | Robert Speicher <robert@gitlab.com> | 2016-05-11 16:34:00 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-05-11 16:34:00 +0000 |
commit | d8415389de859a0dab6e9efa7d8651577631aa7e (patch) | |
tree | dd3952c1d45ae738f673b705d672ff21199496ca /spec | |
parent | 51a8619a71cd8416db5a66cfbe2a5aa118bbef36 (diff) | |
parent | ebf80db3abcaf4a0e08273bf180aa33368610b8a (diff) | |
download | gitlab-ce-d8415389de859a0dab6e9efa7d8651577631aa7e.tar.gz |
Merge branch 'hook-docs-behavior' into 'master'
Improve documentation and web test for web hooks
Tips and documentation of actual hook behavior. Improved user feedback
when testing hooks via the web UI.
See merge request !4015
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/hooks/web_hook_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/hooks/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb index 37a27d73aab..f9bab487b96 100644 --- a/spec/models/hooks/web_hook_spec.rb +++ b/spec/models/hooks/web_hook_spec.rb @@ -95,13 +95,13 @@ describe WebHook, models: true do it "handles 200 status code" do WebMock.stub_request(:post, project_hook.url).to_return(status: 200, body: "Success") - expect(project_hook.execute(@data, 'push_hooks')).to eq([true, 'Success']) + expect(project_hook.execute(@data, 'push_hooks')).to eq([200, 'Success']) end it "handles 2xx status codes" do WebMock.stub_request(:post, project_hook.url).to_return(status: 201, body: "Success") - expect(project_hook.execute(@data, 'push_hooks')).to eq([true, 'Success']) + expect(project_hook.execute(@data, 'push_hooks')).to eq([201, 'Success']) end end end |