1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb
index e2a7f1bad7..5e0c5fb21e 100644
--- a/actionpack/test/dispatch/uploaded_file_test.rb
+++ b/actionpack/test/dispatch/uploaded_file_test.rb
@@ -12,6 +12,18 @@ module ActionDispatch
       uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
       assert_equal 'foo', uf.original_filename
     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"
+        uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
+        assert "UTF-8", uf.original_filename.encoding.to_s
+      end
+    end
 
     def test_content_type
       uf = Http::UploadedFile.new(:type => 'foo', :tempfile => Object.new)