aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-06 14:05:27 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-06 14:05:27 -0800
commitd467351149e80ff203c8d238542f324666421e23 (patch)
treeb4a436551348be5622245337be9c0b707bfc6d85 /actionpack/test
parentd1a4faf61f64e53797d13b7c2f150b94be94e916 (diff)
parent8d5c742df4d172c084a84013009b052eeb9551a6 (diff)
downloadrails-d467351149e80ff203c8d238542f324666421e23.tar.gz
rails-d467351149e80ff203c8d238542f324666421e23.tar.bz2
rails-d467351149e80ff203c8d238542f324666421e23.zip
Merge pull request #5309 from carlosantoniodasilva/ad-uploaded-file
Refactor ActionDispatch::UploadedFile
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/dispatch/uploaded_file_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb
index 0b95291e18..1e3f720fa7 100644
--- a/actionpack/test/dispatch/uploaded_file_test.rb
+++ b/actionpack/test/dispatch/uploaded_file_test.rb
@@ -12,7 +12,7 @@ module ActionDispatch
uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
assert_equal 'foo', uf.original_filename
end
-
+
def test_filename_should_be_in_utf_8
uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
assert_equal "UTF-8", uf.original_filename.encoding.to_s