Fix RESTfulness of project hook deletions by API

Matt Humphrey
1 parent b7ac654b
Showing 3 changed files with 5 additions and 6 deletions Show diff stats
doc/api/projects.md
lib/api/projects.rb
spec/requests/api/projects_spec.rb
@@ -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:
@@ -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
@@ -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
	@@ -265,7 +265,7 @@ Will return status `201 Created` on success, or `404 Not found` on fail.		@@ -265,7 +265,7 @@ Will return status `201 Created` on success, or `404 Not found` on fail.
265	Delete hook from project	265	Delete hook from project
266		266
267	```	267	```
268	-DELETE /projects/:id/hooks	268	+DELETE /projects/:id/hooks/:hook_id
269	```	269	```
270		270
271	Parameters:	271	Parameters: