2 files changed, 14 insertions, 2 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 38a3e00c8e7..86c0ba4222c 100644
--- a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Projects::ContainerRepository::CleanupTagsService, :clean_gitlab_
   let(:tags) { %w[latest A Ba Bb C D E] }
 
   before do
-    project.add_maintainer(user)
+    project.add_maintainer(user) if user
 
     stub_container_registry_config(enabled: true)
 
diff --git a/spec/services/projects/container_repository/third_party/delete_tags_service_spec.rb b/spec/services/projects/container_repository/third_party/delete_tags_service_spec.rb
index 7fc963949eb..22cada7816b 100644
--- a/spec/services/projects/container_repository/third_party/delete_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/third_party/delete_tags_service_spec.rb
@@ -58,7 +58,19 @@ RSpec.describe Projects::ContainerRepository::ThirdParty::DeleteTagsService do
               stub_put_manifest_request('Ba', 500, {})
             end
 
-            it { is_expected.to eq(status: :error, message: 'could not delete tags') }
+            it { is_expected.to eq(status: :error, message: "could not delete tags: #{tags.join(', ')}")}
+
+            context 'when a large list of tag updates fails' do
+              let(:tags) { Array.new(1000) { |i| "tag_#{i}" } }
+
+              before do
+                expect(service).to receive(:replace_tag_manifests).and_return({})
+              end
+
+              it 'truncates the log message' do
+                expect(subject).to eq(status: :error, message: "could not delete tags: #{tags.join(', ')}".truncate(1000))
+              end
+            end
           end
 
           context 'a single tag update fails' do