Add latest changes from gitlab-org/gitlab@master

5 files changed, 16 insertions, 16 deletions

diff --git a/spec/requests/api/doorkeeper_access_spec.rb b/spec/requests/api/doorkeeper_access_spec.rb
index 77f1dadff46..14da9a600cd 100644
--- a/spec/requests/api/doorkeeper_access_spec.rb
+++ b/spec/requests/api/doorkeeper_access_spec.rb
@@ -9,13 +9,13 @@ RSpec.describe 'doorkeeper access' do
 
   describe "unauthenticated" do
     it "returns authentication success" do
-      get api("/user"), params: { access_token: token.token }
+      get api("/user"), params: { access_token: token.plaintext_token }
       expect(response).to have_gitlab_http_status(:ok)
     end
 
     include_examples 'user login request with unique ip limit' do
       def request
-        get api('/user'), params: { access_token: token.token }
+        get api('/user'), params: { access_token: token.plaintext_token }
       end
     end
   end
@@ -42,7 +42,7 @@ RSpec.describe 'doorkeeper access' do
 
   shared_examples 'forbidden request' do
     it 'returns 403 response' do
-      get api("/user"), params: { access_token: token.token }
+      get api("/user"), params: { access_token: token.plaintext_token }
 
       expect(response).to have_gitlab_http_status(:forbidden)
     end
diff --git a/spec/requests/api/go_proxy_spec.rb b/spec/requests/api/go_proxy_spec.rb
index 2b1250320ce..7c44fddc303 100644
--- a/spec/requests/api/go_proxy_spec.rb
+++ b/spec/requests/api/go_proxy_spec.rb
@@ -376,7 +376,7 @@ RSpec.describe API::GoProxy do
       end
 
       it 'returns ok with a job token' do
-        get_resource(oauth_access_token: job)
+        get_resource(access_token: job)
 
         expect(response).to have_gitlab_http_status(:ok)
       end
@@ -395,7 +395,7 @@ RSpec.describe API::GoProxy do
 
       it 'returns unauthorized with a failed job token' do
         job.update!(status: :failed)
-        get_resource(oauth_access_token: job)
+        get_resource(access_token: job)
 
         expect(response).to have_gitlab_http_status(:unauthorized)
       end
@@ -445,7 +445,7 @@ RSpec.describe API::GoProxy do
       end
 
       it 'returns not found with a job token' do
-        get_resource(oauth_access_token: job)
+        get_resource(access_token: job)
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
diff --git a/spec/requests/api/helpers_spec.rb b/spec/requests/api/helpers_spec.rb
index c961fd9cfc8..e29e5c31a34 100644
--- a/spec/requests/api/helpers_spec.rb
+++ b/spec/requests/api/helpers_spec.rb
@@ -539,7 +539,7 @@ RSpec.describe API::Helpers do
       let(:token) { create(:oauth_access_token) }
 
       before do
-        env['HTTP_AUTHORIZATION'] = "Bearer #{token.token}"
+        env['HTTP_AUTHORIZATION'] = "Bearer #{token.plaintext_token}"
       end
 
       it_behaves_like 'sudo'
diff --git a/spec/requests/api/npm_project_packages_spec.rb b/spec/requests/api/npm_project_packages_spec.rb
index 6061b3ba965..3bcffac2760 100644
--- a/spec/requests/api/npm_project_packages_spec.rb
+++ b/spec/requests/api/npm_project_packages_spec.rb
@@ -59,7 +59,7 @@ RSpec.describe API::NpmProjectPackages do
       end
 
       context 'with access token' do
-        let(:headers) { build_token_auth_header(token.token) }
+        let(:headers) { build_token_auth_header(token.plaintext_token) }
 
         it_behaves_like 'successfully downloads the file'
         it_behaves_like 'a package tracking event', 'API::NpmPackages', 'pull_package'
@@ -95,7 +95,7 @@ RSpec.describe API::NpmProjectPackages do
       it_behaves_like 'a package file that requires auth'
 
       context 'with guest' do
-        let(:headers) { build_token_auth_header(token.token) }
+        let(:headers) { build_token_auth_header(token.plaintext_token) }
 
         it 'denies download when not enough permissions' do
           project.add_guest(user)
@@ -356,7 +356,7 @@ RSpec.describe API::NpmProjectPackages do
     end
 
     def upload_with_token(package_name, params = {})
-      upload_package(package_name, params.merge(access_token: token.token))
+      upload_package(package_name, params.merge(access_token: token.plaintext_token))
     end
 
     def upload_with_job_token(package_name, params = {})
diff --git a/spec/requests/rack_attack_global_spec.rb b/spec/requests/rack_attack_global_spec.rb
index 115f78a5600..f6b9bc527ac 100644
--- a/spec/requests/rack_attack_global_spec.rb
+++ b/spec/requests/rack_attack_global_spec.rb
@@ -104,8 +104,8 @@ RSpec.describe 'Rack Attack global throttles', :use_clean_rails_memory_store_cac
     end
 
     context 'with the token in the OAuth headers' do
-      let(:request_args) { api_get_args_with_token_headers(api_partial_url, oauth_token_headers(token)) }
-      let(:other_user_request_args) { api_get_args_with_token_headers(api_partial_url, oauth_token_headers(other_user_token)) }
+      let(:request_args) { api_get_args_with_token_headers(api_partial_url, bearer_headers(token)) }
+      let(:other_user_request_args) { api_get_args_with_token_headers(api_partial_url, bearer_headers(other_user_token)) }
 
       it_behaves_like 'rate-limited user based token-authenticated requests'
     end
@@ -131,8 +131,8 @@ RSpec.describe 'Rack Attack global throttles', :use_clean_rails_memory_store_cac
       end
 
       context 'with the token in the OAuth headers' do
-        let(:request_args) { api_get_args_with_token_headers(api_partial_url, oauth_token_headers(token)) }
-        let(:other_user_request_args) { api_get_args_with_token_headers(api_partial_url, oauth_token_headers(other_user_token)) }
+        let(:request_args) { api_get_args_with_token_headers(api_partial_url, bearer_headers(token)) }
+        let(:other_user_request_args) { api_get_args_with_token_headers(api_partial_url, bearer_headers(other_user_token)) }
 
         it_behaves_like 'rate-limited user based token-authenticated requests'
       end
@@ -1189,7 +1189,7 @@ RSpec.describe 'Rack Attack global throttles', :use_clean_rails_memory_store_cac
       it 'request is authenticated by token in the OAuth headers' do
         expect_authenticated_request
 
-        get url, headers: oauth_token_headers(personal_access_token)
+        get url, headers: bearer_headers(personal_access_token)
       end
 
       it 'request is authenticated by token in basic auth' do
@@ -1206,7 +1206,7 @@ RSpec.describe 'Rack Attack global throttles', :use_clean_rails_memory_store_cac
       it 'request is authenticated by token in query string' do
         expect_authenticated_request
 
-        get url, params: { access_token: oauth_token.token }
+        get url, params: { access_token: oauth_token.plaintext_token }
       end
 
       it 'request is authenticated by token in the headers' do