summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-03-07 19:59:23 +0000
committerDouwe Maan <douwe@gitlab.com>2017-03-07 19:59:23 +0000
commit668844f5bd9e0431360fcc758bec753148c33729 (patch)
treedd357fd9b4691908beb801c602d954deacaca08c
parent57e709757f601878d2a688d092de1b1c97bdff7a (diff)
parent8549f7aa1e4d0bf58e79a572665b6fa35b83e9d0 (diff)
downloadgitlab-ce-668844f5bd9e0431360fcc758bec753148c33729.tar.gz
Merge branch 'fix-specs-for-access-tokens' into 'master'
Fix access token specs See merge request !9776
-rw-r--r--app/controllers/admin/impersonation_tokens_controller.rb2
-rw-r--r--spec/controllers/profiles/personal_access_tokens_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/impersonation_tokens_controller.rb b/app/controllers/admin/impersonation_tokens_controller.rb
index d26004539b5..07c8bf714fc 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 e1353406b32..dfed1de2046 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