Make render :partial, :layout consistent between AC and AV

edb5991a · Carlhuda · 71c9337f · edb5991a · edb5991a
隐藏空白更改
内联并排

Showing with 1 addition and 17 deletion

actionpack/lib/abstract_controller/layouts.rb actionpack/lib/abstract_controller/layouts.rb +0 -6

actionpack/test/controller/render_test.rb actionpack/test/controller/render_test.rb +1 -11

未找到文件。
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -290,12 +290,6 @@ def _normalize_options(options)
        layout = options.key?(:layout) ? options.delete(:layout) : :default
        value = _layout_for_option(layout)
        options[:layout] = (value =~ /\blayouts/ ? value : "layouts/#{value}") if value
-
-        # TODO Layout for partials should be handled here, because inside the
-        # partial renderer it looks for the layout as a partial.
-        if options.key?(:partial) && options[:layout]
-          options[:layout] = view_context.find_layout(options[:layout])
-        end
      end
    end


--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -513,10 +513,6 @@ def render_alternate_default
    end
  end

-  def partial_only_with_layout
-    render :partial => "partial_only", :layout => true
-  end
-
  def render_to_string_with_partial
    @partial_only = render_to_string :partial => "partial_only"
    @partial_with_locals = render_to_string :partial => "customer", :locals => { :customer => Customer.new("david") }
@@ -640,8 +636,7 @@ def determine_layout
             "rendering_nothing_on_layout", "render_text_hello_world",
             "render_text_hello_world_with_layout",
             "hello_world_with_layout_false",
-             "partial_only", "partial_only_with_layout",
-             "accessing_params_in_template",
+             "partial_only", "accessing_params_in_template",
             "accessing_params_in_template_with_layout",
             "render_with_explicit_template",
             "render_with_explicit_string_template",
@@ -1204,11 +1199,6 @@ def test_should_render_html_partial_with_dot
    assert_equal 'partial html', @response.body
  end

-  def test_partial_only_with_layout
-    get :partial_only_with_layout
-    assert_equal "<html>only partial</html>", @response.body
-  end
-
  def test_render_to_string_partial
    get :render_to_string_with_partial
    assert_equal "only partial", assigns(:partial_only)