From 8ef58efec7247a2e1b7728340e11d4044ace4123 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Tue, 21 Jan 2014 12:47:39 -0300 Subject: [PATCH] rails3: fix slideshow_block_test --- app/models/slideshow_block.rb | 2 +- test/unit/slideshow_block_test.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/slideshow_block.rb b/app/models/slideshow_block.rb index 7c8a907..6305693 100644 --- a/app/models/slideshow_block.rb +++ b/app/models/slideshow_block.rb @@ -20,7 +20,7 @@ class SlideshowBlock < Block def check_filename(image, size) filename = image.public_filename(size) - if File.exists?(Rails.root.join('public', filename)) + if File.exists?(File.join(Rails.root.join('public').to_s, filename)) filename else nil diff --git a/test/unit/slideshow_block_test.rb b/test/unit/slideshow_block_test.rb index 74a6b60..b8f3d39 100644 --- a/test/unit/slideshow_block_test.rb +++ b/test/unit/slideshow_block_test.rb @@ -75,7 +75,7 @@ class SlideshowBlockTest < ActiveSupport::TestCase should 'decide correct public filename for image' do image = mock image.expects(:public_filename).with('slideshow').returns('/bli/slideshow.png') - File.expects(:exists?).with(Rails.root.join('public', 'bli', 'slideshow.png')).returns(true) + File.expects(:exists?).with(Rails.root.join('public', 'bli', 'slideshow.png').to_s).returns(true) assert_equal '/bli/slideshow.png', build(SlideshowBlock, :image_size => 'slideshow').public_filename_for(image) end @@ -83,7 +83,7 @@ class SlideshowBlockTest < ActiveSupport::TestCase should 'display the default slideshow image if thumbnails were not processed' do image = mock image.expects(:public_filename).with('slideshow').returns('/images/icons-app/image-loading-slideshow.png') - File.expects(:exists?).with(Rails.root.join('public', 'images', 'icons-app', 'image-loading-slideshow.png')).returns(true) + File.expects(:exists?).with(Rails.root.join('public', 'images', 'icons-app', 'image-loading-slideshow.png').to_s).returns(true) assert_equal '/images/icons-app/image-loading-slideshow.png', build(SlideshowBlock, :image_size => 'slideshow').public_filename_for(image) end @@ -94,11 +94,11 @@ class SlideshowBlockTest < ActiveSupport::TestCase image = mock # "slideshow" size does not exist image.expects(:public_filename).with('slideshow').returns('/bli/slideshow.png') - File.expects(:exists?).with(Rails.root.join('public', 'bli', 'slideshow.png')).returns(false) # <<<<< + File.expects(:exists?).with(Rails.root.join('public', 'bli', 'slideshow.png').to_s).returns(false) # <<<<< # thumb size does exist image.expects(:public_filename).with('thumb').returns('/bli/thumb.png') - File.expects(:exists?).with(Rails.root.join('public', 'bli', 'thumb.png')).returns(true) # <<<<< + File.expects(:exists?).with(Rails.root.join('public', 'bli', 'thumb.png').to_s).returns(true) # <<<<< assert_equal '/bli/thumb.png', block.public_filename_for(image) end -- libgit2 0.21.2