diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-04-16 19:41:53 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-04-16 19:41:53 +0300 |
commit | bbce6df783402fac42b5a529536dafa3b1fd0fd6 (patch) | |
tree | b053f76dd57c63fd8eb76537bb1439452715452b | |
parent | 2cf63954b6745822efa3e19c725aa3d1f4740c6d (diff) | |
download | gitlab-ce-bbce6df783402fac42b5a529536dafa3b1fd0fd6.tar.gz |
Fix incorrect registry reference
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
3 files changed, 5 insertions, 8 deletions
diff --git a/ee/app/services/dependency_proxy/base_service.rb b/ee/app/services/dependency_proxy/base_service.rb index ef5f2c51b6c..beff925b2b9 100644 --- a/ee/app/services/dependency_proxy/base_service.rb +++ b/ee/app/services/dependency_proxy/base_service.rb @@ -5,7 +5,7 @@ module DependencyProxy private def registry - DependencyProxy::Registry.new + DependencyProxy::Registry end def auth_headers diff --git a/ee/spec/services/dependency_proxy/request_token_service_spec.rb b/ee/spec/services/dependency_proxy/request_token_service_spec.rb index 61b4ed83c2b..22e96a7d647 100644 --- a/ee/spec/services/dependency_proxy/request_token_service_spec.rb +++ b/ee/spec/services/dependency_proxy/request_token_service_spec.rb @@ -2,18 +2,15 @@ require 'spec_helper' describe DependencyProxy::RequestTokenService do + include EE::DependencyProxyHelpers + let(:image) { 'alpine:3.9' } let(:token) { Digest::SHA256.hexdigest('123') } - let(:registry) { DependencyProxy::Registry.new } subject { described_class.new(image).execute } before do - auth_body = { 'token' => token }.to_json - auth_link = registry.auth_url(image) - - stub_request(:get, auth_link) - .to_return(status: 200, body: auth_body) + stub_registry_auth(image, token) end it 'requests an access token from auth service' do diff --git a/ee/spec/support/helpers/ee/dependency_proxy_helpers.rb b/ee/spec/support/helpers/ee/dependency_proxy_helpers.rb index 01314738e94..4f5db1f1fc1 100644 --- a/ee/spec/support/helpers/ee/dependency_proxy_helpers.rb +++ b/ee/spec/support/helpers/ee/dependency_proxy_helpers.rb @@ -32,7 +32,7 @@ module EE private def registry - @registry ||= DependencyProxy::Registry.new + @registry ||= DependencyProxy::Registry end end end |