From 4c7a3b1946515819a7a45b512ab0b964d3991268 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Mon, 11 May 2009 21:54:49 -0300 Subject: [PATCH] ActionItem1022: don't resize images anymore. --- app/models/uploaded_file.rb | 3 +-- test/unit/uploaded_file_test.rb | 25 ------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb index beda221..50a033e 100644 --- a/app/models/uploaded_file.rb +++ b/app/models/uploaded_file.rb @@ -12,8 +12,7 @@ class UploadedFile < Article has_attachment :storage => :file_system, :thumbnails => { :icon => [24,24], :thumb => '130x130>' }, :thumbnail_class => Thumbnail, - :max_size => 5.megabytes, - :resize_to => '640x480>' + :max_size => 5.megabytes def self.max_size UploadedFile.attachment_options[:max_size] diff --git a/test/unit/uploaded_file_test.rb b/test/unit/uploaded_file_test.rb index 95d5251..f094bed 100644 --- a/test/unit/uploaded_file_test.rb +++ b/test/unit/uploaded_file_test.rb @@ -102,29 +102,4 @@ class UploadedFileTest < Test::Unit::TestCase file.destroy end - should 'resize images bigger than in resize_to' do - fixture_filename = '/files/test-large-pic.jpg' - filename = RAILS_ROOT + '/test/fixtures' + fixture_filename - system('echo "image for test" | convert -background yellow -page 1280x960 text:- %s' % filename) - - f = UploadedFile.create(:profile => @profile, :uploaded_data => fixture_file_upload(fixture_filename, 'image/jpg')) - - assert_equal [640, 480], [f.width, f.height] - - File.rm_f(filename) - end - - should 'resize images on folder bigger than in resize_to' do - fixture_filename = '/files/test-large-pic.jpg' - filename = RAILS_ROOT + '/test/fixtures' + fixture_filename - system('echo "image for test" | convert -background yellow -page 1280x960 text:- %s' % filename) - f = Folder.create!(:name => 'test_folder', :profile => @profile) - - file = UploadedFile.create(:profile => @profile, :uploaded_data => fixture_file_upload(fixture_filename, 'image/jpg'), :parent_id => f.id) - - assert_equal [640, 480], [file.width, file.height] - - File.rm_f(filename) - end - end -- libgit2 0.21.2