diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-14 00:43:49 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-14 00:43:49 +0300 |
commit | 692b5e0b47931bf173e92dab3d01b502fd284285 (patch) | |
tree | ce14cde539ae8994a2484e82ead22a08472514e1 /spec | |
parent | 9e318bd99deb90a93130cd4ef79e54f18555d4dc (diff) | |
parent | 509654b3784da2a084a0c8303e9c6cc1498b8d2b (diff) |
Merge branch 'docker-registry' into docker-registry-view
# Conflicts:
# app/controllers/jwt_controller.rb
# app/services/jwt/container_registry_authentication_service.rb
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 6c4d675fd6a..992da289028 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(JWT::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token') + allow(Gitlab::JWT::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 672a7579dd3..c8a0ba958dd 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 JWT::ContainerRegistryAuthenticationService, services: true do +describe Gitlab::JWT::ContainerRegistryAuthenticationService, services: true do let(:current_project) { nil } let(:current_user) { nil } let(:current_params) { {} } |