Ported over render :template tests

6 files changed, 39 insertions, 8 deletions

diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index 315d6151e9..f56b9dd914 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -50,8 +50,7 @@ module AbstractController
     end
     
     def _render_template(template, options)
-      # layout = options[:_layout].is_a?(ActionView::Template) ? options[:_layout] : _layout_for_name(options[:_layout])
-      _action_view._render_template_with_layout(template, options[:_layout])
+      _action_view._render_template_with_layout(template, options[:_layout], options)
     end
         
   private
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index c1f420f7b4..e9a7ab4004 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -40,7 +40,6 @@ module AbstractController
     # 
     # :api: plugin
     def render_to_body(options = {})
-      options = {:_template_name => options} if options.is_a?(String)
       name = options[:_template_name] || action_name
       
       template = options[:_template] || view_paths.find_by_parts(name.to_s, {:formats => formats}, options[:_prefix])
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index 9a965c18e8..df07edbd90 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/actionpack/lib/action_controller/new_base/renderer.rb
@@ -21,10 +21,6 @@ module ActionController
     end
 
     def render_to_body(options)
-      unless options.is_a?(Hash)
-        options = {:action => options}
-      end
-
       if options.key?(:text)
         options[:_template] = ActionView::TextTemplate.new(_text(options))
         template = nil
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 9149212a2d..d4a18a673c 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -80,6 +80,7 @@ class TestController < ActionController::Base
     fresh_when(:last_modified => Time.now.utc.beginning_of_day, :etag => [ :foo, 123 ])
   end
 
+  # :ported:
   def render_hello_world
     render :template => "test/hello_world"
   end
@@ -94,14 +95,17 @@ class TestController < ActionController::Base
     render :template => "test/hello_world"
   end
 
+  # :ported: compatibility
   def render_hello_world_with_forward_slash
     render :template => "/test/hello_world"
   end
 
+  # :ported:
   def render_template_in_top_directory
     render :template => 'shared'
   end
 
+  # :deprecated:
   def render_template_in_top_directory_with_slash
     render :template => '/shared'
   end
@@ -251,6 +255,10 @@ class TestController < ActionController::Base
     render :js => "alert('hello')"
   end
 
+  # This test is testing 3 things:
+  #   render :file in AV      :ported:
+  #   render :template in AC  :ported:
+  #   setting content type
   def render_xml_hello
     @name = "David"
     render :template => "test/hello"
@@ -399,6 +407,7 @@ class TestController < ActionController::Base
     render :layout => true, :inline =>  "Hello: <%= params[:name] %>"
   end
 
+  # :ported:
   def render_with_explicit_template
     render :template => "test/hello_world"
   end
@@ -407,6 +416,7 @@ class TestController < ActionController::Base
     render "test/hello_world"
   end
 
+  # :ported:
   def render_with_explicit_template_with_locals
     render :template => "test/render_file_with_locals", :locals => { :secret => 'area51' }
   end
@@ -443,10 +453,15 @@ class TestController < ActionController::Base
     render :action => "potential_conflicts"
   end
 
+  # :deprecated:
+  # Tests being able to pick a .builder template over a .erb
+  # For instance, being able to have hello.xml.builder and hello.xml.erb
+  # and select one via "hello.builder" or "hello.erb"
   def hello_world_from_rxml_using_action
     render :action => "hello_world_from_rxml.builder"
   end
 
+  # :deprecated:
   def hello_world_from_rxml_using_template
     render :template => "test/hello_world_from_rxml.builder"
   end
@@ -798,17 +813,20 @@ class RenderTest < ActionController::TestCase
     end
   end
 
+  # :ported: compatibility
   def test_render_with_forward_slash
     get :render_hello_world_with_forward_slash
     assert_template "test/hello_world"
   end
 
+  # :ported:
   def test_render_in_top_directory
     get :render_template_in_top_directory
     assert_template "shared"
     assert_equal "Elastica", @response.body
   end
 
+  # :ported:
   def test_render_in_top_directory_with_slash
     get :render_template_in_top_directory_with_slash
     assert_template "shared"
@@ -1259,6 +1277,7 @@ class RenderTest < ActionController::TestCase
     assert_equal "world", assigns["hello"]
   end
 
+  # :ported:
   def test_template_with_locals
     get :render_with_explicit_template_with_locals
     assert_equal "The secret is area51\n", @response.body
diff --git a/actionpack/test/new_base/render_template_test.rb b/actionpack/test/new_base/render_template_test.rb
index bc52eb019f..63769df082 100644
--- a/actionpack/test/new_base/render_template_test.rb
+++ b/actionpack/test/new_base/render_template_test.rb
@@ -5,7 +5,8 @@ module RenderTemplate
     
     self.view_paths = [ActionView::Template::FixturePath.new(
       "test/basic.html.erb" => "Hello from basic.html.erb",
-      "shared.html.erb"     => "Elastica"
+      "shared.html.erb"     => "Elastica",
+      "locals.html.erb"     => "The secret is <%= secret %>"
     )]
     
     def index
@@ -19,6 +20,10 @@ module RenderTemplate
     def in_top_directory_with_slash
       render :template => '/shared'
     end
+    
+    def with_locals
+      render :template => "locals", :locals => { :secret => 'area51' }
+    end
   end
   
   class TestWithoutLayout < SimpleRouteCase
@@ -44,6 +49,14 @@ module RenderTemplate
     assert_body   "Elastica"
     assert_status 200
   end
+  
+  class TestTemplateRenderWithLocals < SimpleRouteCase
+    describe "rendering a template with local variables"
+    
+    get "/render_template/without_layout/with_locals"
+    assert_body   "The secret is area51"
+    assert_status 200
+  end
     
   class WithLayoutController < ::ApplicationController
     
diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb
index cc79d6faf7..b40cbb163f 100644
--- a/actionpack/test/new_base/test_helper.rb
+++ b/actionpack/test/new_base/test_helper.rb
@@ -58,6 +58,11 @@ module ActionController
       end
     end
     
+    def render_to_body(options = {})
+      options = {:template => options} if options.is_a?(String)
+      super
+    end
+    
     # append_view_path File.join(File.dirname(__FILE__), '..', 'fixtures')
         
     CORE_METHODS = self.public_instance_methods