diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-12 09:57:48 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-12 09:57:48 +0000 |
| commit | 2602cc0c36966ba366db8393786e9164e95a188c (patch) | |
| tree | 0ae6757c823f78ecde416fb8182f6662fb27f018 /spec/requests | |
| parent | 5d3f7b133fba9bba876da5ef13c630320a920e3f (diff) | |
| parent | 62ef67acc3a8d260aa3e641b350aaecf8d60f1aa (diff) | |
| download | gitlab-ce-2602cc0c36966ba366db8393786e9164e95a188c.tar.gz | |
Merge branch 'hide-read-registry-scope-when-registry-disabled' into 'master'
Hide read_registry scope when registry is disabled on instance
See merge request !13314
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/jwt_controller_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb index 8d79ea3dd40..41bf43a9bce 100644 --- a/spec/requests/jwt_controller_spec.rb +++ b/spec/requests/jwt_controller_spec.rb @@ -49,6 +49,10 @@ describe JwtController do let(:pat) { create(:personal_access_token, user: user, scopes: ['read_registry']) } let(:headers) { { authorization: credentials('personal_access_token', pat.token) } } + before do + stub_container_registry_config(enabled: true) + end + subject! { get '/jwt/auth', parameters, headers } it 'authenticates correctly' do |