1 files changed, 39 insertions, 7 deletions
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index d87e2b85b0..645ecae220 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -188,6 +188,26 @@ class ParamsWrapperTest < ActionController::TestCase
       assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu', 'title' => 'Developer' }})
     end
   end
+
+  def test_preserves_query_string_params
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      get :parse, { 'user' => { 'username' => 'nixon' } }
+      assert_parameters(
+        {'user' => { 'username' => 'nixon' } }
+      )
+    end
+  end
+
+  def test_empty_parameter_set
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, {}
+      assert_parameters(
+        {'user' => { } }
+      )
+    end
+  end
 end
 
 class NamespacedParamsWrapperTest < ActionController::TestCase
@@ -317,14 +337,26 @@ class IrregularInflectionParamsWrapperTest < ActionController::TestCase
   tests ParamswrappernewsController
 
   def test_uses_model_attribute_names_with_irregular_inflection
-    ActiveSupport::Inflector.inflections do |inflect|
-      inflect.irregular 'paramswrappernews_item', 'paramswrappernews'
-    end
+    with_dup do
+      ActiveSupport::Inflector.inflections do |inflect|
+        inflect.irregular 'paramswrappernews_item', 'paramswrappernews'
+      end
 
-    with_default_wrapper_options do
-      @request.env['CONTENT_TYPE'] = 'application/json'
-      post :parse, { 'username' => 'sikachu', 'test_attr' => 'test_value' }
-      assert_parameters({ 'username' => 'sikachu', 'test_attr' => 'test_value', 'paramswrappernews_item' => { 'test_attr' => 'test_value' }})
+      with_default_wrapper_options do
+        @request.env['CONTENT_TYPE'] = 'application/json'
+        post :parse, { 'username' => 'sikachu', 'test_attr' => 'test_value' }
+        assert_parameters({ 'username' => 'sikachu', 'test_attr' => 'test_value', 'paramswrappernews_item' => { 'test_attr' => 'test_value' }})
+      end
     end
   end
+
+  private
+
+  def with_dup
+    original = ActiveSupport::Inflector::Inflections.instance_variable_get(:@__instance__)[:en]
+    ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, en: original.dup)
+    yield
+  ensure
+    ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, en: original)
+  end
 end