2 files changed, 28 insertions, 1 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index b2e3b6b399..6d2aa2cd2d 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -81,6 +81,18 @@ class NewRenderTestController < ActionController::Base
   def partial_only_with_layout
     render :partial => "partial_only", :layout => true
   end
+  
+  def partial_with_locals
+    render :partial => "customer", :locals => { :customer => Customer.new("david") } 
+  end
+  
+  def partial_collection
+    render :partial => "customer", :collection => [ Customer.new("david"), Customer.new("mary") ]
+  end
+
+  def partial_collection_with_locals
+    render :partial => "customer", :collection => [ Customer.new("david"), Customer.new("mary") ], :locals => { :extra => ", fun!" }
+  end
 
   def hello_in_a_string
     @customers = [ Customer.new("david"), Customer.new("mary") ]
@@ -315,4 +327,19 @@ class NewRenderTest < Test::Unit::TestCase
     get :partials_list
     assert_equal "goodbyeHello: davidHello: marygoodbye\n", @response.body
   end
+  
+  def test_partial_with_locals
+    get :partial_with_locals
+    assert_equal "Hello: David", @response.body
+  end
+
+  def test_partial_collection
+    get :partial_collection
+    assert_equal "Hello: davidHello: mary", @response.body
+  end
+
+  def test_partial_collection_with_locals
+    get :partial_collection_with_locals
+    assert_equal "Hello: david, fun!Hello: mary, fun!", @response.body
+  end
 end
 \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer.rhtml b/actionpack/test/fixtures/test/_customer.rhtml
index 872d8c44e6..fc2d3f26b2 100644
--- a/actionpack/test/fixtures/test/_customer.rhtml
+++ b/actionpack/test/fixtures/test/_customer.rhtml
@@ -1 +1 @@
-Hello: <%= customer.name %>
-\ No newline at end of file
+Hello: <%= customer.name %><%= extra %>
+\ No newline at end of file