Default to Paperclip::ContentTypeDetector (#2270)

* Add default `content_type_detector` to `UploadedFileAdapter`
thoughtbot · Aug 19, 2016 · 24fd060 · 24fd060
1 parent a67f296
commit 24fd060
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/paperclip/io_adapters/uploaded_file_adapter.rb b/lib/paperclip/io_adapters/uploaded_file_adapter.rb
@@ -24,7 +24,7 @@ def cache_current_values
     end
 
     def content_type_detector
-      self.class.content_type_detector
+      self.class.content_type_detector || Paperclip::ContentTypeDetector
     end
 
     def determine_content_type

diff --git a/spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb b/spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb
@@ -29,7 +29,7 @@ class UploadedFile < OpenStruct; end
       end
 
       it "gets the content type" do
-        assert_equal "image/x-png-by-browser", @subject.content_type
+        assert_equal "image/png", @subject.content_type
       end
 
       it "gets the file's size" do
@@ -98,7 +98,7 @@ class UploadedFile < OpenStruct; end
       end
 
       it "gets the content type" do
-        assert_equal "image/x-png-by-browser", @subject.content_type
+        assert_equal "image/png", @subject.content_type
       end
 
       it "gets the file's size" do