From d5fcb5b9ad4ecb271834ee5a689a1ead40290086 Mon Sep 17 00:00:00 2001 From: Ufuk Kayserilioglu Date: Thu, 24 Jan 2019 22:08:02 +0200 Subject: [PATCH] Revert "Allow usage of strings as locals for partial renderer" --- .../lib/action_view/renderer/partial_renderer.rb | 2 +- actionview/test/actionpack/controller/render_test.rb | 10 ---------- 2 files changed, 1 insertion(+), 11 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 @@ def setup(context, options, block) @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..02df84da8e 100644 --- a/actionview/test/actionpack/controller/render_test.rb +++ b/actionview/test/actionpack/controller/render_test.rb @@ -485,10 +485,6 @@ def partial_with_locals render partial: "customer", locals: { customer: Customer.new("david") } end - def partial_with_string_locals - render partial: "customer", locals: { "customer" => Customer.new("david") } - end - def partial_with_form_builder render partial: ActionView::Helpers::FormBuilder.new(:post, nil, view_context, {}) end @@ -691,7 +687,6 @@ 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 :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,11 +1287,6 @@ def test_partial_with_locals assert_equal "Hello: david", @response.body end - def test_partial_with_string_locals - get :partial_with_string_locals - assert_equal "Hello: david", @response.body - end - def test_partial_with_form_builder get :partial_with_form_builder assert_equal "\n", @response.body