Commit b48ec849 by Prem Sichanugrist

Fix test failure from earlier test path cleanup

parent 48736ce5
...@@ -808,7 +808,7 @@ class AttachmentTest < Test::Unit::TestCase ...@@ -808,7 +808,7 @@ class AttachmentTest < Test::Unit::TestCase
setup do setup do
@old_defaults = Paperclip::Attachment.default_options.dup @old_defaults = Paperclip::Attachment.default_options.dup
Paperclip::Attachment.default_options.merge!({ Paperclip::Attachment.default_options.merge!({
:path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension" :path => ":rails_root/:attachment/:class/:style/:id/:basename.:extension"
}) })
FileUtils.rm_rf("tmp") FileUtils.rm_rf("tmp")
rebuild_model rebuild_model
...@@ -845,7 +845,7 @@ class AttachmentTest < Test::Unit::TestCase ...@@ -845,7 +845,7 @@ class AttachmentTest < Test::Unit::TestCase
setup do setup do
@old_defaults = Paperclip::Attachment.default_options.dup @old_defaults = Paperclip::Attachment.default_options.dup
Paperclip::Attachment.default_options.merge!({ Paperclip::Attachment.default_options.merge!({
:path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension" :path => ":rails_root/:attachment/:class/:style/:id/:basename.:extension"
}) })
FileUtils.rm_rf("tmp") FileUtils.rm_rf("tmp")
rebuild_model rebuild_model
...@@ -893,12 +893,12 @@ class AttachmentTest < Test::Unit::TestCase ...@@ -893,12 +893,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 File.expand_path("./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.png"), File.expand_path(@attachment.path) assert_equal File.expand_path("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 File.expand_path("./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.old.png"), File.expand_path(@attachment.path) assert_equal File.expand_path("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
......
...@@ -31,7 +31,7 @@ class Test::Unit::TestCase ...@@ -31,7 +31,7 @@ class Test::Unit::TestCase
def setup def setup
silence_warnings do silence_warnings do
Object.const_set(:Rails, stub('Rails')) Object.const_set(:Rails, stub('Rails'))
Rails.stubs(:root).returns(File.join(ROOT, 'tmp')) Rails.stubs(:root).returns(Pathname.new(ROOT).join('tmp'))
Rails.stubs(:env).returns('test') Rails.stubs(:env).returns('test')
Rails.stubs(:const_defined?).with(:Railtie).returns(false) Rails.stubs(:const_defined?).with(:Railtie).returns(false)
end end
......
...@@ -19,11 +19,11 @@ class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase ...@@ -19,11 +19,11 @@ class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase
end end
should "enable to get and set path to registered styles file" do should "enable to get and set path to registered styles file" do
assert_equal ROOT.join('public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path assert_equal ROOT.join('tmp/public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
Paperclip.registered_attachments_styles_path = '/tmp/config/paperclip_attachments.yml' Paperclip.registered_attachments_styles_path = '/tmp/config/paperclip_attachments.yml'
assert_equal '/tmp/config/paperclip_attachments.yml', Paperclip.registered_attachments_styles_path assert_equal '/tmp/config/paperclip_attachments.yml', Paperclip.registered_attachments_styles_path
Paperclip.registered_attachments_styles_path = nil Paperclip.registered_attachments_styles_path = nil
assert_equal ROOT.join('public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path assert_equal ROOT.join('tmp/public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
end end
should "be able to get current attachment styles" do should "be able to get current attachment styles" do
...@@ -90,7 +90,5 @@ class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase ...@@ -90,7 +90,5 @@ class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase
rebuild_model :styles => lambda{ |attachment| attachment.instance.other == 'a' ? {:thumb => "50x50#"} : {:large => "400x400"} } rebuild_model :styles => lambda{ |attachment| attachment.instance.other == 'a' ? {:thumb => "50x50#"} : {:large => "400x400"} }
assert_equal Hash.new, Paperclip.send(:current_attachments_styles) assert_equal Hash.new, Paperclip.send(:current_attachments_styles)
end end
end end
end end
...@@ -62,7 +62,7 @@ class FogTest < Test::Unit::TestCase ...@@ -62,7 +62,7 @@ class FogTest < Test::Unit::TestCase
teardown { @file.close } teardown { @file.close }
should "be able to interpolate the path without blowing up" do should "be able to interpolate the path without blowing up" do
assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../../public/avatars/5k.png")), assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../../tmp/public/avatars/5k.png")),
@dummy.avatar.path @dummy.avatar.path
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment