diff --git a/app/controllers/admin/impersonation_tokens_controller.rb b/app/controllers/admin/impersonation_tokens_controller.rb index d26004539b565b4373841ae00aaa46b0daeecbeb..07c8bf714fcb2f31a60356856a7cb5814512e833 100644 --- a/app/controllers/admin/impersonation_tokens_controller.rb +++ b/app/controllers/admin/impersonation_tokens_controller.rb @@ -44,7 +44,7 @@ class Admin::ImpersonationTokensController < Admin::ApplicationController end def set_index_vars - @scopes = Gitlab::Auth::SCOPES + @scopes = Gitlab::Auth::API_SCOPES @impersonation_token ||= finder.build @inactive_impersonation_tokens = finder(state: 'inactive').execute diff --git a/spec/controllers/profiles/personal_access_tokens_spec.rb b/spec/controllers/profiles/personal_access_tokens_spec.rb index e1353406b3277a3c69b38debcea7af239fe773a5..dfed1de2046d6f6f6a0ccdf5d42a8b9936d89e1a 100644 --- a/spec/controllers/profiles/personal_access_tokens_spec.rb +++ b/spec/controllers/profiles/personal_access_tokens_spec.rb @@ -15,10 +15,10 @@ describe Profiles::PersonalAccessTokensController do name = FFaker::Product.brand scopes = %w[api read_user] - post :create, personal_access_token: token_attributes.merge(scopes: scopes) + post :create, personal_access_token: token_attributes.merge(scopes: scopes, name: name) expect(created_token).not_to be_nil - expect(created_token.name).to eq(token_attributes[:name]) + expect(created_token.name).to eq(name) expect(created_token.scopes).to eq(scopes) expect(PersonalAccessToken.active).to include(created_token) end