aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/uploaded_file_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-07-16 11:35:27 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-07-16 11:35:27 -0700
commit90f0cdc906fcec77937363c87cba45f3802ac858 (patch)
treeb8988f8aa31734bc7256ea893fe4c067e7d4f111 /actionpack/test/dispatch/uploaded_file_test.rb
parenta00f547d2b83f95d169050a2b25afa196d0a9205 (diff)
downloadrails-90f0cdc906fcec77937363c87cba45f3802ac858.tar.gz
rails-90f0cdc906fcec77937363c87cba45f3802ac858.tar.bz2
rails-90f0cdc906fcec77937363c87cba45f3802ac858.zip
always transcode the file to utf-8
people may be passing filenames to the constructor that are not utf-8, but they will assome that calling `original_filename` returns utf-8 (because that's what it used to do).
Diffstat (limited to 'actionpack/test/dispatch/uploaded_file_test.rb')
-rw-r--r--actionpack/test/dispatch/uploaded_file_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb
index 9f6381f118..55ebbd5143 100644
--- a/actionpack/test/dispatch/uploaded_file_test.rb
+++ b/actionpack/test/dispatch/uploaded_file_test.rb
@@ -18,6 +18,12 @@ module ActionDispatch
assert_equal "UTF-8", uf.original_filename.encoding.to_s
end
+ def test_filename_should_always_be_in_utf_8
+ uf = Http::UploadedFile.new(:filename => 'foo'.encode(Encoding::SHIFT_JIS),
+ :tempfile => Object.new)
+ assert_equal "UTF-8", uf.original_filename.encoding.to_s
+ end
+
def test_content_type
uf = Http::UploadedFile.new(:type => 'foo', :tempfile => Object.new)
assert_equal 'foo', uf.content_type