1 files changed, 25 insertions, 7 deletions
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 8fd1fc2577..4a09a87322 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -182,7 +182,7 @@ class NamedScopeTest < ActiveRecord::TestCase
 
   def test_first_and_last_should_allow_integers_for_limit
     assert_equal Topic.base.first(2), Topic.base.to_a.first(2)
-    assert_equal Topic.base.last(2), Topic.base.to_a.last(2)
+    assert_equal Topic.base.last(2), Topic.base.order("id").to_a.last(2)
   end
 
   def test_first_and_last_should_not_use_query_when_results_are_loaded
@@ -456,13 +456,21 @@ class NamedScopeTest < ActiveRecord::TestCase
     end
   end
 
+  def test_scopes_to_get_newest
+    post = posts(:welcome)
+    old_last_comment = post.comments.newest
+    new_comment = post.comments.create(:body => "My new comment")
+    assert_equal new_comment, post.comments.newest
+    assert_not_equal old_last_comment, post.comments.newest
+  end
+
   def test_scopes_are_reset_on_association_reload
     post = posts(:welcome)
 
     [:destroy_all, :reset, :delete_all].each do |method|
       before = post.comments.containing_the_letter_e
       post.association(:comments).send(method)
-      assert before.object_id != post.comments.containing_the_letter_e.object_id, "AssociationCollection##{method} should reset the named scopes cache"
+      assert before.object_id != post.comments.containing_the_letter_e.object_id, "CollectionAssociation##{method} should reset the named scopes cache"
     end
   end
 
@@ -489,14 +497,24 @@ end
 class DynamicScopeTest < ActiveRecord::TestCase
   fixtures :posts
 
+  def setup
+    @test_klass = Class.new(Post) do
+      def self.name; "Post"; end
+    end
+  end
+
   def test_dynamic_scope
-    assert_equal Post.scoped_by_author_id(1).find(1), Post.find(1)
-    assert_equal Post.scoped_by_author_id_and_title(1, "Welcome to the weblog").first, Post.find(:first, :conditions => { :author_id => 1, :title => "Welcome to the weblog"})
+    assert_equal @test_klass.scoped_by_author_id(1).find(1), @test_klass.find(1)
+    assert_equal @test_klass.scoped_by_author_id_and_title(1, "Welcome to the weblog").first, @test_klass.find(:first, :conditions => { :author_id => 1, :title => "Welcome to the weblog"})
   end
 
   def test_dynamic_scope_should_create_methods_after_hitting_method_missing
-    assert_blank Developer.methods.grep(/scoped_by_created_at/)
-    Developer.scoped_by_created_at(nil)
-    assert_present Developer.methods.grep(/scoped_by_created_at/)
+    assert_blank @test_klass.methods.grep(/scoped_by_type/)
+    @test_klass.scoped_by_type(nil)
+    assert_present @test_klass.methods.grep(/scoped_by_type/)
+  end
+
+  def test_dynamic_scope_with_less_number_of_arguments
+    assert_raise(ArgumentError){ @test_klass.scoped_by_author_id_and_title(1) }
   end
 end