Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 21 insertions, 3 deletions

diff --git a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
index a41ba8216cc..38a3e00c8e7 100644
--- a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
@@ -267,12 +267,30 @@ RSpec.describe Projects::ContainerRepository::CleanupTagsService, :clean_gitlab_
             'container_expiration_policy' => true }
         end
 
-        it 'succeeds without a user' do
+        before do
           expect_delete(%w(Bb Ba C), container_expiration_policy: true)
+        end
+
+        it { is_expected.to eq(expected_service_response(deleted: %w(Bb Ba C), before_delete_size: 3)) }
+
+        context 'caching' do
+          it 'expects caching to be used' do
+            expect_caching
 
-          expect_caching
+            subject
+          end
+
+          context 'when setting set to false' do
+            before do
+              stub_application_setting(container_registry_expiration_policies_caching: false)
+            end
 
-          is_expected.to eq(expected_service_response(deleted: %w(Bb Ba C), before_delete_size: 3))
+            it 'does not use caching' do
+              expect_no_caching
+
+              subject
+            end
+          end
         end
       end