Download as
Browse Code »

Commit 37567521ad7d33cd1c919d28e4377cde35fa3506

Authored by Rodrigo Souto
1 parent 2f8f08e9
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

uploaded_file: not overwrite name with filename if it is already set

Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/models/uploaded_file.rb
  Diff comments   View file @3756752
@@ -102,7 +102,7 @@ class UploadedFile < Article @@ -102,7 +102,7 @@ class UploadedFile < Article
102 alias :orig_set_filename :filename= 102 alias :orig_set_filename :filename=
103 def filename=(value) 103 def filename=(value)
104 orig_set_filename(value) 104 orig_set_filename(value)
105 - self.name = self.filename 105 + self.name ||= self.filename
106 end 106 end
107 107
108 def download_headers 108 def download_headers
test/unit/uploaded_file_test.rb
  Diff comments   View file @3756752
@@ -31,6 +31,13 @@ class UploadedFileTest < ActiveSupport::TestCase @@ -31,6 +31,13 @@ class UploadedFileTest < ActiveSupport::TestCase
31 assert_equal 'test.txt', file.name 31 assert_equal 'test.txt', file.name
32 end 32 end
33 33
  34 + should 'not set filename on name if name is already set' do
  35 + file = UploadedFile.new
  36 + file.name = "Some name"
  37 + file.filename = 'test.txt'
  38 + assert_equal 'Some name', file.name
  39 + end
  40 +
34 should 'provide file content as data' do 41 should 'provide file content as data' do
35 file = UploadedFile.new 42 file = UploadedFile.new
36 file.expects(:full_filename).returns('myfilename') 43 file.expects(:full_filename).returns('myfilename')