Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

2 files changed, 21 insertions, 5 deletions

diff --git a/spec/services/design_management/delete_designs_service_spec.rb b/spec/services/design_management/delete_designs_service_spec.rb
index bc7625d7c28..a0e049ea42a 100644
--- a/spec/services/design_management/delete_designs_service_spec.rb
+++ b/spec/services/design_management/delete_designs_service_spec.rb
@@ -59,7 +59,11 @@ RSpec.describe DesignManagement::DeleteDesignsService do
       it_behaves_like "a service error"
 
       it 'does not create any events in the activity stream' do
-        expect { run_service rescue nil }.not_to change { Event.count }
+        expect do
+          run_service
+        rescue StandardError
+          nil
+        end.not_to change { Event.count }
       end
     end
 
@@ -78,7 +82,11 @@ RSpec.describe DesignManagement::DeleteDesignsService do
         it 'does not log any events' do
           counter = ::Gitlab::UsageDataCounters::DesignsCounter
 
-          expect { run_service rescue nil }
+          expect do
+            run_service
+          rescue StandardError
+            nil
+          end
             .not_to change { [counter.totals, Event.count] }
         end
 
@@ -86,10 +94,18 @@ RSpec.describe DesignManagement::DeleteDesignsService do
           redis_hll = ::Gitlab::UsageDataCounters::HLLRedisCounter
           event = Gitlab::UsageDataCounters::IssueActivityUniqueCounter::ISSUE_DESIGNS_REMOVED
 
-          expect { run_service rescue nil }
+          expect do
+            run_service
+          rescue StandardError
+            nil
+          end
             .not_to change { redis_hll.unique_events(event_names: event, start_date: 1.day.ago, end_date: 1.day.from_now) }
 
-          run_service rescue nil
+          begin
+            run_service
+          rescue StandardError
+            nil
+          end
         end
       end
 
diff --git a/spec/services/design_management/generate_image_versions_service_spec.rb b/spec/services/design_management/generate_image_versions_service_spec.rb
index e06b6fbf116..5409ec12016 100644
--- a/spec/services/design_management/generate_image_versions_service_spec.rb
+++ b/spec/services/design_management/generate_image_versions_service_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe DesignManagement::GenerateImageVersionsService do
     end
 
     it 'skips generating image versions if the mime type is not whitelisted' do
-      stub_const('DesignManagement::DesignV432x230Uploader::MIME_TYPE_WHITELIST', [])
+      stub_const('DesignManagement::DesignV432x230Uploader::MIME_TYPE_ALLOWLIST', [])
 
       described_class.new(version).execute