Fixed render :partial => @collection.named_scope (nkallen) [#61 state:resolved]

3 files changed, 9 insertions, 11 deletions

diff --git a/actionpack/lib/action_view/partials.rb b/actionpack/lib/action_view/partials.rb
index 37b717d848..9afaa16918 100644
--- a/actionpack/lib/action_view/partials.rb
+++ b/actionpack/lib/action_view/partials.rb
@@ -111,7 +111,7 @@ module ActionView
         when ActionView::Helpers::FormBuilder
           builder_partial_path = partial_path.class.to_s.demodulize.underscore.sub(/_builder$/, '')
           render_partial(builder_partial_path, object_assigns, (local_assigns || {}).merge(builder_partial_path.to_sym => partial_path))
-        when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Associations::HasManyThroughAssociation
+        when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope
           if partial_path.any?
             collection = partial_path
             render_partial_collection(nil, collection, nil, local_assigns)
diff --git a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
index 773018d445..94070f5523 100644
--- a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
+++ b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
@@ -14,6 +14,10 @@ class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
       render :partial => @topic.replies
     end
     
+    def render_with_named_scope
+      render :partial => Reply.base
+    end
+    
     def render_with_has_many_through_association
       @developer = Developer.find(:first)
       render :partial => @developer.topics
@@ -53,16 +57,9 @@ class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
     assert_template 'replies/_reply'
   end
   
-  def test_rendering_partial_with_has_many_association
-    get :render_with_has_many_through_association
-    assert_template 'topics/_topic'
-  end
-  
-  def test_rendering_partial_with_belongs_to_association
-    topic = Reply.find(1).topic
-    get :render_with_belongs_to_association
-    assert_template 'topics/_topic'
-    assert_equal topic.title, @response.body
+  def test_rendering_partial_with_named_scope
+    get :render_with_named_scope
+    assert_template 'replies/_reply'
   end
   
   def test_render_with_record
diff --git a/actionpack/test/fixtures/reply.rb b/actionpack/test/fixtures/reply.rb
index 588713de1e..04598437c2 100644
--- a/actionpack/test/fixtures/reply.rb
+++ b/actionpack/test/fixtures/reply.rb
@@ -1,4 +1,5 @@
 class Reply < ActiveRecord::Base
+  named_scope :base
   belongs_to :topic, :include => [:replies]
   belongs_to :developer