diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 17:34:57 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 17:34:57 +0000 |
commit | b2ce3643e27db4cc0ad30cc09d651c00ec799887 (patch) | |
tree | f0e7882be8145da2f59fec4ac26e070afd147ab9 /spec/support | |
parent | e9143b15cc400b69ef274789225ac2fee5fdcf83 (diff) | |
download | gitlab-ce-b2ce3643e27db4cc0ad30cc09d651c00ec799887.tar.gz |
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/shared_contexts/upload_type_check_shared_context.rb | 3 |
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 |