kt-paperclip 5.4.0 → 7.1.1

data/spec/paperclip/validators/attachment_presence_validator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::Validators::AttachmentPresenceValidator do
   before do
@@ -6,10 +6,10 @@ describe Paperclip::Validators::AttachmentPresenceValidator do
     @dummy = Dummy.new
   end
 
-  def build_validator(options={})
+  def build_validator(options = {})
     @validator = Paperclip::Validators::AttachmentPresenceValidator.new(options.merge(
-      attributes: :avatar
-    ))
+                                                                          attributes: :avatar
+                                                                        ))
   end
 
   context "nil attachment" do
@@ -79,7 +79,7 @@ describe Paperclip::Validators::AttachmentPresenceValidator do
     end
 
     it "adds the validator to the class" do
-      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_presence }
+      assert Dummy.validators_on(:avatar).any? { |validator| validator.kind == :attachment_presence }
     end
   end
 end

data/spec/paperclip/validators/attachment_size_validator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::Validators::AttachmentSizeValidator do
   before do
@@ -8,22 +8,22 @@ describe Paperclip::Validators::AttachmentSizeValidator do
 
   def build_validator(options)
     @validator = Paperclip::Validators::AttachmentSizeValidator.new(options.merge(
-      attributes: :avatar
-    ))
+                                                                      attributes: :avatar
+                                                                    ))
   end
 
   def self.should_allow_attachment_file_size(size)
     context "when the attachment size is #{size}" do
       it "adds error to dummy object" do
-        @dummy.stubs(:avatar_file_size).returns(size)
+        allow(@dummy).to receive(:avatar_content_type).and_return(size)
         @validator.validate(@dummy)
         assert @dummy.errors[:avatar_file_size].blank?,
-          "Expect an error message on :avatar_file_size, got none."
+               "Expect an error message on :avatar_file_size, got none."
       end
 
       it "does not add error to the base dummy object" do
         assert @dummy.errors[:avatar].blank?,
-          "Error added to base attribute"
+               "Error added to base attribute"
       end
     end
   end
@@ -31,18 +31,18 @@ describe Paperclip::Validators::AttachmentSizeValidator do
   def self.should_not_allow_attachment_file_size(size, options = {})
     context "when the attachment size is #{size}" do
       before do
-        @dummy.stubs(:avatar_file_size).returns(size)
+        allow(@dummy).to receive(:avatar_file_size).and_return(size)
         @validator.validate(@dummy)
       end
 
       it "adds error to dummy object" do
         assert @dummy.errors[:avatar_file_size].present?,
-          "Unexpected error message on :avatar_file_size"
+               "Unexpected error message on :avatar_file_size"
       end
 
       it "adds error to the base dummy object" do
         assert @dummy.errors[:avatar].present?,
-          "Error not added to base attribute"
+               "Error not added to base attribute"
       end
 
       it "adds error to base object as a string" do
@@ -70,7 +70,7 @@ describe Paperclip::Validators::AttachmentSizeValidator do
 
     context "as a proc" do
       before do
-        build_validator in: lambda { |avatar| (5.kilobytes..10.kilobytes) }
+        build_validator in: lambda { |_avatar| (5.kilobytes..10.kilobytes) }
       end
 
       should_allow_attachment_file_size(7.kilobytes)
@@ -91,7 +91,7 @@ describe Paperclip::Validators::AttachmentSizeValidator do
 
     context "as a proc" do
       before do
-        build_validator greater_than: lambda { |avatar| 10.kilobytes }
+        build_validator greater_than: lambda { |_avatar| 10.kilobytes }
       end
 
       should_allow_attachment_file_size 11.kilobytes
@@ -111,7 +111,7 @@ describe Paperclip::Validators::AttachmentSizeValidator do
 
     context "as a proc" do
       before do
-        build_validator less_than: lambda { |avatar| 10.kilobytes }
+        build_validator less_than: lambda { |_avatar| 10.kilobytes }
       end
 
       should_allow_attachment_file_size 9.kilobytes
@@ -123,7 +123,7 @@ describe Paperclip::Validators::AttachmentSizeValidator do
     context "as numbers" do
       before do
         build_validator greater_than: 5.kilobytes,
-          less_than: 10.kilobytes
+                        less_than: 10.kilobytes
       end
 
       should_allow_attachment_file_size 7.kilobytes
@@ -133,8 +133,8 @@ describe Paperclip::Validators::AttachmentSizeValidator do
 
     context "as a proc" do
       before do
-        build_validator greater_than: lambda { |avatar| 5.kilobytes },
-          less_than: lambda { |avatar| 10.kilobytes }
+        build_validator greater_than: lambda { |_avatar| 5.kilobytes },
+                        less_than: lambda { |_avatar| 10.kilobytes }
       end
 
       should_allow_attachment_file_size 7.kilobytes
@@ -147,7 +147,7 @@ describe Paperclip::Validators::AttachmentSizeValidator do
     context "given a range" do
       before do
         build_validator in: (5.kilobytes..10.kilobytes),
-          message: "is invalid. (Between %{min} and %{max} please.)"
+                        message: "is invalid. (Between %{min} and %{max} please.)"
       end
 
       should_not_allow_attachment_file_size(
@@ -159,8 +159,8 @@ describe Paperclip::Validators::AttachmentSizeValidator do
     context "given :less_than and :greater_than" do
       before do
         build_validator less_than: 10.kilobytes,
-          greater_than: 5.kilobytes,
-          message: "is invalid. (Between %{min} and %{max} please.)"
+                        greater_than: 5.kilobytes,
+                        message: "is invalid. (Between %{min} and %{max} please.)"
       end
 
       should_not_allow_attachment_file_size(
@@ -174,7 +174,7 @@ describe Paperclip::Validators::AttachmentSizeValidator do
     context "given :less_than and :greater_than" do
       before do
         build_validator greater_than: 5.kilobytes,
-          less_than: 10.kilobytes
+                        less_than: 10.kilobytes
       end
 
       should_not_allow_attachment_file_size(
@@ -205,13 +205,103 @@ describe Paperclip::Validators::AttachmentSizeValidator do
     end
   end
 
+  context "with add_validation_errors_to not set (implicitly :both)" do
+    it "adds error to both attribute and base" do
+      build_validator in: (5.kilobytes..10.kilobytes)
+      allow(@dummy).to receive(:avatar_file_size).and_return(11.kilobytes)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_file_size].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :attribute globally" do
+    before do
+      Paperclip.options[:add_validation_errors_to] = :attribute
+    end
+
+    after do
+      Paperclip.options[:add_validation_errors_to] = :both
+    end
+
+    it "only adds error to attribute not base" do
+      build_validator in: (5.kilobytes..10.kilobytes)
+      allow(@dummy).to receive(:avatar_file_size).and_return(11.kilobytes)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_file_size].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].blank?,
+             "Error added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :base globally" do
+    before do
+      Paperclip.options[:add_validation_errors_to] = :base
+    end
+
+    after do
+      Paperclip.options[:add_validation_errors_to] = :both
+    end
+
+    it "only adds error to base not attribute" do
+      build_validator in: (5.kilobytes..10.kilobytes)
+      allow(@dummy).to receive(:avatar_file_size).and_return(11.kilobytes)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+
+      assert @dummy.errors[:avatar_file_size].blank?,
+             "Error added to attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :attribute" do
+    it "only adds error to attribute not base" do
+      build_validator in: (5.kilobytes..10.kilobytes),
+                      add_validation_errors_to: :attribute
+
+      allow(@dummy).to receive(:avatar_file_size).and_return(11.kilobytes)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_file_size].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].blank?,
+             "Error added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :base" do
+    it "only adds error to base not attribute" do
+      build_validator in: (5.kilobytes..10.kilobytes),
+                      add_validation_errors_to: :base
+
+      allow(@dummy).to receive(:avatar_file_size).and_return(11.kilobytes)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+
+      assert @dummy.errors[:avatar_file_size].blank?,
+             "Error added to attribute"
+    end
+  end
+
   context "using the helper" do
     before do
       Dummy.validates_attachment_size :avatar, in: (5.kilobytes..10.kilobytes)
     end
 
     it "adds the validator to the class" do
-      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_size }
+      assert Dummy.validators_on(:avatar).any? { |validator| validator.kind == :attachment_size }
     end
   end
 
@@ -222,7 +312,7 @@ describe Paperclip::Validators::AttachmentSizeValidator do
       end
     end
 
-    (Paperclip::Validators::AttachmentSizeValidator::AVAILABLE_CHECKS).each do |argument|
+    Paperclip::Validators::AttachmentSizeValidator::AVAILABLE_CHECKS.each do |argument|
       it "does not raise arguemnt error if #{argument} was given" do
         build_validator argument => 5.kilobytes
       end

data/spec/paperclip/validators/media_type_spoof_detection_validator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::Validators::MediaTypeSpoofDetectionValidator do
   before do
@@ -8,17 +8,17 @@ describe Paperclip::Validators::MediaTypeSpoofDetectionValidator do
 
   def build_validator(options = {})
     @validator = Paperclip::Validators::MediaTypeSpoofDetectionValidator.new(options.merge(
-      attributes: :avatar
-    ))
+                                                                               attributes: :avatar
+                                                                             ))
   end
 
   it "is on the attachment without being explicitly added" do
-    assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :media_type_spoof_detection }
+    assert Dummy.validators_on(:avatar).any? { |validator| validator.kind == :media_type_spoof_detection }
   end
 
   it "is not on the attachment when explicitly rejected" do
     rebuild_model validate_media_type: false
-    assert Dummy.validators_on(:avatar).none?{ |validator| validator.kind == :media_type_spoof_detection }
+    assert Dummy.validators_on(:avatar).none? { |validator| validator.kind == :media_type_spoof_detection }
   end
 
   it "returns default error message for spoofed media type" do
@@ -26,8 +26,8 @@ describe Paperclip::Validators::MediaTypeSpoofDetectionValidator do
     file = File.new(fixture_file("5k.png"), "rb")
     @dummy.avatar.assign(file)
 
-    detector = mock("detector", :spoofed? => true)
-    Paperclip::MediaTypeSpoofDetector.stubs(:using).returns(detector)
+    detector = double("detector", spoofed?: true)
+    allow(Paperclip::MediaTypeSpoofDetector).to receive(:using).and_return(detector)
     @validator.validate(@dummy)
 
     assert_equal I18n.t("errors.messages.spoofed_media_type"), @dummy.errors[:avatar].first
@@ -37,16 +37,12 @@ describe Paperclip::Validators::MediaTypeSpoofDetectionValidator do
     build_validator
     file = File.new(fixture_file("5k.png"), "rb")
     @dummy.avatar.assign(file)
-    Paperclip::MediaTypeSpoofDetector.stubs(:using).returns(stub(:spoofed? => false))
-
+    expect(Paperclip::MediaTypeSpoofDetector).to receive(:using).once.and_return(double("detector", spoofed?: false))
     @dummy.valid?
-
-    assert_received(Paperclip::MediaTypeSpoofDetector, :using){|e| e.once }
   end
 
   it "does not run when attachment is not dirty" do
-    Paperclip::MediaTypeSpoofDetector.stubs(:using).never
+    expect(Paperclip::MediaTypeSpoofDetector).to_not receive(:using)
     @dummy.valid?
-    assert_received(Paperclip::MediaTypeSpoofDetector, :using){|e| e.never }
   end
 end

data/spec/paperclip/validators_spec.rb

@@ -1,6 +1,11 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::Validators do
+  # required to support a range of rubies
+  def error_attribute_names(error)
+    error.try(:attribute_names) || error.keys
+  end
+
   context "using the helper" do
     before do
       rebuild_class
@@ -8,65 +13,73 @@ describe Paperclip::Validators do
     end
 
     it "adds the attachment_presence validator to the class" do
-      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_presence }
+      assert Dummy.validators_on(:avatar).any? { |validator| validator.kind == :attachment_presence }
     end
 
     it "adds the attachment_content_type validator to the class" do
-      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_content_type }
+      assert Dummy.validators_on(:avatar).any? { |validator| validator.kind == :attachment_content_type }
     end
 
     it "adds the attachment_size validator to the class" do
-      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_size }
+      assert Dummy.validators_on(:avatar).any? { |validator| validator.kind == :attachment_size }
     end
 
-    it 'prevents you from attaching a file that violates that validation' do
-      Dummy.class_eval{ validate(:name) { raise "DO NOT RUN THIS" } }
+    it "prevents you from attaching a file that violates that validation" do
+      Dummy.class_eval { validate(:name) { raise "DO NOT RUN THIS" } }
       dummy = Dummy.new(avatar: File.new(fixture_file("12k.png")))
-      expect(dummy.errors.keys).to match_array [:avatar_content_type, :avatar, :avatar_file_size]
-      assert_raises(RuntimeError){ dummy.valid? }
+      expect(error_attribute_names(dummy.errors)).to match_array(
+        %i[avatar_content_type avatar avatar_file_size]
+      )
+      assert_raises(RuntimeError) { dummy.valid? }
     end
   end
 
-  context 'using the helper with array of validations' do
+  context "using the helper with array of validations" do
     before do
       rebuild_class
       Dummy.validates_attachment :avatar, file_type_ignorance: true, file_name: [
-          { matches: /\A.*\.jpe?g\z/i, message: :invalid_extension },
-          { matches: /\A.{,8}\..+\z/i, message: [:too_long, count: 8] },
+        { matches: /\A.*\.jpe?g\z/i, message: :invalid_extension },
+        { matches: /\A.{,8}\..+\z/i, message: [:too_long, count: 8] },
       ]
     end
 
-    it 'adds the attachment_file_name validator to the class' do
-      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_file_name }
+    it "adds the attachment_file_name validator to the class" do
+      assert Dummy.validators_on(:avatar).any? { |validator| validator.kind == :attachment_file_name }
     end
 
-    it 'adds the attachment_file_name validator with two validations' do
-      assert_equal 2, Dummy.validators_on(:avatar).select{ |validator| validator.kind == :attachment_file_name }.size
+    it "adds the attachment_file_name validator with two validations" do
+      assert_equal 2, Dummy.validators_on(:avatar).select { |validator| validator.kind == :attachment_file_name }.size
     end
 
-    it 'prevents you from attaching a file that violates all of these validations' do
-      Dummy.class_eval{ validate(:name) { raise 'DO NOT RUN THIS' } }
-      dummy = Dummy.new(avatar: File.new(fixture_file('spaced file.png')))
-      expect(dummy.errors.keys).to match_array [:avatar, :avatar_file_name]
-      assert_raises(RuntimeError){ dummy.valid? }
+    it "prevents you from attaching a file that violates all of these validations" do
+      Dummy.class_eval { validate(:name) { raise "DO NOT RUN THIS" } }
+      dummy = Dummy.new(avatar: File.new(fixture_file("spaced file.png")))
+      expect(error_attribute_names(dummy.errors)).to match_array(
+        %i[avatar avatar_file_name]
+      )
+      assert_raises(RuntimeError) { dummy.valid? }
     end
 
-    it 'prevents you from attaching a file that violates only first of these validations' do
-      Dummy.class_eval{ validate(:name) { raise 'DO NOT RUN THIS' } }
-      dummy = Dummy.new(avatar: File.new(fixture_file('5k.png')))
-      expect(dummy.errors.keys).to match_array [:avatar, :avatar_file_name]
-      assert_raises(RuntimeError){ dummy.valid? }
+    it "prevents you from attaching a file that violates only first of these validations" do
+      Dummy.class_eval { validate(:name) { raise "DO NOT RUN THIS" } }
+      dummy = Dummy.new(avatar: File.new(fixture_file("5k.png")))
+      expect(error_attribute_names(dummy.errors)).to match_array(
+        %i[avatar avatar_file_name]
+      )
+      assert_raises(RuntimeError) { dummy.valid? }
     end
 
-    it 'prevents you from attaching a file that violates only second of these validations' do
-      Dummy.class_eval{ validate(:name) { raise 'DO NOT RUN THIS' } }
-      dummy = Dummy.new(avatar: File.new(fixture_file('spaced file.jpg')))
-      expect(dummy.errors.keys).to match_array [:avatar, :avatar_file_name]
-      assert_raises(RuntimeError){ dummy.valid? }
+    it "prevents you from attaching a file that violates only second of these validations" do
+      Dummy.class_eval { validate(:name) { raise "DO NOT RUN THIS" } }
+      dummy = Dummy.new(avatar: File.new(fixture_file("spaced file.jpg")))
+      expect(error_attribute_names(dummy.errors)).to match_array(
+        %i[avatar avatar_file_name]
+      )
+      assert_raises(RuntimeError) { dummy.valid? }
     end
 
-    it 'allows you to attach a file that does not violate these validations' do
-      dummy = Dummy.new(avatar: File.new(fixture_file('rotated.jpg')))
+    it "allows you to attach a file that does not violate these validations" do
+      dummy = Dummy.new(avatar: File.new(fixture_file("rotated.jpg")))
       expect(dummy.errors.full_messages).to be_empty
       assert dummy.valid?
     end
@@ -76,9 +89,9 @@ describe Paperclip::Validators do
     before do
       rebuild_class
       Dummy.validates_attachment :avatar, presence: true,
-        content_type: { content_type: "image/jpeg" },
-        size: { in: 0..10240 },
-        if: :title_present?
+                                          content_type: { content_type: "image/jpeg" },
+                                          size: { in: 0..10240 },
+                                          if: :title_present?
     end
 
     it "validates the attachment if title is present" do
@@ -88,7 +101,9 @@ describe Paperclip::Validators do
         end
       end
       dummy = Dummy.new(avatar: File.new(fixture_file("12k.png")))
-      expect(dummy.errors.keys).to match_array [:avatar_content_type, :avatar, :avatar_file_size]
+      expect(error_attribute_names(dummy.errors)).to match_array(
+        %i[avatar_content_type avatar avatar_file_size]
+      )
     end
 
     it "does not validate attachment if title is not present" do
@@ -98,24 +113,24 @@ describe Paperclip::Validators do
         end
       end
       dummy = Dummy.new(avatar: File.new(fixture_file("12k.png")))
-      assert_equal [], dummy.errors.keys
+      assert_equal [], error_attribute_names(dummy.errors)
     end
   end
 
-  context 'with no other validations on the Dummy#avatar attachment' do
+  context "with no other validations on the Dummy#avatar attachment" do
     before do
       reset_class("Dummy")
       Dummy.has_attached_file :avatar
       Paperclip.reset_duplicate_clash_check!
     end
 
-    it 'raises an error when no content_type validation exists' do
+    it "raises an error when no content_type validation exists" do
       assert_raises(Paperclip::Errors::MissingRequiredValidatorError) do
         Dummy.new(avatar: File.new(fixture_file("12k.png")))
       end
     end
 
-    it 'does not raise an error when a content_type validation exists' do
+    it "does not raise an error when a content_type validation exists" do
       Dummy.validates_attachment :avatar, content_type: { content_type: "image/jpeg" }
 
       assert_nothing_raised do
@@ -123,18 +138,18 @@ describe Paperclip::Validators do
       end
     end
 
-    it 'does not raise an error when a content_type validation exists using validates_with' do
-      Dummy.validates_with Paperclip::Validators::AttachmentContentTypeValidator, attributes: :attachment, content_type: 'images/jpeg'
+    it "does not raise an error when a content_type validation exists using validates_with" do
+      Dummy.validates_with Paperclip::Validators::AttachmentContentTypeValidator, attributes: :attachment, content_type: "images/jpeg"
 
       assert_nothing_raised do
         Dummy.new(avatar: File.new(fixture_file("12k.png")))
       end
     end
 
-    it 'does not raise an error when an inherited validator is used' do
+    it "does not raise an error when an inherited validator is used" do
       class MyValidator < Paperclip::Validators::AttachmentContentTypeValidator
         def initialize(options)
-          options[:content_type] = "images/jpeg" unless options.has_key?(:content_type)
+          options[:content_type] = "images/jpeg" unless options.key?(:content_type)
           super
         end
       end
@@ -145,7 +160,7 @@ describe Paperclip::Validators do
       end
     end
 
-    it 'does not raise an error when a file_name validation exists' do
+    it "does not raise an error when a file_name validation exists" do
       Dummy.validates_attachment :avatar, file_name: { matches: /png$/ }
 
       assert_nothing_raised do
@@ -153,7 +168,7 @@ describe Paperclip::Validators do
       end
     end
 
-    it 'does not raise an error when a the validation has been explicitly rejected' do
+    it "does not raise an error when a the validation has been explicitly rejected" do
       Dummy.validates_attachment :avatar, file_type_ignorance: true
 
       assert_nothing_raised do

data/spec/spec_helper.rb

@@ -1,36 +1,35 @@
-require 'rubygems'
-require 'rspec'
-require 'active_record'
-require 'active_record/version'
-require 'active_support'
-require 'active_support/core_ext'
-require 'mocha/api'
-require 'bourne'
-require 'ostruct'
-require 'pathname'
-require 'activerecord-import'
-
-ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
+require "rubygems"
+require "rspec"
+require "active_record"
+require "active_record/version"
+require "active_support"
+require "active_support/core_ext"
+require "ostruct"
+require "pathname"
+require "activerecord-import"
+require "yaml"
+
+ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), "..")))
 
 puts "Testing against version #{ActiveRecord::VERSION::STRING}"
 
-$LOAD_PATH << File.join(ROOT, 'lib')
-$LOAD_PATH << File.join(ROOT, 'lib', 'paperclip')
-require File.join(ROOT, 'lib', 'paperclip.rb')
+$LOAD_PATH << File.join(ROOT, "lib")
+$LOAD_PATH << File.join(ROOT, "lib", "paperclip")
+require File.join(ROOT, "lib", "paperclip.rb")
 
 FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+config = YAML::safe_load(IO.read(File.dirname(__FILE__) + "/database.yml"))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config['test'])
+ActiveRecord::Base.establish_connection(config["test"])
 if ActiveRecord::VERSION::STRING >= "4.2" &&
-    ActiveRecord::VERSION::STRING < "5.0"
+   ActiveRecord::VERSION::STRING < "5.0"
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 Paperclip.options[:logger] = ActiveRecord::Base.logger
 
-Dir[File.join(ROOT, 'spec', 'support', '**', '*.rb')].each{|f| require f }
+Dir[File.join(ROOT, "spec", "support", "**", "*.rb")].each { |f| require f }
 
-Rails = FakeRails.new('test', Pathname.new(ROOT).join('tmp'))
+Rails = FakeRails.new("test", Pathname.new(ROOT).join("tmp"))
 ActiveSupport::Deprecation.silenced = true
 
 RSpec.configure do |config|
@@ -39,8 +38,7 @@ RSpec.configure do |config|
   config.include TestData
   config.include Reporting
   config.extend VersionHelper
-  config.extend ConditionalFilterHelper
-  config.mock_framework = :mocha
+
   config.before(:all) do
     rebuild_model
   end

data/spec/support/assertions.rb

@@ -51,8 +51,8 @@ module Assertions
     url = "http:#{url}" unless url =~ /http/
     Net::HTTP.get_response(URI.parse(url)) do |response|
       assert_equal "200",
-        response.code,
-        "Expected HTTP response code 200, got #{response.code}"
+                   response.code,
+                   "Expected HTTP response code 200, got #{response.code}"
     end
   end
 
@@ -60,7 +60,7 @@ module Assertions
     url = "http:#{url}" unless url =~ /http/
     Net::HTTP.get_response(URI.parse(url)) do |response|
       assert_equal "404", response.code,
-        "Expected HTTP response code 404, got #{response.code}"
+                   "Expected HTTP response code 404, got #{response.code}"
     end
   end
 
@@ -68,14 +68,16 @@ module Assertions
     url = "http:#{url}" unless url =~ /http/
     Net::HTTP.get_response(URI.parse(url)) do |response|
       assert_equal "403", response.code,
-        "Expected HTTP response code 403, got #{response.code}"
+                   "Expected HTTP response code 403, got #{response.code}"
     end
   end
 
   def assert_frame_dimensions(range, frames)
     frames.each_with_index do |frame, frame_index|
-      frame.split('x').each_with_index do |dimension, dimension_index |
-        assert range.include?(dimension.to_i), "Frame #{frame_index}[#{dimension_index}] should have been within #{range.inspect}, but was #{dimension}"
+      frame.split("x").each_with_index do |dimension, dimension_index|
+        assert range.include?(dimension.to_i),
+               "Frame #{frame_index}[#{dimension_index}] should have been within #{range.inspect},
+                but was #{dimension}"
       end
     end
   end

data/spec/support/fake_model.rb

@@ -12,8 +12,7 @@ class FakeModel
     @errors ||= []
   end
 
-  def run_paperclip_callbacks name, *args
-  end
+  def run_paperclip_callbacks(name, *args); end
 
   def valid?
     errors.empty?

data/spec/support/fake_rails.rb

@@ -6,7 +6,7 @@ class FakeRails
 
   attr_accessor :env, :root
 
-  def const_defined?(const)
+  def const_defined?(_const)
     false
   end
 end