kt-paperclip 5.4.0 → 7.1.1

data/spec/paperclip/content_type_detector_spec.rb

@@ -1,31 +1,37 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::ContentTypeDetector do
-  it 'returns a meaningful content type for open xml spreadsheets' do
+  it "returns a meaningful content type for open xml spreadsheets" do
     file = File.new(fixture_file("empty.xlsx"))
     assert_equal "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
                  Paperclip::ContentTypeDetector.new(file.path).detect
   end
 
-  it 'gives a sensible default when the name is empty' do
+  it 'returns a more specific content type based on the filename if it matches
+      multiple content types' do
+    file = File.new(fixture_file('sample.xlsm'))
+    assert_equal 'application/vnd.ms-excel.sheet.macroenabled.12',
+                 Paperclip::ContentTypeDetector.new(file.path).detect
+  end
+
+  it "gives a sensible default when the name is empty" do
     assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new("").detect
   end
 
-  it 'returns the empty content type when the file is empty' do
+  it "returns the empty content type when the file is empty" do
     tempfile = Tempfile.new("empty")
     assert_equal "inode/x-empty", Paperclip::ContentTypeDetector.new(tempfile.path).detect
     tempfile.close
   end
 
-  it 'returns content type of file if it is an acceptable type' do
-    MIME::Types.stubs(:type_for).returns([MIME::Type.new('application/mp4'), MIME::Type.new('video/mp4'), MIME::Type.new('audio/mp4')])
-    Paperclip::ContentTypeDetector.any_instance
-      .stubs(:type_from_file_contents).returns("video/mp4")
+  it "returns content type of file if it is an acceptable type" do
+    allow(MIME::Types).to receive(:type_for).and_return([MIME::Type.new("application/mp4"), MIME::Type.new("video/mp4"), MIME::Type.new("audio/mp4")])
+    allow_any_instance_of(Paperclip::ContentTypeDetector).to receive(:type_from_file_contents).and_return("video/mp4")
     @filename = "my_file.mp4"
     assert_equal "video/mp4", Paperclip::ContentTypeDetector.new(@filename).detect
   end
 
-  it 'finds the right type in the list via the file command' do
+  it "finds the right type in the list via the file command" do
     @filename = "#{Dir.tmpdir}/something.hahalolnotreal"
     File.open(@filename, "w+") do |file|
       file.puts "This is a text file."
@@ -35,13 +41,13 @@ describe Paperclip::ContentTypeDetector do
     FileUtils.rm @filename
   end
 
-  it 'returns a sensible default if something is wrong, like the file is gone' do
+  it "returns a sensible default if something is wrong, like the file is gone" do
     @filename = "/path/to/nothing"
     assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new(@filename).detect
   end
 
-  it 'returns a sensible default when the file command is missing' do
-    Paperclip.stubs(:run).raises(Terrapin::CommandLineError.new)
+  it "returns a sensible default when the file command is missing" do
+    allow(Paperclip).to receive(:run).and_raise(Terrapin::CommandLineError.new)
     @filename = "/path/to/something"
     assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new(@filename).detect
   end

data/spec/paperclip/file_command_content_type_detector_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::FileCommandContentTypeDetector do
-  it 'returns a content type based on the content of the file' do
+  it "returns a content type based on the content of the file" do
     tempfile = Tempfile.new("something")
     tempfile.write("This is a file.")
     tempfile.rewind
@@ -11,29 +11,29 @@ describe Paperclip::FileCommandContentTypeDetector do
     tempfile.close
   end
 
-  it 'returns a sensible default when the file command is missing' do
-    Paperclip.stubs(:run).raises(Terrapin::CommandLineError.new)
+  it "returns a sensible default when the file command is missing" do
+    allow(Paperclip).to receive(:run).and_raise(Terrapin::CommandLineError.new)
     @filename = "/path/to/something"
     assert_equal "application/octet-stream",
-      Paperclip::FileCommandContentTypeDetector.new(@filename).detect
+                 Paperclip::FileCommandContentTypeDetector.new(@filename).detect
   end
 
-  it 'returns a sensible default on the odd chance that run returns nil' do
-    Paperclip.stubs(:run).returns(nil)
+  it "returns a sensible default on the odd chance that run returns nil" do
+    allow(Paperclip).to receive(:run).and_return(nil)
     assert_equal "application/octet-stream",
-      Paperclip::FileCommandContentTypeDetector.new("windows").detect
+                 Paperclip::FileCommandContentTypeDetector.new("windows").detect
   end
 
   context "#type_from_file_command" do
     let(:detector) { Paperclip::FileCommandContentTypeDetector.new("html") }
 
     it "does work with the output of old versions of file" do
-      Paperclip.stubs(:run).returns("text/html charset=us-ascii")
+      allow(Paperclip).to receive(:run).and_return("text/html charset=us-ascii")
       expect(detector.detect).to eq("text/html")
     end
 
     it "does work with the output of new versions of file" do
-      Paperclip.stubs(:run).returns("text/html; charset=us-ascii")
+      allow(Paperclip).to receive(:run).and_return("text/html; charset=us-ascii")
       expect(detector.detect).to eq("text/html")
     end
   end

data/spec/paperclip/filename_cleaner_spec.rb

@@ -1,13 +1,12 @@
-# encoding: utf-8
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::FilenameCleaner do
-  it 'converts invalid characters to underscores' do
+  it "converts invalid characters to underscores" do
     cleaner = Paperclip::FilenameCleaner.new(/[aeiou]/)
     expect(cleaner.call("baseball")).to eq "b_s_b_ll"
   end
 
-  it 'does not convert anything if the character regex is nil' do
+  it "does not convert anything if the character regex is nil" do
     cleaner = Paperclip::FilenameCleaner.new(nil)
     expect(cleaner.call("baseball")).to eq "baseball"
   end

data/spec/paperclip/geometry_detector_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::GeometryDetector do
-  it 'identifies an image and extract its dimensions' do
-    Paperclip::GeometryParser.stubs(:new).with("434x66,").returns(stub(make: :correct))
+  it "identifies an image and extract its dimensions" do
+    allow_any_instance_of(Paperclip::GeometryParser).to receive(:make).and_return(:correct)
     file = fixture_file("5k.png")
     factory = Paperclip::GeometryDetector.new(file)
 
@@ -11,8 +11,8 @@ describe Paperclip::GeometryDetector do
     expect(output).to eq :correct
   end
 
-  it 'identifies an image and extract its dimensions and orientation' do
-    Paperclip::GeometryParser.stubs(:new).with("300x200,6").returns(stub(make: :correct))
+  it "identifies an image and extract its dimensions and orientation" do
+    allow_any_instance_of(Paperclip::GeometryParser).to receive(:make).and_return(:correct)
     file = fixture_file("rotated.jpg")
     factory = Paperclip::GeometryDetector.new(file)
 
@@ -21,10 +21,10 @@ describe Paperclip::GeometryDetector do
     expect(output).to eq :correct
   end
 
-  it 'avoids reading EXIF orientation if so configured' do
+  it "avoids reading EXIF orientation if so configured" do
     begin
       Paperclip.options[:use_exif_orientation] = false
-      Paperclip::GeometryParser.stubs(:new).with("300x200,1").returns(stub(make: :correct))
+      allow_any_instance_of(Paperclip::GeometryParser).to receive(:make).and_return(:correct)
       file = fixture_file("rotated.jpg")
       factory = Paperclip::GeometryDetector.new(file)
 
@@ -36,4 +36,3 @@ describe Paperclip::GeometryDetector do
     end
   end
 end
-

data/spec/paperclip/geometry_parser_spec.rb

@@ -1,13 +1,13 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::GeometryParser do
-  it 'identifies an image and extract its dimensions with no orientation' do
-    Paperclip::Geometry.stubs(:new).with(
-      height: '73',
-      width: '434',
+  it "identifies an image and extract its dimensions with no orientation" do
+    allow(Paperclip::Geometry).to receive(:new).with(
+      height: "73",
+      width: "434",
       modifier: nil,
       orientation: nil
-    ).returns(:correct)
+    ).and_return(:correct)
     factory = Paperclip::GeometryParser.new("434x73")
 
     output = factory.make
@@ -15,13 +15,13 @@ describe Paperclip::GeometryParser do
     assert_equal :correct, output
   end
 
-  it 'identifies an image and extract its dimensions with an empty orientation' do
-    Paperclip::Geometry.stubs(:new).with(
-      height: '73',
-      width: '434',
+  it "identifies an image and extract its dimensions with an empty orientation" do
+    allow(Paperclip::Geometry).to receive(:new).with(
+      height: "73",
+      width: "434",
       modifier: nil,
-      orientation: ''
-    ).returns(:correct)
+      orientation: ""
+    ).and_return(:correct)
     factory = Paperclip::GeometryParser.new("434x73,")
 
     output = factory.make
@@ -29,13 +29,13 @@ describe Paperclip::GeometryParser do
     assert_equal :correct, output
   end
 
-  it 'identifies an image and extract its dimensions and orientation' do
-    Paperclip::Geometry.stubs(:new).with(
-      height: '200',
-      width: '300',
+  it "identifies an image and extract its dimensions and orientation" do
+    allow(Paperclip::Geometry).to receive(:new).with(
+      height: "200",
+      width: "300",
       modifier: nil,
-      orientation: '6'
-    ).returns(:correct)
+      orientation: "6"
+    ).and_return(:correct)
     factory = Paperclip::GeometryParser.new("300x200,6")
 
     output = factory.make
@@ -43,13 +43,13 @@ describe Paperclip::GeometryParser do
     assert_equal :correct, output
   end
 
-  it 'identifies an image and extract its dimensions and modifier' do
-    Paperclip::Geometry.stubs(:new).with(
-      height: '64',
-      width: '64',
-      modifier: '#',
+  it "identifies an image and extract its dimensions and modifier" do
+    allow(Paperclip::Geometry).to receive(:new).with(
+      height: "64",
+      width: "64",
+      modifier: "#",
       orientation: nil
-    ).returns(:correct)
+    ).and_return(:correct)
     factory = Paperclip::GeometryParser.new("64x64#")
 
     output = factory.make
@@ -57,13 +57,13 @@ describe Paperclip::GeometryParser do
     assert_equal :correct, output
   end
 
-  it 'identifies an image and extract its dimensions, orientation, and modifier' do
-    Paperclip::Geometry.stubs(:new).with(
-      height: '50',
-      width: '100',
-      modifier: '>',
-      orientation: '7'
-    ).returns(:correct)
+  it "identifies an image and extract its dimensions, orientation, and modifier" do
+    allow(Paperclip::Geometry).to receive(:new).with(
+      height: "50",
+      width: "100",
+      modifier: ">",
+      orientation: "7"
+    ).and_return(:correct)
     factory = Paperclip::GeometryParser.new("100x50,7>")
 
     output = factory.make

data/spec/paperclip/geometry_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::Geometry do
   context "Paperclip::Geometry" do
@@ -82,7 +82,7 @@ describe Paperclip::Geometry do
       assert_equal 456, @upper.height
     end
 
-    ['>', '<', '#', '@', '@>', '>@', '%', '^', '!', nil].each do |mod|
+    [">", "<", "#", "@", "@>", ">@", "%", "^", "!", nil].each do |mod|
       it "ensures the modifier #{description} is preserved" do
         assert @geo = Paperclip::Geometry.parse("123x456#{mod}")
         assert_equal mod, @geo.modifier
@@ -124,22 +124,22 @@ describe Paperclip::Geometry do
 
     it "is generated from a file" do
       file = fixture_file("5k.png")
-      file = File.new(file, 'rb')
-      assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
+      file = File.new(file, "rb")
+      assert_nothing_raised { @geo = Paperclip::Geometry.from_file(file) }
       assert_equal 66, @geo.height
       assert_equal 434, @geo.width
     end
 
     it "is generated from a file path" do
       file = fixture_file("5k.png")
-      assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
+      assert_nothing_raised { @geo = Paperclip::Geometry.from_file(file) }
       assert_equal 66, @geo.height
       assert_equal 434, @geo.width
     end
 
-    it 'calculates an EXIF-rotated image dimensions from a path' do
+    it "calculates an EXIF-rotated image dimensions from a path" do
       file = fixture_file("rotated.jpg")
-      assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
+      assert_nothing_raised { @geo = Paperclip::Geometry.from_file(file) }
       @geo.auto_orient
       assert_equal 300, @geo.height
       assert_equal 200, @geo.width
@@ -161,41 +161,41 @@ describe Paperclip::Geometry do
     end
 
     it "does not generate from a file with no path" do
-      file = mock("file", path: "")
-      file.stubs(:respond_to?).with(:path).returns(true)
+      file = double("file", path: "")
+      allow(file).to receive(:respond_to?).with(:path).and_return(true)
       expect { @geo = Paperclip::Geometry.from_file(file) }.to raise_error(Paperclip::Errors::NotIdentifiedByImageMagickError)
     end
 
     it "lets us know when a command isn't found versus a processing error" do
-      old_path = ENV['PATH']
+      old_path = ENV["PATH"]
       begin
-        ENV['PATH'] = ''
+        ENV["PATH"] = ""
         assert_raises(Paperclip::Errors::CommandNotFoundError) do
           file = fixture_file("5k.png")
           @geo = Paperclip::Geometry.from_file(file)
         end
       ensure
-        ENV['PATH'] = old_path
+        ENV["PATH"] = old_path
       end
     end
 
-    [['vertical',   900,  1440, true,  false, false, 1440, 900, 0.625],
-     ['horizontal', 1024, 768,  false, true,  false, 1024, 768, 1.3333],
-     ['square',     100,  100,  false, false, true,  100,  100, 1]].each do |args|
+    [["vertical",   900,  1440, true,  false, false, 1440, 900, 0.625],
+     ["horizontal", 1024, 768,  false, true,  false, 1024, 768, 1.3333],
+     ["square",     100,  100,  false, false, true,  100,  100, 1]].each do |args|
       context "performing calculations on a #{args[0]} viewport" do
         before do
           @geo = Paperclip::Geometry.new(args[1], args[2])
         end
 
-        it "is #{args[3] ? "" : "not"} vertical" do
+        it "is #{args[3] ? '' : 'not'} vertical" do
           assert_equal args[3], @geo.vertical?
         end
 
-        it "is #{args[4] ? "" : "not"} horizontal" do
+        it "is #{args[4] ? '' : 'not'} horizontal" do
           assert_equal args[4], @geo.horizontal?
         end
 
-        it "is #{args[5] ? "" : "not"} square" do
+        it "is #{args[5] ? '' : 'not'} square" do
           assert_equal args[5], @geo.square?
         end
 
@@ -213,9 +213,9 @@ describe Paperclip::Geometry do
       end
     end
 
-    [[ [1000, 100], [64, 64],  "x64", "64x64+288+0" ],
-     [ [100, 1000], [50, 950], "x950", "50x950+22+0" ],
-     [ [100, 1000], [50, 25],  "50x", "50x25+0+237" ]]. each do |args|
+    [[[1000, 100], [64, 64],  "x64", "64x64+288+0"],
+     [[100, 1000], [50, 950], "x950", "50x950+22+0"],
+     [[100, 1000], [50, 25],  "50x", "50x25+0+237"]]. each do |args|
       context "of #{args[0].inspect} and given a Geometry #{args[1].inspect} and sent transform_to" do
         before do
           @geo = Paperclip::Geometry.new(*args[0])
@@ -233,9 +233,9 @@ describe Paperclip::Geometry do
       end
     end
 
-    [['256x256', {'150x150!' => [150, 150], '150x150#' => [150, 150], '150x150>' => [150, 150], '150x150<' => [256, 256], '150x150' => [150, 150]}],
-     ['256x256', {'512x512!' => [512, 512], '512x512#' => [512, 512], '512x512>' => [256, 256], '512x512<' => [512, 512], '512x512' => [512, 512]}],
-     ['600x400', {'512x512!' => [512, 512], '512x512#' => [512, 512], '512x512>' => [512, 341], '512x512<' => [600, 400], '512x512' => [512, 341]}]].each do |original_size, options|
+    [["256x256", { "150x150!" => [150, 150], "150x150#" => [150, 150], "150x150>" => [150, 150], "150x150<" => [256, 256], "150x150" => [150, 150] }],
+     ["256x256", { "512x512!" => [512, 512], "512x512#" => [512, 512], "512x512>" => [256, 256], "512x512<" => [512, 512], "512x512" => [512, 512] }],
+     ["600x400", { "512x512!" => [512, 512], "512x512#" => [512, 512], "512x512>" => [512, 341], "512x512<" => [600, 400], "512x512" => [512, 341] }]].each do |original_size, options|
       options.each_pair do |size, dimensions|
         context "#{original_size} resize_to #{size}" do
           before do

data/spec/paperclip/glue_spec.rb

@@ -14,7 +14,7 @@ describe Paperclip::Glue do
 
     it "does not fail" do
       NonActiveRecordModel = Class.new
-      NonActiveRecordModel.send :include, Paperclip::Glue
+      NonActiveRecordModel.include Paperclip::Glue
       Object.send :remove_const, "NonActiveRecordModel"
     end
   end
@@ -30,14 +30,12 @@ describe Paperclip::Glue do
     end
 
     after do
-      if @defined_active_record
-        Object.send :remove_const, "ActiveRecord"
-      end
+      Object.send :remove_const, "ActiveRecord" if @defined_active_record
     end
 
     it "does not fail" do
       NonActiveRecordModel = Class.new
-      NonActiveRecordModel.send :include, Paperclip::Glue
+      NonActiveRecordModel.include Paperclip::Glue
       Object.send :remove_const, "NonActiveRecordModel"
     end
   end

data/spec/paperclip/has_attached_file_spec.rb

@@ -1,158 +1,78 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::HasAttachedFile do
-  context '#define_on' do
-    it 'defines a setter on the class object' do
-      assert_adding_attachment('avatar').defines_method('avatar=')
-    end
-
-    it 'defines a getter on the class object' do
-      assert_adding_attachment('avatar').defines_method('avatar')
-    end
-
-    it 'defines a query on the class object' do
-      assert_adding_attachment('avatar').defines_method('avatar?')
-    end
+  let(:a_class) { spy("Class") }
 
-    it 'defines a method on the class to get all of its attachments' do
-      assert_adding_attachment('avatar').defines_class_method('attachment_definitions')
+  context "#define_on" do
+    it "defines a setter on the class object" do
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", {})
+      expect(a_class).to have_received(:define_method).with("avatar=")
     end
 
-    it 'flushes errors as part of validations' do
-      assert_adding_attachment('avatar').defines_validation
+    it "defines a getter on the class object" do
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", {})
+      expect(a_class).to have_received(:define_method).with("avatar")
     end
 
-    it 'registers the attachment with Paperclip::AttachmentRegistry' do
-      assert_adding_attachment('avatar').registers_attachment
+    it "defines a query on the class object" do
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", {})
+      expect(a_class).to have_received(:define_method).with("avatar?")
     end
 
-    it 'defines an after_save callback' do
-      assert_adding_attachment('avatar').defines_callback('after_save')
+    it "defines a method on the class to get all of its attachments" do
+      allow(a_class).to receive(:extend)
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", {})
+      expect(a_class).to have_received(:extend).with(Paperclip::HasAttachedFile::ClassMethods)
     end
 
-    it 'defines a before_destroy callback' do
-      assert_adding_attachment('avatar').defines_callback('before_destroy')
+    it "flushes errors as part of validations" do
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", {})
+      expect(a_class).to have_received(:validates_each).with("avatar")
     end
 
-    it 'defines an after_commit callback' do
-      assert_adding_attachment('avatar').defines_callback('after_commit')
+    it "registers the attachment with Paperclip::AttachmentRegistry" do
+      allow(Paperclip::AttachmentRegistry).to receive(:register)
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", size: 1)
+      expect(Paperclip::AttachmentRegistry).to have_received(:register).with(a_class, "avatar", size: 1)
     end
 
-    context 'when the class does not allow after_commit callbacks' do
-      it 'defines an after_destroy callback' do
-        assert_adding_attachment(
-          'avatar',
-          unstub_methods: [:after_commit]
-        ).defines_callback('after_destroy')
-      end
+    it "defines an after_save callback" do
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", {})
+      expect(a_class).to have_received("after_save")
     end
 
-    it 'defines the Paperclip-specific callbacks' do
-      assert_adding_attachment('avatar').defines_callback('define_paperclip_callbacks')
+    it "defines a before_destroy callback" do
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", {})
+      expect(a_class).to have_received("before_destroy")
     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
+    it "defines an after_commit callback" do
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", {})
+      expect(a_class).to have_received("after_commit")
     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
-
-  def assert_adding_attachment(attachment_name, options={})
-    AttachmentAdder.new(attachment_name, options)
-  end
-
-  class AttachmentAdder
-    include Mocha::API
-    include RSpec::Matchers
-
-    def initialize(attachment_name, options = {})
-      @attachment_name = attachment_name
-      @stubbed_class = stub_class
-      if options.present?
-        options[:unstub_methods].each do |method|
-          @stubbed_class.unstub(method)
-        end
+    context "when the class does not allow after_commit callbacks" do
+      it "defines an after_destroy callback" do
+        a_class = double("class", after_destroy: nil, validates_each: nil, define_method: nil, after_save: nil, before_destroy: nil, define_paperclip_callbacks: nil, validates_media_type_spoof_detection: nil)
+        Paperclip::HasAttachedFile.define_on(a_class, "avatar", {})
+        expect(a_class).to have_received("after_destroy")
       end
     end
 
-    def defines_method(method_name)
-      a_class = @stubbed_class
-
-      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
-
-      expect(a_class).to have_received(:define_method).with(method_name)
-    end
-
-    def defines_class_method(method_name)
-      a_class = @stubbed_class
-      a_class.class.stubs(:define_method)
-
-      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
-
-      expect(a_class).to have_received(:extend).with(Paperclip::HasAttachedFile::ClassMethods)
-    end
-
-    def defines_validation
-      a_class = @stubbed_class
-
-      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
-
-      expect(a_class).to have_received(:validates_each).with(@attachment_name)
-    end
-
-    def registers_attachment
-      a_class = @stubbed_class
-      Paperclip::AttachmentRegistry.stubs(:register)
-
-      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {size: 1})
-
-      expect(Paperclip::AttachmentRegistry).to have_received(:register).with(a_class, @attachment_name, {size: 1})
-    end
-
-    def defines_callback(callback_name)
-      a_class = @stubbed_class
-
-      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
-
-      expect(a_class).to have_received(callback_name.to_sym)
+    it "defines the Paperclip-specific callbacks" do
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", validate_media_type: false)
+      expect(a_class).to_not have_received(:validates_media_type_spoof_detection)
+      expect(a_class).to have_received("define_paperclip_callbacks")
     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
+    it "does not define a media_type check if told not to" do
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", validate_media_type: false)
+      expect(a_class).to_not have_received(:validates_media_type_spoof_detection)
     end
 
-    def sets_up_media_type_check_validation
-      a_class = stub_class
-
-      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, { validate_media_type: true })
-
+    it "does define a media_type check if told to" do
+      Paperclip::HasAttachedFile.define_on(a_class, "avatar", validate_media_type: true)
       expect(a_class).to have_received(:validates_media_type_spoof_detection)
     end
-
-    private
-
-    def stub_class
-      stub('class',
-           validates_each: nil,
-           define_method: nil,
-           after_save: nil,
-           before_destroy: nil,
-           after_commit: nil,
-           after_destroy: nil,
-           define_paperclip_callbacks: nil,
-           extend: nil,
-           name: 'Billy',
-           validates_media_type_spoof_detection: nil
-          )
-    end
   end
 end