diff options
author | Jon Leighton <j@jonathanleighton.com> | 2010-10-14 10:25:43 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2010-10-14 10:25:43 +0100 |
commit | 3fb493c2b037ffbdda5c91d66334ec6f79faa2d1 (patch) | |
tree | e49b072103bbfe6fb6159954c786a31f44099325 /activerecord/test/cases/relations_test.rb | |
parent | 212fdd8ba9624f61421a7a950283537a3d39ac18 (diff) | |
parent | 01ab6f961bff150d50c99f03fa3946f48ac29b17 (diff) | |
download | rails-3fb493c2b037ffbdda5c91d66334ec6f79faa2d1.tar.gz rails-3fb493c2b037ffbdda5c91d66334ec6f79faa2d1.tar.bz2 rails-3fb493c2b037ffbdda5c91d66334ec6f79faa2d1.zip |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/lib/active_record/associations.rb
activerecord/test/cases/associations/cascaded_eager_loading_test.rb
Diffstat (limited to 'activerecord/test/cases/relations_test.rb')
-rw-r--r-- | activerecord/test/cases/relations_test.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index fec5e6731f..df4e84ca29 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -135,12 +135,6 @@ class RelationTest < ActiveRecord::TestCase assert_equal topics(:fourth).title, topics.first.title end - def test_finding_with_reorder - topics = Topic.order('author_name').order('title').reorder('id') - assert_equal 4, topics.to_a.size - assert_equal topics(:first).title, topics.first.title - end - def test_finding_with_order_and_take entrants = Entrant.order("id ASC").limit(2).to_a |