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

Fix RESTfulness of project hook deletions by API

Browse source
This commit is contained in:
Matt Humphrey 2013-02-20 11:35:36 +00:00
parent b7ac654b88
commit 33c513274d
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/api/projects.md
View file

@ -265,7 +265,7 @@ Will return status `201 Created` on success, or `404 Not found` on fail.
Delete hook from project Delete hook from project
``` ```
DELETE /projects/:id/hooks DELETE /projects/:id/hooks/:hook_id
``` ```
Parameters: Parameters:

4
lib/api/projects.rb
View file

@ -205,8 +205,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
@hook = user_project.hooks.find(params[:hook_id]) @hook = user_project.hooks.find(params[:hook_id])
@hook.destroy @hook.destroy

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

@ -275,11 +275,10 @@ describe Gitlab::API do
end end
end end
describe "DELETE /projects/:id/hooks/:hook_id" do
describe "DELETE /projects/:id/hooks" 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 hook_id: hook.id
}.to change {project.hooks.count}.by(-1) }.to change {project.hooks.count}.by(-1)
end end