diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-08-07 10:18:13 +0000 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-08-07 10:18:13 +0000 |
commit | 55da8b279203f87a125f62fd4a5f4eec66af2ef2 (patch) | |
tree | 26f292bb49065a8a334052d444551afa8b275f5c /spec/services | |
parent | 0a514100a69554681d11d41b583a1515e2246774 (diff) | |
parent | 35ce4820f24c15a5c7bdb111d73a90fd9bea2655 (diff) | |
download | gitlab-ce-55da8b279203f87a125f62fd4a5f4eec66af2ef2.tar.gz |
Merge branch 'sh-disable-registry-delete' into 'master'
Don't attempt to contact registry if it is disabled
See merge request gitlab-org/gitlab-ce!31553
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/projects/destroy_service_spec.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb index e436af77ed4..9a6f64b825a 100644 --- a/spec/services/projects/destroy_service_spec.rb +++ b/spec/services/projects/destroy_service_spec.rb @@ -241,6 +241,18 @@ describe Projects::DestroyService do expect(destroy_project(project, user)).to be false end end + + context 'when registry is disabled' do + before do + stub_container_registry_config(enabled: false) + end + + it 'does not attempting to remove any tags' do + expect(Projects::ContainerRepository::DestroyService).not_to receive(:new) + + destroy_project(project, user) + end + end end context 'when there are tags for legacy root repository' do |