Merge pull request #35045 from paracycle/uk-fix-partial-renderer

Fix partial renderer assuming `locals` responds to `symbolize_keys`

2 files changed, 6 insertions, 6 deletions

diff --git a/actionview/lib/action_view/renderer/partial_renderer.rb b/actionview/lib/action_view/renderer/partial_renderer.rb
index cb850d75ee..f175c30aa1 100644
--- a/actionview/lib/action_view/renderer/partial_renderer.rb
+++ b/actionview/lib/action_view/renderer/partial_renderer.rb
@@ -363,7 +363,7 @@ module ActionView
         @options = options
         @block   = block
 
-        @locals  = options[:locals] ? options[:locals].symbolize_keys : {}
+        @locals  = options[:locals] || {}
         @details = extract_details(options)
 
         prepend_formats(options[:formats])
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb
index 204903c60c..727d3fbc1a 100644
--- a/actionview/test/actionpack/controller/render_test.rb
+++ b/actionview/test/actionpack/controller/render_test.rb
@@ -485,8 +485,8 @@ class TestController < ActionController::Base
     render partial: "customer", locals: { customer: Customer.new("david") }
   end
 
-  def partial_with_string_locals
-    render partial: "customer", locals: { "customer" => Customer.new("david") }
+  def partial_with_hashlike_locals
+    render partial: "customer", locals: ActionController::Parameters.new(customer: Customer.new("david"))
   end
 
   def partial_with_form_builder
@@ -691,7 +691,7 @@ class RenderTest < ActionController::TestCase
     get :partial_with_locals, to: "test#partial_with_locals"
     get :partial_with_nested_object, to: "test#partial_with_nested_object"
     get :partial_with_nested_object_shorthand, to: "test#partial_with_nested_object_shorthand"
-    get :partial_with_string_locals, to: "test#partial_with_string_locals"
+    get :partial_with_hashlike_locals, to: "test#partial_with_hashlike_locals"
     get :partials_list, to: "test#partials_list"
     get :render_action_hello_world, to: "test#render_action_hello_world"
     get :render_action_hello_world_as_string, to: "test#render_action_hello_world_as_string"
@@ -1292,8 +1292,8 @@ class RenderTest < ActionController::TestCase
     assert_equal "Hello: david", @response.body
   end
 
-  def test_partial_with_string_locals
-    get :partial_with_string_locals
+  def test_partial_with_hashlike_locals
+    get :partial_with_hashlike_locals
     assert_equal "Hello: david", @response.body
   end