Permalink
Browse files

render(:template) applies a layout by default. render("foo/bar") work…

…s with a layout again.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1424 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 280c224 commit 14c378cc7fd364ea5d96e13746345a29341cd845 @jamis jamis committed Jun 15, 2005
View
@@ -1,5 +1,7 @@
*SVN*
+* render("foo/bar") works with a layout again
+
* Fixed double-singularization on scaffolded pagination call (Address would be turned into Addres) #1216, #1404 [nilsga]
* Removed the require hack used by functional testing to work around an earlier bug in rake.
@@ -24,7 +26,7 @@
* Make sure the benchmarking render method always returns the output of the render.
-* render(:action) and render() are the only two calls that default to using a layout. All other render calls assume :layout => false. This also fixes send_file, which was applying a layout if one existed for the current action.
+* render(:action), render(:template) and render() are the only three calls that default to using a layout. All other render calls assume :layout => false. This also fixes send_file, which was applying a layout if one existed for the current action.
* verify with :redirect_to won't redirect if a redirect or render has already been performed #1350
@@ -219,8 +219,8 @@ def render_with_a_layout(options = {}, deprecated_status = nil, deprecated_layou
private
def render_with_a_layout_options(options)
- return options unless options.is_a?(Hash)
- if options.values_at(:text, :file, :template, :inline, :partial, :nothing).compact.empty?
+ return { :template => options } unless options.is_a?(Hash)
+ if options.values_at(:text, :file, :inline, :partial, :nothing).compact.empty?
options
else
{ :layout => false }.merge(options)
@@ -94,6 +94,10 @@ def accessing_params_in_template_with_layout
render :inline => "Hello: <%= params[:name] %>", :layout => nil
end
+ def render_with_explicit_template
+ render "test/hello_world"
+ end
+
def rescue_action(e) raise end
private
@@ -103,7 +107,8 @@ def determine_layout
"rendering_nothing_on_layout", "render_text_hello_world",
"partial_only", "partial_only_with_layout",
"accessing_params_in_template",
- "accessing_params_in_template_with_layout"
+ "accessing_params_in_template_with_layout",
+ "render_with_explicit_template"
"layouts/standard"
when "builder_layout_test"
"layouts/builder"
@@ -249,4 +254,9 @@ def test_accessing_params_in_template_with_layout
get :accessing_params_in_template_with_layout, :name => "David"
assert_equal "<html>Hello: David</html>", @response.body
end
+
+ def test_render_with_explicit_template
+ get :render_with_explicit_template
+ assert_response :success
+ end
end
@@ -88,20 +88,6 @@ def determine_layout
TestController.template_root = File.dirname(__FILE__) + "/../fixtures/"
Fun::GamesController.template_root = File.dirname(__FILE__) + "/../fixtures/"
-class TestLayoutController < ActionController::Base
- layout "layouts/standard"
-
- def hello_world
- end
-
- def hello_world_outside_layout
- end
-
- def rescue_action(e)
- raise unless ActionController::MissingTemplate === e
- end
-end
-
class RenderTest < Test::Unit::TestCase
def setup
@request = ActionController::TestRequest.new

0 comments on commit 14c378c

Please sign in to comment.