Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 11 insertions, 7 deletions

diff --git a/spec/uploaders/content_type_whitelist_spec.rb b/spec/uploaders/content_type_whitelist_spec.rb
index 4689f83759d..32d030cdfee 100644
--- a/spec/uploaders/content_type_whitelist_spec.rb
+++ b/spec/uploaders/content_type_whitelist_spec.rb
@@ -3,16 +3,20 @@
 require 'spec_helper'
 
 describe ContentTypeWhitelist do
-  class DummyUploader < CarrierWave::Uploader::Base
-    include ContentTypeWhitelist::Concern
+  let_it_be(:model) { build_stubbed(:user) }
+  let!(:uploader) do
+    stub_const('DummyUploader', Class.new(CarrierWave::Uploader::Base))
+
+    DummyUploader.class_eval do
+      include ContentTypeWhitelist::Concern
 
-    def content_type_whitelist
-      %w[image/png image/jpeg]
+      def content_type_whitelist
+        %w[image/png image/jpeg]
+      end
     end
-  end
 
-  let_it_be(:model) { build_stubbed(:user) }
-  let_it_be(:uploader) { DummyUploader.new(model, :dummy) }
+    DummyUploader.new(model, :dummy)
+  end
 
   context 'upload whitelisted file content type' do
     let(:path) { File.join('spec', 'fixtures', 'rails_sample.jpg') }