aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorDamien Mathieu <42@dmathieu.com>2011-06-14 16:58:06 +0200
committerDamien Mathieu <42@dmathieu.com>2011-06-14 17:01:33 +0200
commit383fd143bf6b81d3a1352ddaebb7b4e8beac8b37 (patch)
treeb7fe92fbb0af83d3fb757a09773a903105849182 /actionpack/test
parent383d56b5ee5da7d6e34e75677e96e0f342aa470d (diff)
downloadrails-383fd143bf6b81d3a1352ddaebb7b4e8beac8b37.tar.gz
rails-383fd143bf6b81d3a1352ddaebb7b4e8beac8b37.tar.bz2
rails-383fd143bf6b81d3a1352ddaebb7b4e8beac8b37.zip
all requests are utf-8. Don't use the external encoding.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/dispatch/uploaded_file_test.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb
index 5e0c5fb21e..44c15694f7 100644
--- a/actionpack/test/dispatch/uploaded_file_test.rb
+++ b/actionpack/test/dispatch/uploaded_file_test.rb
@@ -14,12 +14,7 @@ module ActionDispatch
end
if "ruby".encoding_aware?
- def test_filename_should_be_in_default_encoding
- Encoding.default_external = "UTF-16LE"
- uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
- assert "UTF-16LE", uf.original_filename.encoding.to_s
-
- Encoding.default_external = "UTF-8"
+ def test_filename_should_be_in_utf_8
uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
assert "UTF-8", uf.original_filename.encoding.to_s
end