Fix errors caused by HasAttachedFile fix earlier

lib/paperclip/has_attached_file.rb

@@ -7,7 +7,7 @@ module Paperclip
     def initialize(klass, name, options)
     def initialize(klass, name, options)
       @klass = klass
       @klass = klass
       @name = name
       @name = name
-      @options = Paperclip::Attachment.default_options.deep_merge(options)
+      @options = options
     end
     end
 
 
     def define
     def define
@@ -79,7 +79,8 @@ module Paperclip
     end
     end
 
 
     def add_required_validations
     def add_required_validations
-      if @options[:validate_media_type] != false
+      options = Paperclip::Attachment.default_options.deep_merge(@options)
+      if options[:validate_media_type] != false
         name = @name
         name = @name
         @klass.validates_media_type_spoof_detection name,
         @klass.validates_media_type_spoof_detection name,
           :if => ->(instance){ instance.send(name).dirty? }
           :if => ->(instance){ instance.send(name).dirty? }

spec/paperclip/attachment_definitions_spec.rb

@@ -8,6 +8,6 @@ describe "Attachment Definitions" do
     Dummy.do_not_validate_attachment_file_type :avatar
     Dummy.do_not_validate_attachment_file_type :avatar
     expected = {avatar: {path: "abc"}, other_attachment: {url: "123"}}
     expected = {avatar: {path: "abc"}, other_attachment: {url: "123"}}
 
 
-    assert_equal expected, Dummy.attachment_definitions
+    expect(Dummy.attachment_definitions).to eq expected
   end
   end
 end
 end