Merge branch 'master' into copying-file-seen-as-licence

1 files changed, 13 insertions, 13 deletions

diff --git a/spec/requests/api/api_helpers_spec.rb b/spec/requests/api/api_helpers_spec.rb
index 4048c297013..0c19094ec54 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::APIHelpers
+  include API::Helpers
   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::APIHelpers::PRIVATE_TOKEN_HEADER] = token_usr.private_token
-    env[API::APIHelpers::SUDO_HEADER] = identifier
+    env[API::Helpers::PRIVATE_TOKEN_HEADER] = token_usr.private_token
+    env[API::Helpers::SUDO_HEADER] = identifier
   end
 
   def set_param(token_usr, identifier)
     clear_env
     clear_param
-    params[API::APIHelpers::PRIVATE_TOKEN_PARAM] = token_usr.private_token
-    params[API::APIHelpers::SUDO_PARAM] = identifier
+    params[API::Helpers::PRIVATE_TOKEN_PARAM] = token_usr.private_token
+    params[API::Helpers::SUDO_PARAM] = identifier
   end
 
   def clear_env
-    env.delete(API::APIHelpers::PRIVATE_TOKEN_HEADER)
-    env.delete(API::APIHelpers::SUDO_HEADER)
+    env.delete(API::Helpers::PRIVATE_TOKEN_HEADER)
+    env.delete(API::Helpers::SUDO_HEADER)
   end
 
   def clear_param
-    params.delete(API::APIHelpers::PRIVATE_TOKEN_PARAM)
-    params.delete(API::APIHelpers::SUDO_PARAM)
+    params.delete(API::Helpers::PRIVATE_TOKEN_PARAM)
+    params.delete(API::Helpers::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::APIHelpers::PRIVATE_TOKEN_HEADER] = 'invalid token'
+      env[API::Helpers::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::APIHelpers::PRIVATE_TOKEN_HEADER] = user.private_token
+      env[API::Helpers::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::APIHelpers::PRIVATE_TOKEN_HEADER] = user.private_token
+      env[API::Helpers::PRIVATE_TOKEN_HEADER] = user.private_token
       expect(current_user).to eq(user)
       clear_env
-      params[API::APIHelpers::PRIVATE_TOKEN_PARAM] = user.private_token
+      params[API::Helpers::PRIVATE_TOKEN_PARAM] = user.private_token
       expect(current_user).to eq(user)
     end