From c82d3272c1ef371a91ca6bfac0b66a49986cf3f4 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Tue, 17 Sep 2013 23:42:50 +0000 Subject: [PATCH] rails3: fix image test --- test/unit/image_test.rb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/unit/image_test.rb b/test/unit/image_test.rb index 59c52c1..78b2bb1 100644 --- a/test/unit/image_test.rb +++ b/test/unit/image_test.rb @@ -15,14 +15,14 @@ class ImageTest < ActiveSupport::TestCase end should 'match max_size in validates message of size field' do - image = Image.new(:filename => 'fake_filename.png') + image = build(Image, :filename => 'fake_filename.png') image.valid? - assert_match /#{Image.max_size.to_humanreadable}/, image.errors[:size] + assert_match /#{Image.max_size.to_humanreadable}/, image.errors[:size].first end should 'create thumbnails after processing jobs' do - file = Image.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) + file = create(Image, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) profile.update_attribute(:image_id, file.id) process_delayed_job_queue @@ -33,7 +33,7 @@ class ImageTest < ActiveSupport::TestCase end should 'set thumbnails_processed to true after creating thumbnails' do - file = Image.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) + file = create(Image, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) profile.update_attribute(:image_id, file.id) process_delayed_job_queue @@ -64,7 +64,7 @@ class ImageTest < ActiveSupport::TestCase end should 'return image thumbnail if thumbnails were processed' do - file = Image.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) + file = create(Image, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) profile.update_attribute(:image_id, file.id) process_delayed_job_queue @@ -74,7 +74,7 @@ class ImageTest < ActiveSupport::TestCase end should 'store width and height after processing' do - file = Image.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) + file = create(Image, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) profile.update_attribute(:image_id, file.id) file.create_thumbnails @@ -84,24 +84,24 @@ class ImageTest < ActiveSupport::TestCase should 'have a loading image to each size of thumbnails' do Image.attachment_options[:thumbnails].each do |suffix, size| - image = Rails.root + '/public/images/icons-app/image-loading-%s.png' % suffix - assert File.exists?(image) + image = File.join(Rails.root, "public/images/icons-app/image-loading-#{suffix}.png") + assert File.exists?(image), "#{image} should exist." end end - should 'not create a background job for an image that is already a thumbnail' do + should 'not create a background job for an image that is not thumbnailable' do # this test verifies whether it created background jobs also for the # thumbnails! assert_no_difference Delayed::Job, :count do - image = Image.new(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) - image.stubs(:is_thumbnail?).returns(true) + image = build(Image, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) + image.stubs(:thumbnailable?).returns(false) image.save! end end should 'upload to a folder with same name as the schema if database is postgresql' do uses_postgresql - file = Image.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) + file = create(Image, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) profile.update_attribute(:image_id, file.id) process_delayed_job_queue assert_match(/images\/test_schema\/\d{4}\/\d{4}\/rails.png/, Image.find(file.id).public_filename) @@ -111,7 +111,7 @@ class ImageTest < ActiveSupport::TestCase should 'upload to path prefix folder if database is not postgresql' do uses_sqlite - file = Image.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) + file = create(Image, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) profile.update_attribute(:image_id, file.id) process_delayed_job_queue assert_match(/images\/\d{4}\/\d{4}\/rails.png/, Image.find(file.id).public_filename) @@ -119,7 +119,7 @@ class ImageTest < ActiveSupport::TestCase end should 'not allow script files to be uploaded without append .txt in the end' do - file = Image.create!(:uploaded_data => fixture_file_upload('files/hello_world.php', 'image/png')) + file = create(Image, :uploaded_data => fixture_file_upload('files/hello_world.php', 'image/png')) assert_equal 'hello_world.php.txt', file.filename end -- libgit2 0.21.2