1 files changed, 43 insertions, 29 deletions

diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index cc5b4900dc..f3c8dbcae9 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -19,6 +19,10 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal "Hello world!", @view.render("test/hello_world")
   end
 
+  def test_render_file_at_top_level
+    assert_equal 'Elastica', @view.render('/shared')
+  end
+
   def test_render_file_with_full_path
     template_path = File.join(File.dirname(__FILE__), '../fixtures/test/hello_world.erb')
     assert_equal "Hello world!", @view.render(:file => template_path)
@@ -47,6 +51,24 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal "only partial", @view.render(:partial => "test/partial_only")
   end
 
+  def test_render_partial_with_format
+    assert_equal 'partial html', @view.render(:partial => 'test/partial')
+  end
+
+  def test_render_partial_at_top_level
+    # file fixtures/_top_level_partial_only.erb (not fixtures/test)
+    assert_equal 'top level partial', @view.render(:partial => '/top_level_partial_only')
+  end
+
+  def test_render_partial_with_format_at_top_level
+    # file fixtures/_top_level_partial.html.erb (not fixtures/test, with format extension)
+    assert_equal 'top level partial html', @view.render(:partial => '/top_level_partial')
+  end
+
+  def test_render_partial_with_locals
+    assert_equal "5", @view.render(:partial => "test/counter", :locals => { :counter_counter => 5 })
+  end
+
   def test_render_partial_with_errors
     assert_raise(ActionView::TemplateError) { @view.render(:partial => "test/raise") }
   end
@@ -54,17 +76,29 @@ class ViewRenderTest < Test::Unit::TestCase
   def test_render_partial_collection
     assert_equal "Hello: davidHello: mary", @view.render(:partial => "test/customer", :collection => [ Customer.new("david"), Customer.new("mary") ])
   end
-  
+
   def test_render_partial_collection_as
-    assert_equal "david david davidmary mary mary", 
+    assert_equal "david david davidmary mary mary",
       @view.render(:partial => "test/customer_with_var", :collection => [ Customer.new("david"), Customer.new("mary") ], :as => :customer)
   end
-  
+
   def test_render_partial_collection_without_as
-    assert_equal "local_inspector,local_inspector_counter,object", 
+    assert_equal "local_inspector,local_inspector_counter,object",
       @view.render(:partial => "test/local_inspector", :collection => [ Customer.new("mary") ])
   end
 
+  def test_render_partial_with_empty_collection_should_return_nil
+    assert_nil @view.render(:partial => "test/customer", :collection => [])
+  end
+
+  def test_render_partial_with_nil_collection_should_return_nil
+    assert_nil @view.render(:partial => "test/customer", :collection => nil)
+  end
+
+  def test_render_partial_with_empty_array_should_return_nil
+    assert_nil @view.render(:partial => [])
+  end
+
   # TODO: The reason for this test is unclear, improve documentation
   def test_render_partial_and_fallback_to_layout
     assert_equal "Before (Josh)\n\nAfter", @view.render(:partial => "test/layout_for_partial", :locals => { :name => "Josh" })
@@ -94,38 +128,18 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal "Hello, World!", @view.render(:inline => "Hello, World!", :type => :foo)
   end
 
-  class CustomHandler < ActionView::TemplateHandler
-    def render(template, local_assigns)
-      [template.source, local_assigns].inspect
-    end
-  end
-
-  def test_render_inline_with_custom_type
-    ActionView::Template.register_template_handler :foo, CustomHandler
-    assert_equal '["Hello, World!", {}]', @view.render(:inline => "Hello, World!", :type => :foo)
-  end
-
-  def test_render_inline_with_locals_and_custom_type
-    ActionView::Template.register_template_handler :foo, CustomHandler
-    assert_equal '["Hello, <%= name %>!", {:name=>"Josh"}]', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
-  end
-
-  class CompilableCustomHandler < ActionView::TemplateHandler
-    include ActionView::TemplateHandlers::Compilable
-
-    def compile(template)
-      "@output_buffer = ''\n" +
-        "@output_buffer << 'source: #{template.source.inspect}'\n"
-    end
+  CustomHandler = lambda do |template|
+    "@output_buffer = ''\n" +
+      "@output_buffer << 'source: #{template.source.inspect}'\n"
   end
 
   def test_render_inline_with_compilable_custom_type
-    ActionView::Template.register_template_handler :foo, CompilableCustomHandler
+    ActionView::Template.register_template_handler :foo, CustomHandler
     assert_equal 'source: "Hello, World!"', @view.render(:inline => "Hello, World!", :type => :foo)
   end
 
   def test_render_inline_with_locals_and_compilable_custom_type
-    ActionView::Template.register_template_handler :foo, CompilableCustomHandler
+    ActionView::Template.register_template_handler :foo, CustomHandler
     assert_equal 'source: "Hello, <%= name %>!"', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
   end
 end