From 49e48bd05547ff54919acd20233b2c925b0cb149 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 22 Oct 2015 19:47:09 +0200
Subject: [PATCH] Revert "Rename API::APIHelpers -> API::Helpers;"

---
 lib/api/api.rb                        |  2 +-
 lib/api/helpers.rb                    |  6 +++---
 lib/ci/api/api.rb                     |  2 +-
 spec/requests/api/api_helpers_spec.rb | 26 +++++++++++++-------------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/api/api.rb b/lib/api/api.rb
index ccc70e45b3..c09488d354 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -25,7 +25,7 @@ module API
     format :json
     content_type :txt, "text/plain"
 
-    helpers Helpers
+    helpers APIHelpers
 
     mount Groups
     mount GroupMembers
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index a83c9d4904..7fada98fcd 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -1,5 +1,5 @@
 module API
-  module Helpers
+  module APIHelpers
     PRIVATE_TOKEN_HEADER = "HTTP_PRIVATE_TOKEN"
     PRIVATE_TOKEN_PARAM = :private_token
     SUDO_HEADER ="HTTP_SUDO"
@@ -63,11 +63,11 @@ module API
           user_project.build_missing_services
 
           service_method = "#{underscored_service}_service"
-
+          
           send_service(service_method)
         end
       end
-
+   
       @project_service || not_found!("Service")
     end
 
diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb
index f74fc0a891..5109c84e0e 100644
--- a/lib/ci/api/api.rb
+++ b/lib/ci/api/api.rb
@@ -30,7 +30,7 @@ module Ci
       format :json
 
       helpers Helpers
-      helpers ::API::Helpers
+      helpers ::API::APIHelpers
 
       mount Builds
       mount Commits
diff --git a/spec/requests/api/api_helpers_spec.rb b/spec/requests/api/api_helpers_spec.rb
index 0c19094ec5..4048c29701 100644
--- a/spec/requests/api/api_helpers_spec.rb
+++ b/spec/requests/api/api_helpers_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe API, api: true do
-  include API::Helpers
+  include API::APIHelpers
   include ApiHelpers
   let(:user) { create(:user) }
   let(:admin) { create(:admin) }
@@ -13,25 +13,25 @@ describe API, api: true do
   def set_env(token_usr, identifier)
     clear_env
     clear_param
-    env[API::Helpers::PRIVATE_TOKEN_HEADER] = token_usr.private_token
-    env[API::Helpers::SUDO_HEADER] = identifier
+    env[API::APIHelpers::PRIVATE_TOKEN_HEADER] = token_usr.private_token
+    env[API::APIHelpers::SUDO_HEADER] = identifier
   end
 
   def set_param(token_usr, identifier)
     clear_env
     clear_param
-    params[API::Helpers::PRIVATE_TOKEN_PARAM] = token_usr.private_token
-    params[API::Helpers::SUDO_PARAM] = identifier
+    params[API::APIHelpers::PRIVATE_TOKEN_PARAM] = token_usr.private_token
+    params[API::APIHelpers::SUDO_PARAM] = identifier
   end
 
   def clear_env
-    env.delete(API::Helpers::PRIVATE_TOKEN_HEADER)
-    env.delete(API::Helpers::SUDO_HEADER)
+    env.delete(API::APIHelpers::PRIVATE_TOKEN_HEADER)
+    env.delete(API::APIHelpers::SUDO_HEADER)
   end
 
   def clear_param
-    params.delete(API::Helpers::PRIVATE_TOKEN_PARAM)
-    params.delete(API::Helpers::SUDO_PARAM)
+    params.delete(API::APIHelpers::PRIVATE_TOKEN_PARAM)
+    params.delete(API::APIHelpers::SUDO_PARAM)
   end
 
   def error!(message, status)
@@ -40,22 +40,22 @@ describe API, api: true do
 
   describe ".current_user" do
     it "should return nil for an invalid token" do
-      env[API::Helpers::PRIVATE_TOKEN_HEADER] = 'invalid token'
+      env[API::APIHelpers::PRIVATE_TOKEN_HEADER] = 'invalid token'
       allow_any_instance_of(self.class).to receive(:doorkeeper_guard){ false }
       expect(current_user).to be_nil
     end
 
     it "should return nil for a user without access" do
-      env[API::Helpers::PRIVATE_TOKEN_HEADER] = user.private_token
+      env[API::APIHelpers::PRIVATE_TOKEN_HEADER] = user.private_token
       allow(Gitlab::UserAccess).to receive(:allowed?).and_return(false)
       expect(current_user).to be_nil
     end
 
     it "should leave user as is when sudo not specified" do
-      env[API::Helpers::PRIVATE_TOKEN_HEADER] = user.private_token
+      env[API::APIHelpers::PRIVATE_TOKEN_HEADER] = user.private_token
       expect(current_user).to eq(user)
       clear_env
-      params[API::Helpers::PRIVATE_TOKEN_PARAM] = user.private_token
+      params[API::APIHelpers::PRIVATE_TOKEN_PARAM] = user.private_token
       expect(current_user).to eq(user)
     end