Merge remote branch 'rails/master'

1 files changed, 23 insertions, 0 deletions

diff --git a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
index 69dbd7f528..0bcef81534 100644
--- a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
@@ -141,6 +141,29 @@ class UrlEncodedParamsParsingTest < ActionController::IntegrationTest
         post "/parse", actual
         assert_response :ok
         assert_equal(expected, TestController.last_request_parameters)
+        assert_utf8(TestController.last_request_parameters)
+      end
+    end
+
+    def assert_utf8(object)
+      return unless "ruby".encoding_aware?
+
+      correct_encoding = Encoding.default_internal
+
+      unless object.is_a?(Hash)
+        assert_equal correct_encoding, object.encoding, "#{object.inspect} should have been UTF-8"
+        return
+      end
+
+      object.each do |k,v|
+        case v
+        when Hash
+          assert_utf8(v)
+        when Array
+          v.each {|el| assert_utf8(el) }
+        else
+          assert_utf8(v)
+        end
       end
     end
 end