paperclip 3.5.4 → 4.3.7

data/{test/has_attached_file_test.rb → spec/paperclip/has_attached_file_spec.rb}

@@ -1,47 +1,54 @@
-require './test/helper'
-require 'paperclip/has_attached_file'
+require 'spec_helper'
 
-class HasAttachedFileTest < Test::Unit::TestCase
+describe Paperclip::HasAttachedFile do
   context '#define_on' do
-    should 'define a setter on the class object' do
+    it 'defines a setter on the class object' do
       assert_adding_attachment('avatar').defines_method('avatar=')
     end
 
-    should 'define a getter on the class object' do
+    it 'defines a getter on the class object' do
       assert_adding_attachment('avatar').defines_method('avatar')
     end
 
-    should 'define a query on the class object' do
+    it 'defines a query on the class object' do
       assert_adding_attachment('avatar').defines_method('avatar?')
     end
 
-    should 'define a method on the class to get all of its attachments' do
+    it 'defines a method on the class to get all of its attachments' do
       assert_adding_attachment('avatar').defines_class_method('attachment_definitions')
     end
 
-    should 'flush errors as part of validations' do
+    it 'flushes errors as part of validations' do
       assert_adding_attachment('avatar').defines_validation
     end
 
-    should 'register the attachment with Paperclip::AttachmentRegistry' do
+    it 'registers the attachment with Paperclip::AttachmentRegistry' do
       assert_adding_attachment('avatar').registers_attachment
     end
 
-    should 'define an after_save callback' do
+    it 'defines an after_save callback' do
       assert_adding_attachment('avatar').defines_callback('after_save')
     end
 
-    should 'define a before_destroy callback' do
+    it 'defines a before_destroy callback' do
       assert_adding_attachment('avatar').defines_callback('before_destroy')
     end
 
-    should 'define an after_commit callback' do
+    it 'defines an after_commit callback' do
       assert_adding_attachment('avatar').defines_callback('after_commit')
     end
 
-    should 'define the Paperclip-specific callbacks' do
+    it 'defines the Paperclip-specific callbacks' do
       assert_adding_attachment('avatar').defines_callback('define_paperclip_callbacks')
     end
+
+    it 'does not define a media_type check if told not to' do
+      assert_adding_attachment('avatar').does_not_set_up_media_type_check_validation
+    end
+
+    it 'does define a media_type check if told to' do
+      assert_adding_attachment('avatar').sets_up_media_type_check_validation
+    end
   end
 
   private
@@ -52,7 +59,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
   class AttachmentAdder
     include Mocha::API
-    include Test::Unit::Assertions
+    include RSpec::Matchers
 
     def initialize(attachment_name)
       @attachment_name = attachment_name
@@ -63,9 +70,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
-      assert_received(a_class, :define_method) do |expect|
-        expect.with(method_name)
-      end
+      expect(a_class).to have_received(:define_method).with(method_name)
     end
 
     def defines_class_method(method_name)
@@ -74,9 +79,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
-      assert_received(a_class, :extend) do |expect|
-        expect.with(Paperclip::HasAttachedFile::ClassMethods)
-      end
+      expect(a_class).to have_received(:extend).with(Paperclip::HasAttachedFile::ClassMethods)
     end
 
     def defines_validation
@@ -84,9 +87,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
-      assert_received(a_class, :validates_each) do |expect|
-        expect.with(@attachment_name)
-      end
+      expect(a_class).to have_received(:validates_each).with(@attachment_name)
     end
 
     def registers_attachment
@@ -95,9 +96,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {size: 1})
 
-      assert_received(Paperclip::AttachmentRegistry, :register) do |expect|
-        expect.with(a_class, @attachment_name, {size: 1})
-      end
+      expect(Paperclip::AttachmentRegistry).to have_received(:register).with(a_class, @attachment_name, {size: 1})
     end
 
     def defines_callback(callback_name)
@@ -105,7 +104,23 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
-      assert_received(a_class, callback_name.to_sym)
+      expect(a_class).to have_received(callback_name.to_sym)
+    end
+
+    def does_not_set_up_media_type_check_validation
+      a_class = stub_class
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, { validate_media_type: false })
+
+      expect(a_class).to have_received(:validates_media_type_spoof_detection).never
+    end
+
+    def sets_up_media_type_check_validation
+      a_class = stub_class
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, { validate_media_type: true })
+
+      expect(a_class).to have_received(:validates_media_type_spoof_detection)
     end
 
     private
@@ -119,7 +134,9 @@ class HasAttachedFileTest < Test::Unit::TestCase
            after_commit: nil,
            define_paperclip_callbacks: nil,
            extend: nil,
-           name: 'Billy')
+           name: 'Billy',
+           validates_media_type_spoof_detection: nil
+          )
     end
   end
 end