Download as
Browse Code »

Commit 33c513274d2201787d592850e60a018b777e0c43

Authored by Matt Humphrey
1 parent b7ac654b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix RESTfulness of project hook deletions by API

Showing 3 changed files with 5 additions and 6 deletions   Show diff stats
doc/api/projects.md
  Diff comments   View file @33c5132
... ... @@ -265,7 +265,7 @@ Will return status `201 Created` on success, or `404 Not found` on fail.
265 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 271 Parameters:
... ...
lib/api/projects.rb
  Diff comments   View file @33c5132
... ... @@ -205,8 +205,8 @@ module Gitlab
205 205 # id (required) - The ID of a project
206 206 # hook_id (required) - The ID of hook to delete
207 207 # Example Request:
208   - # DELETE /projects/:id/hooks
209   - delete ":id/hooks" do
  208 + # DELETE /projects/:id/hooks/:hook_id
  209 + delete ":id/hooks/:hook_id" do
210 210 authorize! :admin_project, user_project
211 211 @hook = user_project.hooks.find(params[:hook_id])
212 212 @hook.destroy
... ...
spec/requests/api/projects_spec.rb
  Diff comments   View file @33c5132
... ... @@ -275,11 +275,10 @@ describe Gitlab::API do
275 275 end
276 276 end
277 277  
278   -
279   - describe "DELETE /projects/:id/hooks" do
  278 + describe "DELETE /projects/:id/hooks/:hook_id" do
280 279 it "should delete hook from project" do
281 280 expect {
282   - delete api("/projects/#{project.id}/hooks", user),
  281 + delete api("/projects/#{project.id}/hooks/#{hook.id}", user),
283 282 hook_id: hook.id
284 283 }.to change {project.hooks.count}.by(-1)
285 284 end
... ...