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

API: ability to get project by id

Browse source
This commit is contained in:
Nihad Abbasov 2012-07-25 02:18:30 -07:00
parent 92d98f5a0c
commit 1b95c8bff3
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/api/helpers.rb
View file

@ -5,7 +5,8 @@ module Gitlab
end end
def user_project def user_project
@project ||= current_user.projects.find_by_code(params[:id]) @project ||= current_user.projects.find_by_id(params[:id]) ||
current_user.projects.find_by_code(params[:id])
end end
def authenticate! def authenticate!

8
spec/api/projects_spec.rb
View file

@ -25,11 +25,17 @@ describe Gitlab::API do
describe "GET /projects/:id" do describe "GET /projects/:id" do
it "should return a project by id" do it "should return a project by id" do
get "#{api_prefix}/projects/#{project.code}?private_token=#{user.private_token}" get "#{api_prefix}/projects/#{project.id}?private_token=#{user.private_token}"
response.status.should == 200 response.status.should == 200
json_response['name'].should == project.name json_response['name'].should == project.name
json_response['owner']['email'].should == user.email json_response['owner']['email'].should == user.email
end end
it "should return a project by code name" do
get "#{api_prefix}/projects/#{project.code}?private_token=#{user.private_token}"
response.status.should == 200
json_response['name'].should == project.name
end
end end
describe "GET /projects/:id/repository/branches" do describe "GET /projects/:id/repository/branches" do