From 48aff82709769b098321c738f3444b9bdaa694c6 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 21 Oct 2020 07:08:36 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-5-stable-ee

---
 .../projects/settings/pipelines_settings_spec.rb   |  4 +-
 .../projects/settings/registry_settings_spec.rb    | 70 +++++++++++++++++-----
 2 files changed, 56 insertions(+), 18 deletions(-)

(limited to 'spec/features/projects/settings')

diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index 0358acc8dcc..ffc0ecc4966 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -64,7 +64,7 @@ RSpec.describe "Projects > Settings > Pipelines settings" do
     it 'updates forward_deployment_enabled' do
       visit project_settings_ci_cd_path(project)
 
-      checkbox = find_field('project_forward_deployment_enabled')
+      checkbox = find_field('project_ci_cd_settings_attributes_forward_deployment_enabled')
       expect(checkbox).to be_checked
 
       checkbox.set(false)
@@ -79,7 +79,7 @@ RSpec.describe "Projects > Settings > Pipelines settings" do
         expect(page).to have_button('Save changes', disabled: false)
       end
 
-      checkbox = find_field('project_forward_deployment_enabled')
+      checkbox = find_field('project_ci_cd_settings_attributes_forward_deployment_enabled')
       expect(checkbox).not_to be_checked
     end
 
diff --git a/spec/features/projects/settings/registry_settings_spec.rb b/spec/features/projects/settings/registry_settings_spec.rb
index 8e2f97fd6a0..4e1b53ffc87 100644
--- a/spec/features/projects/settings/registry_settings_spec.rb
+++ b/spec/features/projects/settings/registry_settings_spec.rb
@@ -3,27 +3,35 @@
 require 'spec_helper'
 
 RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration policy', :js do
-  let(:user) { create(:user) }
-  let(:project) { create(:project, namespace: user.namespace, container_registry_enabled: container_registry_enabled) }
+  using RSpec::Parameterized::TableSyntax
+
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project, reload: true) { create(:project, namespace: user.namespace) }
+
   let(:container_registry_enabled) { true }
+  let(:container_registry_enabled_on_project) { true }
+
+  subject { visit project_settings_ci_cd_path(project) }
 
   before do
+    project.update!(container_registry_enabled: container_registry_enabled_on_project)
+
     sign_in(user)
-    stub_container_registry_config(enabled: true)
+    stub_container_registry_config(enabled: container_registry_enabled)
     stub_feature_flags(new_variables_ui: false)
   end
 
   context 'as owner' do
-    before do
-      visit project_settings_ci_cd_path(project)
-    end
-
     it 'shows available section' do
+      subject
+
       settings_block = find('#js-registry-policies')
       expect(settings_block).to have_text 'Cleanup policy for tags'
     end
 
     it 'saves cleanup policy submit the form' do
+      subject
+
       within '#js-registry-policies' do
         within '.card-body' do
           select('7 days until tags are automatically removed', from: 'Expiration interval:')
@@ -40,6 +48,8 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p
     end
 
     it 'does not save cleanup policy submit form with invalid regex' do
+      subject
+
       within '#js-registry-policies' do
         within '.card-body' do
           fill_in('Tags with names matching this regex pattern will expire:', with: '*-production')
@@ -53,25 +63,53 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p
     end
   end
 
-  context 'when registry is disabled' do
-    before do
-      stub_container_registry_config(enabled: false)
-      visit project_settings_ci_cd_path(project)
+  context 'with a project without expiration policy' do
+    where(:application_setting, :feature_flag, :result) do
+      true  | true  | :available_section
+      true  | false | :available_section
+      false | true  | :available_section
+      false | false | :disabled_message
     end
 
-    it 'does not exists' do
-      expect(page).not_to have_selector('#js-registry-policies')
+    with_them do
+      before do
+        project.container_expiration_policy.destroy!
+        stub_feature_flags(container_expiration_policies_historic_entry: false)
+        stub_application_setting(container_expiration_policies_enable_historic_entries: application_setting)
+        stub_feature_flags(container_expiration_policies_historic_entry: project) if feature_flag
+      end
+
+      it 'displays the expected result' do
+        subject
+
+        within '#js-registry-policies' do
+          case result
+          when :available_section
+            expect(find('.card-header')).to have_content('Tag expiration policy')
+          when :disabled_message
+            expect(find('.gl-alert-title')).to have_content('Cleanup policy for tags is disabled')
+          end
+        end
+      end
     end
   end
 
-  context 'when container registry is disabled on project' do
+  context 'when registry is disabled' do
     let(:container_registry_enabled) { false }
 
-    before do
-      visit project_settings_ci_cd_path(project)
+    it 'does not exists' do
+      subject
+
+      expect(page).not_to have_selector('#js-registry-policies')
     end
+  end
+
+  context 'when container registry is disabled on project' do
+    let(:container_registry_enabled_on_project) { false }
 
     it 'does not exists' do
+      subject
+
       expect(page).not_to have_selector('#js-registry-policies')
     end
   end
-- 
cgit v1.2.3