diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2010-10-10 21:32:01 -0200 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-10-11 11:54:46 -0200 |
commit | e0b76d6151821527f16b3f163abde3ebea1b2a50 (patch) | |
tree | c303ea44988442d7dfbe021586978bba2d2de22a /activerecord/test/cases/relation_scoping_test.rb | |
parent | 21a92b8d01eed34a6b26adb51139f1c40467409e (diff) | |
download | rails-e0b76d6151821527f16b3f163abde3ebea1b2a50.tar.gz rails-e0b76d6151821527f16b3f163abde3ebea1b2a50.tar.bz2 rails-e0b76d6151821527f16b3f163abde3ebea1b2a50.zip |
reorder removed in favor of except(:order).order
Diffstat (limited to 'activerecord/test/cases/relation_scoping_test.rb')
-rw-r--r-- | activerecord/test/cases/relation_scoping_test.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb index 090e6c8bc9..64365c1d75 100644 --- a/activerecord/test/cases/relation_scoping_test.rb +++ b/activerecord/test/cases/relation_scoping_test.rb @@ -384,18 +384,12 @@ class DefaultScopingTest < ActiveRecord::TestCase assert_equal expected, received end - def test_reorder_overrides_default_scope_order + def test_except_and_order_overrides_default_scope_order expected = Developer.order('name DESC').collect { |dev| dev.name } - received = DeveloperOrderedBySalary.reorder('name DESC').collect { |dev| dev.name } + received = DeveloperOrderedBySalary.except(:order).order('name DESC').collect { |dev| dev.name } assert_equal expected, received end - def test_reordered_scope_overrides_default_scope_order - not_expected = DeveloperOrderedBySalary.first # Jamis -> name DESC - received = DeveloperOrderedBySalary.reordered_by_name.first # David -> name - assert not_expected.id != received.id - end - def test_nested_exclusive_scope expected = Developer.find(:all, :limit => 100).collect { |dev| dev.salary } received = DeveloperOrderedBySalary.send(:with_exclusive_scope, :find => { :limit => 100 }) do |