Merge branch '15398-disable-settings-if-registry-not-activated' into 'master'

Show settings only if container registry enabled

See merge request !23593

app/helpers/projects_helper.rb

@@ -709,4 +709,10 @@ def vue_file_list_enabled?
   def show_visibility_confirm_modal?(project)
     project.unlink_forks_upon_visibility_decrease_enabled? && project.visibility_level > Gitlab::VisibilityLevel::PRIVATE && project.forks_count > 0
   end
+
+  def settings_container_registry_expiration_policy_available?(project)
+    Feature.enabled?(:registry_retention_policies_settings, project) &&
+      Gitlab.config.registry.enabled &&
+      can?(current_user, :read_container_image, project)
+  end
 end

app/views/projects/settings/ci_cd/show.html.haml

@@ -62,7 +62,7 @@
   .settings-content
     = render 'projects/triggers/index'
 
-- if Feature.enabled?(:registry_retention_policies_settings, @project)
+- if settings_container_registry_expiration_policy_available?(@project)
   %section.settings.no-animate#js-registry-policies{ class: ('expanded' if expanded) }
     .settings-header
       %h4

spec/features/projects/settings/registry_settings_spec.rb

@@ -4,20 +4,26 @@
 
 describe 'Project > Settings > CI/CD > Container registry tag expiration policy', :js do
   let(:user) { create(:user) }
-  let(:project) { create(:project, namespace: user.namespace) }
+  let(:project) { create(:project, namespace: user.namespace, container_registry_enabled: container_registry_enabled) }
+  let(:container_registry_enabled) { true }
+
+  before do
+    sign_in(user)
+    stub_container_registry_config(enabled: true)
+    stub_feature_flags(registry_retention_policies_settings: true)
+  end
 
   context 'as owner' do
     before do
-      sign_in(user)
       visit project_settings_ci_cd_path(project)
     end
 
-    it 'section is available' do
+    it 'shows available section' do
       settings_block = find('#js-registry-policies')
       expect(settings_block).to have_text 'Container Registry tag expiration policy'
     end
 
-    it 'Save expiration policy submit the form' do
+    it 'saves expiration policy submit the form' do
       within '#js-registry-policies' do
         within '.card-body' do
           find('#expiration-policy-toggle button:not(.is-disabled)').click
@@ -34,4 +40,38 @@
       expect(toast).to have_content('Expiration policy successfully saved.')
     end
   end
+
+  context 'when registry is disabled' do
+    before do
+      stub_container_registry_config(enabled: false)
+      visit project_settings_ci_cd_path(project)
+    end
+
+    it 'does not exists' do
+      expect(page).not_to have_selector('#js-registry-policies')
+    end
+  end
+
+  context 'when container registry is disabled on project' do
+    let(:container_registry_enabled) { false }
+
+    before do
+      visit project_settings_ci_cd_path(project)
+    end
+
+    it 'does not exists' do
+      expect(page).not_to have_selector('#js-registry-policies')
+    end
+  end
+
+  context 'when feature flag is disabled' do
+    before do
+      stub_feature_flags(registry_retention_policies_settings: false)
+      visit project_settings_ci_cd_path(project)
+    end
+
+    it 'does not exists' do
+      expect(page).not_to have_selector('#js-registry-policies')
+    end
+  end
 end