Permalink
Browse files

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

…absolute
  • Loading branch information...
qrush committed Jun 30, 2009
1 parent 4f68461 commit 8a40d68c92e136c3ad8d2157fa4ecbc813136780
Showing with 8 additions and 10 deletions.
  1. +8 −10 test/attachment_test.rb
View
@@ -487,12 +487,10 @@ def do_after_all; end
rebuild_model
@instance = Dummy.new
@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
- teardown do
+ teardown do
@file.close
Paperclip::Attachment.default_options.merge!(@old_defaults)
end
@@ -509,13 +507,13 @@ def do_after_all; end
assert_equal "/avatars/original/missing.png", @attachment.url
assert_equal "/avatars/blah/missing.png", @attachment.url(:blah)
end
-
+
should "return nil as path when no file assigned" do
assert @attachment.to_file.nil?
assert_equal nil, @attachment.path
assert_equal nil, @attachment.path(:blah)
end
-
+
context "with a file assigned in the database" do
setup do
@attachment.stubs(:instance_read).with(:file_name).returns("5k.png")
@@ -534,7 +532,7 @@ def do_after_all; end
should "make sure the updated_at mtime is in the url if it is defined" do
assert_match %r{#{Time.now.to_i}$}, @attachment.url(:blah)
end
-
+
should "make sure the updated_at mtime is NOT in the url if false is passed to the url method" do
assert_no_match %r{#{Time.now.to_i}$}, @attachment.url(:blah, false)
end
@@ -550,12 +548,12 @@ def do_after_all; end
end
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
should "return the proper path when filename has multiple .'s" do
- @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
+ @attachment.stubs(:instance_read).with(:file_name).returns("5k.old.png")
+ assert_equal File.expand_path("./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.old.png"), File.expand_path(@attachment.path)
end
context "when expecting three styles" do

0 comments on commit 8a40d68

Please sign in to comment.