diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-14 18:23:55 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-14 18:23:55 -0500 |
| commit | f63b6fc297b876e26b93c12ca510148d18d58ec2 (patch) | |
| tree | 1d1fecab4031baf1fb65cb8176c47c40af8b5c62 /spec/services/auth | |
| parent | 5c19476286eb63325cbae7b1a21966e55712f367 (diff) | |
| parent | f4f9184a01bc7442411bbcffd9b6a86784fa5f53 (diff) | |
| download | gitlab-ce-f63b6fc297b876e26b93c12ca510148d18d58ec2.tar.gz | |
Merge branch 'docker-registry' into docker-registry-view
Diffstat (limited to 'spec/services/auth')
| -rw-r--r-- | spec/services/auth/container_registry_authentication_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb index a45410f0458..bae576f1670 100644 --- a/spec/services/auth/container_registry_authentication_service_spec.rb +++ b/spec/services/auth/container_registry_authentication_service_spec.rb @@ -18,7 +18,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do before do allow(Gitlab.config.registry).to receive_messages(registry_settings) - allow_any_instance_of(JWT::RSAToken).to receive(:key).and_return(rsa_key) + allow_any_instance_of(JSONWebToken::RSAToken).to receive(:key).and_return(rsa_key) end shared_examples 'an authenticated' do |