summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/api.rb3
-rw-r--r--spec/api/projects_spec.rb44
-rw-r--r--spec/api/users_spec.rb17
-rw-r--r--spec/support/api.rb7
-rw-r--r--spec/support/security.rb0
5 files changed, 37 insertions, 34 deletions
diff --git a/lib/api.rb b/lib/api.rb
index 6882615244b..309d254ba3d 100644
--- a/lib/api.rb
+++ b/lib/api.rb
@@ -2,6 +2,9 @@ Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file}
module Gitlab
class API < Grape::API
+ VERSION = 'v2'
+ version VERSION, :using => :path
+
format :json
error_format :json
helpers APIHelpers
diff --git a/spec/api/projects_spec.rb b/spec/api/projects_spec.rb
index 0fabb7a65b3..2909c5d0edf 100644
--- a/spec/api/projects_spec.rb
+++ b/spec/api/projects_spec.rb
@@ -8,75 +8,69 @@ describe Gitlab::API do
describe "GET /projects" do
it "should return authentication error" do
- get "/api/projects"
+ get "#{api_prefix}/projects"
response.status.should == 401
end
describe "authenticated GET /projects" do
it "should return an array of projects" do
- get "/api/projects?private_token=#{user.private_token}"
+ get "#{api_prefix}/projects?private_token=#{user.private_token}"
response.status.should == 200
- json = JSON.parse(response.body)
- json.should be_an Array
- json.first['name'].should == project.name
- json.first['owner']['email'].should == user.email
+ json_response.should be_an Array
+ json_response.first['name'].should == project.name
+ json_response.first['owner']['email'].should == user.email
end
end
end
describe "GET /projects/:id" do
it "should return a project by id" do
- get "/api/projects/#{project.code}?private_token=#{user.private_token}"
+ get "#{api_prefix}/projects/#{project.code}?private_token=#{user.private_token}"
response.status.should == 200
- json = JSON.parse(response.body)
- json['name'].should == project.name
- json['owner']['email'].should == user.email
+ json_response['name'].should == project.name
+ json_response['owner']['email'].should == user.email
end
end
describe "GET /projects/:id/repository/branches" do
it "should return an array of project branches" do
- get "/api/projects/#{project.code}/repository/branches?private_token=#{user.private_token}"
+ get "#{api_prefix}/projects/#{project.code}/repository/branches?private_token=#{user.private_token}"
response.status.should == 200
- json = JSON.parse(response.body)
- json.should be_an Array
- json.first['name'].should == project.repo.heads.sort_by(&:name).first.name
+ json_response.should be_an Array
+ json_response.first['name'].should == project.repo.heads.sort_by(&:name).first.name
end
end
describe "GET /projects/:id/repository/tags" do
it "should return an array of project tags" do
- get "/api/projects/#{project.code}/repository/tags?private_token=#{user.private_token}"
+ get "#{api_prefix}/projects/#{project.code}/repository/tags?private_token=#{user.private_token}"
response.status.should == 200
- json = JSON.parse(response.body)
- json.should be_an Array
- json.first['name'].should == project.repo.tags.sort_by(&:name).reverse.first.name
+ json_response.should be_an Array
+ json_response.first['name'].should == project.repo.tags.sort_by(&:name).reverse.first.name
end
end
describe "GET /projects/:id/snippets/:snippet_id" do
it "should return a project snippet" do
- get "/api/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}"
+ get "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}"
response.status.should == 200
- json = JSON.parse(response.body)
- json['title'].should == snippet.title
+ json_response['title'].should == snippet.title
end
end
describe "POST /projects/:id/snippets" do
it "should create a new project snippet" do
- post "/api/projects/#{project.code}/snippets?private_token=#{user.private_token}",
+ post "#{api_prefix}/projects/#{project.code}/snippets?private_token=#{user.private_token}",
:title => 'api test', :file_name => 'sample.rb', :code => 'test'
response.status.should == 201
- json = JSON.parse(response.body)
- json['title'].should == 'api test'
+ json_response['title'].should == 'api test'
end
end
describe "DELETE /projects/:id/snippets/:snippet_id" do
it "should create a new project snippet" do
expect {
- delete "/api/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}"
+ delete "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}"
}.should change { Snippet.count }.by(-1)
end
end
diff --git a/spec/api/users_spec.rb b/spec/api/users_spec.rb
index f142ac637ec..32b9379d212 100644
--- a/spec/api/users_spec.rb
+++ b/spec/api/users_spec.rb
@@ -5,34 +5,33 @@ describe Gitlab::API do
describe "GET /users" do
it "should return authentication error" do
- get "/api/users"
+ get "#{api_prefix}/users"
response.status.should == 401
end
describe "authenticated GET /users" do
it "should return an array of users" do
- get "/api/users?private_token=#{user.private_token}"
+ get "#{api_prefix}/users?private_token=#{user.private_token}"
response.status.should == 200
- json = JSON.parse(response.body)
- json.should be_an Array
- json.first['email'].should == user.email
+ json_response.should be_an Array
+ json_response.first['email'].should == user.email
end
end
end
describe "GET /users/:id" do
it "should return a user by id" do
- get "/api/users/#{user.id}?private_token=#{user.private_token}"
+ get "#{api_prefix}/users/#{user.id}?private_token=#{user.private_token}"
response.status.should == 200
- JSON.parse(response.body)['email'].should == user.email
+ json_response['email'].should == user.email
end
end
describe "GET /user" do
it "should return current user" do
- get "/api/user?private_token=#{user.private_token}"
+ get "#{api_prefix}/user?private_token=#{user.private_token}"
response.status.should == 200
- JSON.parse(response.body)['email'].should == user.email
+ json_response['email'].should == user.email
end
end
end
diff --git a/spec/support/api.rb b/spec/support/api.rb
new file mode 100644
index 00000000000..d363d8b9a57
--- /dev/null
+++ b/spec/support/api.rb
@@ -0,0 +1,7 @@
+def api_prefix
+ "/api/#{Gitlab::API::VERSION}"
+end
+
+def json_response
+ JSON.parse(response.body)
+end
diff --git a/spec/support/security.rb b/spec/support/security.rb
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/spec/support/security.rb
+++ /dev/null
View Lorry Controller Status