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

Merge branch 'master' into fixes/api, code clean up and tests fixed

Browse source 
Conflicts:
	doc/api/projects.md
	spec/requests/api/projects_spec.rb
This commit is contained in:
Sebastian Ziebell 2013-03-07 14:51:56 +01:00
commit 3374027e3a
49 changed files with 820 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spec/requests/api/notes_spec.rb
View file

@ -105,13 +105,6 @@ describe Gitlab::API do
response.status.should == 404
end
end
context "when notable is invalid" do
it "should return a 404 error" do
get api("/projects/#{project.id}/unknown/#{snippet.id}/notes", user)
response.status.should == 404
end
end
end
describe "GET /projects/:id/noteable/:noteable_id/notes/:note_id" do
@ -180,12 +173,5 @@ describe Gitlab::API do
response.status.should == 401
end
end
context "when noteable is invalid" do
it "should return a 404 error" do
post api("/projects/#{project.id}/invalid/#{snippet.id}/notes", user)
response.status.should == 404
end
end
end
end