Simplify the implementation by removing a stub

carrierwaveuploader · May 12, 2018 · 7b90f2c · 7b90f2c
1 parent 21771e6
commit 7b90f2c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/lib/carrierwave/sanitized_file.rb b/lib/carrierwave/sanitized_file.rb
@@ -261,11 +261,7 @@ def to_file
     def content_type
       return @content_type if @content_type
       if @file.respond_to?(:content_type) and @file.content_type
-        if @file.content_type.respond_to?(:content_type)
-          @content_type = @file.content_type.content_type.chomp
-        else
-          @content_type = @file.content_type.to_s.chomp
-        end
+        @content_type = @file.content_type.to_s.chomp
       elsif path
         mime_type = ::MiniMime.lookup_by_filename(path)
         @content_type = (mime_type && mime_type.content_type).to_s

diff --git a/spec/sanitized_file_spec.rb b/spec/sanitized_file_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'mini_mime'
 
 describe CarrierWave::SanitizedFile do
   before do
@@ -183,7 +182,7 @@
 
     it "handles Mime::Type object" do
       file = File.open(file_path('sponsored.doc'))
-      allow(file).to receive(:content_type).and_return(MiniMime.lookup_by_content_type("application/msword"))
+
       sanitized_file = CarrierWave::SanitizedFile.new(file)
       allow(sanitized_file).to receive(:file).and_return(file)