Merge branch 'rails-2.0-2.1'

spec/app.rb

@@ -27,6 +27,7 @@ def render_parent; end
   def bad_render_parent; end
   def partial_in_bc; end
   def partial_in_b; end
+  def collection_in_bc; end
 end
 
 # :c cotroller is a subclass of :b controller, so it inheirt's b's views ('c', 'b', then 'a')

spec/controllers/b_controller_spec.rb

@@ -57,5 +57,10 @@
       get :partial_in_b
       response.body.should == "b:partial_in_b => b:_partial_in_b"
     end
+
+    it "GET :collection_in_bc should render b/collection_in_bc then b/_partial_in_bc" do
+      get :collection_in_bc
+      response.body.should == 'b:collection_in_bc => b:_partial_in_bc'
+    end
   end
 end

spec/controllers/c_controller_spec.rb

@@ -58,5 +58,10 @@
       get :partial_in_b
       response.body.should == "b:partial_in_b => b:_partial_in_b"
     end
+
+    it "GET :collection_in_bc should render b/collection_in_bc then c/_partial_in_bc" do
+      get :collection_in_bc
+      response.body.should == 'b:collection_in_bc => c:_partial_in_bc'
+    end
   end
 end

spec/fixtures/views/b/collection_in_bc.html.erb

@@ -0,0 +1 @@
+b:collection_in_bc => <%= render :partial => 'partial_in_bc', :collection => [1] %>