Commit 78ff99a7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #3856 from NARKOZ/delete-hook-api

fix API route to delete project hook
parents 8b65d069 77d0e41d
...@@ -274,7 +274,7 @@ module Gitlab ...@@ -274,7 +274,7 @@ module Gitlab
# 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/:hook_id # 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
required_attributes! [:hook_id] required_attributes! [:hook_id]
......
...@@ -467,21 +467,21 @@ describe Gitlab::API do ...@@ -467,21 +467,21 @@ 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), hook_id: hook.id delete api("/projects/#{project.id}/hooks/#{hook.id}", user)
}.to change {project.hooks.count}.by(-1) }.to change {project.hooks.count}.by(-1)
response.status.should == 200 response.status.should == 200
end end
it "should return success when deleting hook" do it "should return success when deleting hook" do
delete api("/projects/#{project.id}/hooks", user), hook_id: hook.id delete api("/projects/#{project.id}/hooks/#{hook.id}", user)
response.status.should == 200 response.status.should == 200
end end
it "should return success when deleting non existent hook" do it "should return success when deleting non existent hook" do
delete api("/projects/#{project.id}/hooks", user), hook_id: 42 delete api("/projects/#{project.id}/hooks/42", user)
response.status.should == 200 response.status.should == 200
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment