1 files changed, 17 insertions, 41 deletions
diff --git a/spec/services/projects/container_repository/delete_tags_service_spec.rb b/spec/services/projects/container_repository/delete_tags_service_spec.rb
index 54375193067..c3ae26b1f05 100644
--- a/spec/services/projects/container_repository/delete_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/delete_tags_service_spec.rb
@@ -87,59 +87,35 @@ RSpec.describe Projects::ContainerRepository::DeleteTagsService do
 
   RSpec.shared_examples 'supporting fast delete' do
     context 'when the registry supports fast delete' do
-      context 'and the feature is enabled' do
-        before do
-          allow(repository.client).to receive(:supports_tag_delete?).and_return(true)
-        end
-
-        it_behaves_like 'calling the correct delete tags service', ::Projects::ContainerRepository::Gitlab::DeleteTagsService
-
-        it_behaves_like 'handling invalid params'
+      before do
+        allow(repository.client).to receive(:supports_tag_delete?).and_return(true)
+      end
 
-        context 'with the real service' do
-          before do
-            stub_delete_reference_requests(tags)
-            expect_delete_tag_by_names(tags)
-          end
+      it_behaves_like 'calling the correct delete tags service', ::Projects::ContainerRepository::Gitlab::DeleteTagsService
 
-          it { is_expected.to include(status: :success) }
+      it_behaves_like 'handling invalid params'
 
-          it_behaves_like 'logging a success response'
+      context 'with the real service' do
+        before do
+          stub_delete_reference_requests(tags)
+          expect_delete_tag_by_names(tags)
         end
 
-        context 'with a timeout error' do
-          before do
-            expect_next_instance_of(::Projects::ContainerRepository::Gitlab::DeleteTagsService) do |delete_service|
-              expect(delete_service).to receive(:delete_tags).and_raise(::Projects::ContainerRepository::Gitlab::DeleteTagsService::TimeoutError)
-            end
-          end
-
-          it { is_expected.to include(status: :error, message: 'timeout while deleting tags') }
+        it { is_expected.to include(status: :success) }
 
-          it_behaves_like 'logging an error response', message: 'timeout while deleting tags'
-        end
+        it_behaves_like 'logging a success response'
       end
 
-      context 'and the feature is disabled' do
+      context 'with a timeout error' do
         before do
-          stub_feature_flags(container_registry_fast_tag_delete: false)
-        end
-
-        it_behaves_like 'calling the correct delete tags service', ::Projects::ContainerRepository::ThirdParty::DeleteTagsService
-
-        it_behaves_like 'handling invalid params'
-
-        context 'with the real service' do
-          before do
-            stub_upload('sha256:4435000728ee66e6a80e55637fc22725c256b61de344a2ecdeaac6bdb36e8bc3')
-            tags.each { |tag| stub_put_manifest_request(tag) }
-            expect_delete_tag_by_digest('sha256:dummy')
+          expect_next_instance_of(::Projects::ContainerRepository::Gitlab::DeleteTagsService) do |delete_service|
+            expect(delete_service).to receive(:delete_tags).and_raise(::Projects::ContainerRepository::Gitlab::DeleteTagsService::TimeoutError)
           end
+        end
 
-          it { is_expected.to include(status: :success) }
+        it { is_expected.to include(status: :error, message: 'timeout while deleting tags') }
 
-          it_behaves_like 'logging a success response'
-        end
+        it_behaves_like 'logging an error response', message: 'timeout while deleting tags'
       end
     end
   end