diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-15 14:17:33 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-15 14:18:16 -0700 |
commit | 3480551e67d2bd97b50a9f95b8f0a49132c38bec (patch) | |
tree | c764897016deb0c58e271cf972031d4c18db2394 /activerecord/test | |
parent | 55736ef1252a7373c3c21b9cb0bebf497fddaff9 (diff) | |
download | rails-3480551e67d2bd97b50a9f95b8f0a49132c38bec.tar.gz rails-3480551e67d2bd97b50a9f95b8f0a49132c38bec.tar.bz2 rails-3480551e67d2bd97b50a9f95b8f0a49132c38bec.zip |
removing nonsensical tests, limit now actually adds a limit
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/relation_scoping_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/relations_test.rb | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb index f538d2a326..b571e9a8b8 100644 --- a/activerecord/test/cases/relation_scoping_test.rb +++ b/activerecord/test/cases/relation_scoping_test.rb @@ -161,7 +161,7 @@ class NestedRelationScopingTest < ActiveRecord::TestCase def test_merge_inner_scope_has_priority Developer.limit(5).scoping do Developer.limit(10).scoping do - assert_equal 10, Developer.count + assert_equal 10, Developer.all.size end end end diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 649fe79fd3..d43ba31814 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -679,10 +679,6 @@ class RelationTest < ActiveRecord::TestCase assert_equal Post.order(Post.arel_table[:title]).all, Post.order("title").all end - def test_relations_limit_with_conditions_or_limit - assert_equal Post.limit(2).size, Post.limit(2).all.size - end - def test_order_with_find_with_order assert_equal 'zyke', Car.order('name desc').find(:first, :order => 'id').name end |