Fix RESTfulness of project hook deletions by API

5-0-stable
Matt Humphrey 2013-02-20 11:35:36 +00:00
parent b7ac654b88
commit 33c513274d
3 changed files with 5 additions and 6 deletions

View File

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

View File

@ -205,8 +205,8 @@ module Gitlab
# id (required) - The ID of a project
# hook_id (required) - The ID of hook to delete
# Example Request:
# DELETE /projects/:id/hooks
delete ":id/hooks" do
# DELETE /projects/:id/hooks/:hook_id
delete ":id/hooks/:hook_id" do
authorize! :admin_project, user_project
@hook = user_project.hooks.find(params[:hook_id])
@hook.destroy

View File

@ -275,11 +275,10 @@ describe Gitlab::API do
end
end
describe "DELETE /projects/:id/hooks" do
describe "DELETE /projects/:id/hooks/:hook_id" do
it "should delete hook from project" do
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)
end