diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-14 19:15:19 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-14 19:15:33 +0300 |
commit | 654d5ad3f42732df77553bfbc2230f17d9185267 (patch) | |
tree | e732669d38adb58696ac7e9b78dbd1d3a835340c /spec | |
parent | 906c880400a36abd34426c634d2a9f6086909db0 (diff) | |
parent | 63cdf1aeb04b9694c0b6d44b1141868fcc5a0904 (diff) |
Merge branch 'docker-registry' into docker-registry-view
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/container_registry_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/jwt/container_registry_authentication_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb index 992da289028..be5910e4abb 100644 --- a/spec/features/container_registry_spec.rb +++ b/spec/features/container_registry_spec.rb @@ -16,7 +16,7 @@ describe "Container Registry" do project.team << [@user, :developer] stub_container_registry(*tags) allow(Gitlab.config.registry).to receive_messages(registry_settings) - allow(Gitlab::JWT::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token') + allow(Auth::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token') end describe 'GET /:project/container_registry' do diff --git a/spec/services/jwt/container_registry_authentication_service_spec.rb b/spec/services/jwt/container_registry_authentication_service_spec.rb index c8a0ba958dd..a45410f0458 100644 --- a/spec/services/jwt/container_registry_authentication_service_spec.rb +++ b/spec/services/jwt/container_registry_authentication_service_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Gitlab::JWT::ContainerRegistryAuthenticationService, services: true do +describe Auth::ContainerRegistryAuthenticationService, services: true do let(:current_project) { nil } let(:current_user) { nil } let(:current_params) { {} } |