0
@@ -148,6 +148,19 @@ describe WillPaginate::Finders::ActiveRecord do
0
     
0
     ArProject.paginate_by_id(ids, :per_page => 3, :page => 2, :order => 'id')
0
   end
0
+  
0
+  # Is this Rails 2.0? Find out by testing find_all which was removed in [6998]
0
+  unless ActiveRecord::Base.respond_to? :find_all
0
+    it "should paginate array of IDs" do
0
+      # AR finders also accept arrays of IDs
0
+      # (this was broken in Rails before [6912])
0
+      lambda {
0
+        result = Developer.paginate((1..8).to_a, :per_page => 3, :page => 2, :order => 'id')
0
+        result.map(&:id).should == (4..6).to_a
0
+        result.total_entries.should == 8
0
+      }.should run_queries(1)
0
+    end
0
+  end
0
 
0
   it "doesn't mangle options" do
0
     ArProject.expects(:find).returns([])
0
@@ -243,6 +256,66 @@ describe WillPaginate::Finders::ActiveRecord do
0
           :include => :projects, :conditions => 'projects.id > 2'
0
       end
0
     end
0
+    
0
+    describe "associations" do
0
+      it "should paginate with include" do
0
+        project = projects(:active_record)
0
+
0
+        result = project.topics.paginate \
0
+          :page       => 1, 
0
+          :include    => :replies,  
0
+          :conditions => ["replies.content LIKE ?", 'Nice%'],
0
+          :per_page   => 10
0
+
0
+        expected = Topic.find :all, 
0
+          :include    => 'replies', 
0
+          :conditions => ["project_id = #{project.id} AND replies.content LIKE ?", 'Nice%'],
0
+          :limit      => 10
0
+
0
+        result.should == expected
0
+      end
0
+
0
+      it "should paginate" do
0
+        dhh = users(:david)
0
+        expected_name_ordered = projects(:action_controller, :active_record)
0
+        expected_id_ordered   = projects(:active_record, :action_controller)
0
+
0
+        lambda {
0
+          # with association-specified order
0
+          result = dhh.projects.paginate(:page => 1)
0
+          result.should == expected_name_ordered
0
+          result.total_entries.should == 2
0
+        }.should run_queries(2)
0
+
0
+        # with explicit order
0
+        result = dhh.projects.paginate(:page => 1, :order => 'projects.id')
0
+        result.should == expected_id_ordered
0
+        result.total_entries.should == 2
0
+
0
+        lambda {
0
+          dhh.projects.find(:all, :order => 'projects.id', :limit => 4)
0
+        }.should_not raise_error
0
+        
0
+        result = dhh.projects.paginate(:page => 1, :order => 'projects.id', :per_page => 4)
0
+        result.should == expected_id_ordered
0
+
0
+        # has_many with implicit order
0
+        topic = Topic.find(1)
0
+        expected = replies(:spam, :witty_retort)
0
+        # FIXME: wow, this is ugly
0
+        topic.replies.paginate(:page => 1).map(&:id).sort.should == expected.map(&:id).sort
0
+        topic.replies.paginate(:page => 1, :order => 'replies.id ASC').should == expected.reverse
0
+      end
0
+
0
+      it "should paginate through association extension" do
0
+        project = Project.find(:first)
0
+
0
+        lambda {
0
+          result = project.replies.paginate_recent :page => 1
0
+          result.should == [replies(:brave)]
0
+        }.should run_queries(2)
0
+      end
0
+    end
0
   end
0
   
0
   protected

0
@@ -7,63 +7,6 @@ WillPaginate.enable_named_scope
0
 
0
 class FinderTest < ActiveRecordTestCase
0
   
0
-  def test_paginate_associations_with_include
0
-    entries, project = nil, projects(:active_record)
0
-
0
-    assert_nothing_raised "THIS IS A BUG in Rails 1.2.3 that was fixed in [7326]. " +
0
-        "Please upgrade to a newer version of Rails." do
0
-      entries = project.topics.paginate \
0
-        :page     => 1, 
0
-        :include  => :replies,  
0
-        :conditions => "replies.content LIKE 'Nice%' ", 
0
-        :per_page => 10
0
-    end
0
-
0
-    expected = Topic.find :all, 
0
-      :include => 'replies', 
0
-      :conditions => "project_id = #{project.id} AND replies.content LIKE 'Nice%' ", 
0
-      :limit   => 10
0
-
0
-    assert_equal expected, entries.to_a
0
-  end
0
-
0
-  def test_paginate_associations
0
-    dhh = users :david
0
-    expected_name_ordered = [projects(:action_controller), projects(:active_record)]
0
-    expected_id_ordered   = [projects(:active_record), projects(:action_controller)]
0
-
0
-    assert_queries(2) do
0
-      # with association-specified order
0
-      entries = dhh.projects.paginate(:page => 1)
0
-      assert_equal expected_name_ordered, entries
0
-      assert_equal 2, entries.total_entries
0
-    end
0
-
0
-    # with explicit order
0
-    entries = dhh.projects.paginate(:page => 1, :order => 'projects.id')
0
-    assert_equal expected_id_ordered, entries
0
-    assert_equal 2, entries.total_entries
0
-
0
-    assert_nothing_raised { dhh.projects.find(:all, :order => 'projects.id', :limit => 4) }
0
-    entries = dhh.projects.paginate(:page => 1, :order => 'projects.id', :per_page => 4)
0
-    assert_equal expected_id_ordered, entries
0
-
0
-    # has_many with implicit order
0
-    topic = Topic.find(1)
0
-    expected = [replies(:spam), replies(:witty_retort)]
0
-    assert_equal expected.map(&:id).sort, topic.replies.paginate(:page => 1).map(&:id).sort
0
-    assert_equal expected.reverse, topic.replies.paginate(:page => 1, :order => 'replies.id ASC')
0
-  end
0
-
0
-  def test_paginate_association_extension
0
-    project = Project.find(:first)
0
-    
0
-    assert_queries(2) do
0
-      entries = project.replies.paginate_recent :page => 1
0
-      assert_equal [replies(:brave)], entries
0
-    end
0
-  end
0
-  
0
   def test_paginate_with_joins
0
     entries = nil
0
     
0
@@ -181,16 +124,4 @@ class FinderTest < ActiveRecordTestCase
0
     assert User.methods.include?(pager), "`#{pager}` method should be defined on User"
0
   end
0
 
0
-  # Is this Rails 2.0? Find out by testing find_all which was removed in [6998]
0
-  unless ActiveRecord::Base.respond_to? :find_all
0
-    def test_paginate_array_of_ids
0
-      # AR finders also accept arrays of IDs
0
-      # (this was broken in Rails before [6912])
0
-      assert_queries(1) do
0
-        entries = Developer.paginate((1..8).to_a, :per_page => 3, :page => 2, :order => 'id')
0
-        assert_equal (4..6).to_a, entries.map(&:id)
0
-        assert_equal 8, entries.total_entries
0
-      end
0
-    end
0
-  end
0
 end