Add latest changes from gitlab-org/gitlab@master

1 files changed, 32 insertions, 3 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 246ca301cfa..74ef968182f 100644
--- a/spec/services/projects/container_repository/delete_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/delete_tags_service_spec.rb
@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Projects::ContainerRepository::DeleteTagsService do
+  using RSpec::Parameterized::TableSyntax
   include_context 'container repository delete tags service shared context'
 
   let(:service) { described_class.new(project, user, params) }
@@ -157,11 +158,39 @@ RSpec.describe Projects::ContainerRepository::DeleteTagsService do
       end
 
       context 'when the repository is importing' do
-        before do
-          repository.update_columns(migration_state: 'importing', migration_import_started_at: Time.zone.now)
+        where(:migration_state, :called_by_policy, :error_expected) do
+          'default'         | false | false
+          'default'         | true  | false
+          'pre_importing'   | false | false
+          'pre_importing'   | true  | true
+          'pre_import_done' | false | false
+          'pre_import_done' | true  | true
+          'importing'       | false | true
+          'importing'       | true  | true
+          'import_done'     | false | false
+          'import_done'     | true  | false
+          'import_aborted'  | false | false
+          'import_aborted'  | true  | false
+          'import_skipped'  | false | false
+          'import_skipped'  | true  | false
         end
 
-        it { is_expected.to include(status: :error, message: 'repository importing') }
+        with_them do
+          let(:params) { { tags: tags, container_expiration_policy: called_by_policy ? true : nil } }
+
+          before do
+            repository.update_columns(migration_state: migration_state, migration_import_started_at: Time.zone.now, migration_pre_import_started_at: Time.zone.now, migration_pre_import_done_at: Time.zone.now)
+          end
+
+          it 'returns an error response if expected' do
+            if error_expected
+              expect(subject).to include(status: :error, message: 'repository importing')
+            else
+              expect(service).to receive(:delete_tags).and_return(status: :success)
+              expect(subject).not_to include(status: :error)
+            end
+          end
+        end
       end
     end