summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-14 15:33:31 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-14 15:33:31 +0300
commit634cbd71380f595f6f44ce93399b92fbee37f98f (patch)
treec421f7fd1b2cfbf396f8765e948b19fa47d1fd6e /spec
parente6224942cee8f02d96e51098552a738f1d89860f (diff)
downloadgitlab-ce-634cbd71380f595f6f44ce93399b92fbee37f98f.tar.gz
Refactor API classes. So api classes like Gitlab::Issues become API::Issues
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/groups_spec.rb2
-rw-r--r--spec/requests/api/internal_spec.rb4
-rw-r--r--spec/requests/api/issues_spec.rb2
-rw-r--r--spec/requests/api/merge_requests_spec.rb2
-rw-r--r--spec/requests/api/milestones_spec.rb2
-rw-r--r--spec/requests/api/notes_spec.rb2
-rw-r--r--spec/requests/api/projects_spec.rb2
-rw-r--r--spec/requests/api/session_spec.rb2
-rw-r--r--spec/requests/api/system_hooks_spec.rb2
-rw-r--r--spec/requests/api/users_spec.rb2
-rw-r--r--spec/routing/routing_spec.rb2
-rw-r--r--spec/support/api_helpers.rb2
12 files changed, 13 insertions, 13 deletions
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index cf284b607a5..d2e25fb9e23 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Gitlab::API do
+describe API::API do
include ApiHelpers
let(:user1) { create(:user) }
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index ba11a41da29..5a43953d15c 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Gitlab::API do
+describe API::API do
include ApiHelpers
let(:user) { create(:user) }
@@ -12,7 +12,7 @@ describe Gitlab::API do
get api("/internal/check")
response.status.should == 200
- json_response['api_version'].should == Gitlab::API.version
+ json_response['api_version'].should == API::API.version
end
end
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index ecf0bdb7084..d5f75367e4a 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Gitlab::API do
+describe API::API do
include ApiHelpers
let(:user) { create(:user) }
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 25bbd9860bd..5bf228a7448 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -1,6 +1,6 @@
require "spec_helper"
-describe Gitlab::API do
+describe API::API do
include ApiHelpers
let(:user) { create(:user ) }
diff --git a/spec/requests/api/milestones_spec.rb b/spec/requests/api/milestones_spec.rb
index c9a10417fff..af12c088c8f 100644
--- a/spec/requests/api/milestones_spec.rb
+++ b/spec/requests/api/milestones_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Gitlab::API do
+describe API::API do
include ApiHelpers
before(:each) { enable_observers }
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index 901640834f2..78d55a7b4ed 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Gitlab::API do
+describe API::API do
include ApiHelpers
let(:user) { create(:user) }
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 7aeee354ba1..4346bfe8f2e 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Gitlab::API do
+describe API::API do
include ApiHelpers
before(:each) { enable_observers }
diff --git a/spec/requests/api/session_spec.rb b/spec/requests/api/session_spec.rb
index 4a37312bffd..88c17f26a69 100644
--- a/spec/requests/api/session_spec.rb
+++ b/spec/requests/api/session_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Gitlab::API do
+describe API::API do
include ApiHelpers
let(:user) { create(:user) }
diff --git a/spec/requests/api/system_hooks_spec.rb b/spec/requests/api/system_hooks_spec.rb
index 647e31ce034..b1df3cb7886 100644
--- a/spec/requests/api/system_hooks_spec.rb
+++ b/spec/requests/api/system_hooks_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Gitlab::API do
+describe API::API do
include ApiHelpers
let(:user) { create(:user) }
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index b4688dd29f7..33df9f7ece5 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Gitlab::API do
+describe API::API do
include ApiHelpers
let(:user) { create(:user) }
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 5ad8165ecce..049cfeaab01 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -7,7 +7,7 @@ describe SearchController, "routing" do
end
end
-# gitlab_api /api Gitlab::API
+# gitlab_api /api API::API
# resque /info/resque Resque::Server
# /:path Grack
describe "Mounted Apps", "routing" do
diff --git a/spec/support/api_helpers.rb b/spec/support/api_helpers.rb
index c4514bf38be..ec9a326a1ea 100644
--- a/spec/support/api_helpers.rb
+++ b/spec/support/api_helpers.rb
@@ -18,7 +18,7 @@ module ApiHelpers
#
# Returns the relative path to the requested API resource
def api(path, user = nil)
- "/api/#{Gitlab::API.version}#{path}" +
+ "/api/#{API::API.version}#{path}" +
# Normalize query string
(path.index('?') ? '' : '?') +