Using File.expand_path when comparing paths since 1.9 treats some as absolute

test/attachment_test.rb

@@ -487,9 +487,7 @@ class AttachmentTest < Test::Unit::TestCase
       rebuild_model
       rebuild_model
       @instance = Dummy.new
       @instance = Dummy.new
       @attachment = Paperclip::Attachment.new(:avatar, @instance)
       @attachment = Paperclip::Attachment.new(:avatar, @instance)
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
     end
     end
 
 
     teardown do
     teardown do
@@ -550,12 +548,12 @@ class AttachmentTest < Test::Unit::TestCase
       end
       end
 
 
       should "return the proper path when filename has a single .'s" do
       should "return the proper path when filename has a single .'s" do
-        assert_equal "./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.png", @attachment.path
+        assert_equal File.expand_path("./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.png"), File.expand_path(@attachment.path)
       end
       end
 
 
       should "return the proper path when filename has multiple .'s" do
       should "return the proper path when filename has multiple .'s" do
         @attachment.stubs(:instance_read).with(:file_name).returns("5k.old.png")
         @attachment.stubs(:instance_read).with(:file_name).returns("5k.old.png")
-        assert_equal "./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.old.png", @attachment.path
+        assert_equal File.expand_path("./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.old.png"), File.expand_path(@attachment.path)
       end
       end
 
 
       context "when expecting three styles" do
       context "when expecting three styles" do