deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into fixes/api

Browse source 
Conflicts:
	spec/requests/api/projects_spec.rb
This commit is contained in:
Sebastian Ziebell 2013-02-20 14:30:11 +01:00
commit f0e417091c
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/api/projects.md
View file

@ -354,7 +354,7 @@ Removes a hook from project. This is an idempotent method and can be called mult
Either the hook is available or not. Either the hook is available or not.
``` ```
DELETE /projects/:id/hooks DELETE /projects/:id/hooks/:hook_id
``` ```
Parameters: Parameters:

4
lib/api/projects.rb
View file

@ -244,8 +244,8 @@ module Gitlab
# id (required) - The ID of a project # id (required) - The ID of a project
# hook_id (required) - The ID of hook to delete # hook_id (required) - The ID of hook to delete
# Example Request: # Example Request:
# DELETE /projects/:id/hooks # DELETE /projects/:id/hooks/:hook_id
delete ":id/hooks" do delete ":id/hooks/:hook_id" do
authorize! :admin_project, user_project authorize! :admin_project, user_project
bad_request!(:hook_id) unless params.has_key? :hook_id bad_request!(:hook_id) unless params.has_key? :hook_id

7
spec/requests/api/projects_spec.rb
View file

@ -384,7 +384,7 @@ describe Gitlab::API do
it "should add hook to project" do it "should add hook to project" do
expect { expect {
post api("/projects/#{project.id}/hooks", user), post api("/projects/#{project.id}/hooks", user),
"url" => "http://example.com" url: "http://example.com"
}.to change {project.hooks.count}.by(1) }.to change {project.hooks.count}.by(1)
response.status.should == 201 response.status.should == 201
end end
@ -424,11 +424,10 @@ describe Gitlab::API do
end end
end end
describe "DELETE /projects/:id/hooks" do describe "DELETE /projects/:id/hooks/:hook_id" do
it "should delete hook from project" do it "should delete hook from project" do
expect { expect {
delete api("/projects/#{project.id}/hooks", user), delete api("/projects/#{project.id}/hooks/#{hook.id}", user)
hook_id: hook.id
}.to change {project.hooks.count}.by(-1) }.to change {project.hooks.count}.by(-1)
response.status.should == 200 response.status.should == 200
end end