diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb index bd3c42f..6cbd8f3 100644 --- a/app/models/uploaded_file.rb +++ b/app/models/uploaded_file.rb @@ -102,7 +102,7 @@ class UploadedFile < Article alias :orig_set_filename :filename= def filename=(value) orig_set_filename(value) - self.name = self.filename + self.name ||= self.filename end def download_headers diff --git a/test/unit/uploaded_file_test.rb b/test/unit/uploaded_file_test.rb index 160e7ab..f2fdf9c 100644 --- a/test/unit/uploaded_file_test.rb +++ b/test/unit/uploaded_file_test.rb @@ -31,6 +31,13 @@ class UploadedFileTest < ActiveSupport::TestCase assert_equal 'test.txt', file.name end + should 'not set filename on name if name is already set' do + file = UploadedFile.new + file.name = "Some name" + file.filename = 'test.txt' + assert_equal 'Some name', file.name + end + should 'provide file content as data' do file = UploadedFile.new file.expects(:full_filename).returns('myfilename') -- libgit2 0.21.2