From 16e078d908b79c78016e3a08afdd18a3dc77d40b Mon Sep 17 00:00:00 2001 From: Nick Ragaz Date: Thu, 2 Sep 2010 00:36:18 -0400 Subject: [PATCH] failing test for reorder overriding default_scope [5528] Signed-off-by: Santiago Pastorino --- activerecord/test/cases/relation_scoping_test.rb | 6 ++++++ activerecord/test/models/developer.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb index e27bb65144534..f538d2a32607e 100644 --- a/activerecord/test/cases/relation_scoping_test.rb +++ b/activerecord/test/cases/relation_scoping_test.rb @@ -390,6 +390,12 @@ def test_reorder_overrides_default_scope_order 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 diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb index f0d40e741bd32..947583af7606a 100644 --- a/activerecord/test/models/developer.rb +++ b/activerecord/test/models/developer.rb @@ -88,7 +88,7 @@ class DeveloperOrderedBySalary < ActiveRecord::Base self.table_name = 'developers' default_scope :order => 'salary DESC' scope :by_name, order('name DESC') - scope :reordered_by_name, reorder('name DESC') + scope :reordered_by_name, reorder('name') def self.all_ordered_by_name with_scope(:find => { :order => 'name DESC' }) do