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

1 files changed, 1 insertions, 2 deletions

diff --git a/spec/support/shared_contexts/upload_type_check_shared_context.rb b/spec/support/shared_contexts/upload_type_check_shared_context.rb
index f168cad961c..5fce31b4a15 100644
--- a/spec/support/shared_contexts/upload_type_check_shared_context.rb
+++ b/spec/support/shared_contexts/upload_type_check_shared_context.rb
@@ -13,7 +13,6 @@ end
 # @param mime_type [String] mime type to forcibly detect.
 RSpec.shared_context 'force content type detection to mime_type' do
   before do
-    magic_mime_obj = MimeMagic.new(mime_type)
-    allow(MimeMagic).to receive(:by_magic).with(anything).and_return(magic_mime_obj)
+    allow(Gitlab::Utils::MimeType).to receive(:from_io).and_return(mime_type)
   end
 end