Changeset 1970

Timestamp:

08/05/05 20:51:03 (3 years ago)

Author:

minam

Message:

Make sure :layout => false is always used when rendering inside a layout

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/layout.rb (modified) (1 diff)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (3 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make sure :layout => false is always used when rendering inside a layout
-
-* Use raise instead of assert_not_nil in Test::Unit::TestCase#process to ensure that the test variables (controller, request, response) have been set

trunk/actionpack/lib/action_controller/layout.rb

@@ -209 +209 @@
-
-      if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options, deprecated_layout))
+        options = options.merge :layout => false if template_with_options
-        logger.info("Rendering #{options} within #{layout}") if logger
-

trunk/actionpack/test/controller/new_render_test.rb

@@ -59 +59 @@
-  def rendering_without_layout
-    render :action => "hello_world", :layout => false
+  end
+
+  def layout_overriding_layout
+    render :action => "hello_world", :layout => "standard"
-  end
-  
@@ -155 +159 @@
-        when "builder_layout_test"
-          "layouts/builder"
-
+, "layout_overriding_layout"
-          "layouts/talk_from_action"
-      end
@@ -262 +266 @@
-  end
-
+  def test_layout_overriding_layout
+    get :layout_overriding_layout
+    assert_no_match %r{<title>}, @response.body
+  end
+
-  def test_rendering_nothing_on_layout
-    get :rendering_nothing_on_layout