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

Merge branch 'master' into fixes/api

Browse source 
Conflicts:
	spec/requests/api/projects_spec.rb
This commit is contained in:
Sebastian Ziebell 2013-02-20 14:30:11 +01:00
commit f0e417091c
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -384,7 +384,7 @@ describe Gitlab::API do
it "should add hook to project" do
expect {
post api("/projects/#{project.id}/hooks", user),
"url" => "http://example.com"
url: "http://example.com"
}.to change {project.hooks.count}.by(1)
response.status.should == 201
end
@ -424,11 +424,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),
hook_id: hook.id
delete api("/projects/#{project.id}/hooks/#{hook.id}", user)
}.to change {project.hooks.count}.by(-1)
response.status.should == 200
end