From 16e645c6563b81ce03e481b094abc2d331d05f36 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 24 Mar 2017 13:27:05 +0100
Subject: [PATCH] Remove container_registry method from project class
---
app/models/project.rb | 14 --------------
spec/models/project_spec.rb | 29 +++--------------------------
2 files changed, 3 insertions(+), 40 deletions(-)
diff --git a/app/models/project.rb b/app/models/project.rb
index 5c6672c95b3..a579ac7dc64 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -405,20 +405,6 @@ class Project < ActiveRecord::Base
@repository ||= Repository.new(path_with_namespace, self)
end
- def container_registry
- return unless Gitlab.config.registry.enabled
-
- @container_registry ||= begin
- token = Auth::ContainerRegistryAuthenticationService.full_access_token(project)
-
- url = Gitlab.config.registry.api_url
- host_port = Gitlab.config.registry.host_port
- # TODO, move configuration vars into ContainerRegistry::Registry, clean
- # this method up afterwards
- ContainerRegistry::Registry.new(url, token: token, path: host_port)
- end
- end
-
def container_registry_url
if Gitlab.config.registry.enabled
"#{Gitlab.config.registry.host_port}/#{path_with_namespace.downcase}"
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 69b7906bb4e..e4e75cc6a09 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1389,25 +1389,6 @@ describe Project, models: true do
end
end
- describe '#container_registry_path_with_namespace' do
- let(:project) { create(:empty_project, path: 'PROJECT') }
-
- subject { project.container_registry_path_with_namespace }
-
- it { is_expected.not_to eq(project.path_with_namespace) }
- it { is_expected.to eq(project.path_with_namespace.downcase) }
- end
-
- describe '#container_registry' do
- let(:project) { create(:empty_project) }
-
- before { stub_container_registry_config(enabled: true) }
-
- subject { project.container_registry }
-
- it { is_expected.not_to be_nil }
- end
-
describe '#container_registry_url' do
let(:project) { create(:empty_project) }
@@ -1417,10 +1398,8 @@ describe Project, models: true do
context 'for enabled registry' do
let(:registry_settings) do
- {
- enabled: true,
- host_port: 'example.com',
- }
+ { enabled: true,
+ host_port: 'example.com' }
end
it { is_expected.not_to be_nil }
@@ -1428,9 +1407,7 @@ describe Project, models: true do
context 'for disabled registry' do
let(:registry_settings) do
- {
- enabled: false
- }
+ { enabled: false }
end
it { is_expected.to be_nil }
--
GitLab