test/geometry_test.rb in paperclip-3.0.2 vs test/geometry_test.rb in paperclip-3.0.3

@@ -99,19 +99,19 @@
       assert @geo = Paperclip::Geometry.parse("800x600")
       assert_equal "800x600", @geo.to_s
     end
 
     should "be generated from a file" do
-      file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
+      file = fixture_file("5k.png")
       file = File.new(file, 'rb')
       assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
       assert @geo.height > 0
       assert @geo.width > 0
     end
 
     should "be generated from a file path" do
-      file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
+      file = fixture_file("5k.png")
       assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
       assert @geo.height > 0
       assert @geo.width > 0
     end
 
@@ -139,10 +139,10 @@
     should "let us know when a command isn't found versus a processing error" do
       old_path = ENV['PATH']
       begin
         ENV['PATH'] = ''
         assert_raises(Paperclip::Errors::CommandNotFoundError) do
-          file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
+          file = fixture_file("5k.png")
           @geo = Paperclip::Geometry.from_file(file)
         end
       ensure
         ENV['PATH'] = old_path
       end