aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorrick <technoweenie@gmail.com>2009-02-25 09:27:44 -0800
committerrick <technoweenie@gmail.com>2009-02-25 09:27:44 -0800
commit1cfc39e7e7ab72db1f797fbf21cdd149edfadd22 (patch)
treeb135afd8e77e634537ccc3d7d47ee9ff9c01b260 /activerecord/test/cases
parent0dd2f96f5c90f8abacb0fe0757ef7e5db4a4d501 (diff)
downloadrails-1cfc39e7e7ab72db1f797fbf21cdd149edfadd22.tar.gz
rails-1cfc39e7e7ab72db1f797fbf21cdd149edfadd22.tar.bz2
rails-1cfc39e7e7ab72db1f797fbf21cdd149edfadd22.zip
update the default scope test to take the model's default scope into account
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/method_scoping_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb
index 71e2ce8790..c676c1c72b 100644
--- a/activerecord/test/cases/method_scoping_test.rb
+++ b/activerecord/test/cases/method_scoping_test.rb
@@ -597,7 +597,7 @@ class DefaultScopingTest < ActiveRecord::TestCase
end
def test_named_scope
- expected = Developer.find(:all, :order => 'name DESC').collect { |dev| dev.salary }
+ expected = Developer.find(:all, :order => 'salary DESC, name DESC').collect { |dev| dev.salary }
received = DeveloperOrderedBySalary.by_name.find(:all).collect { |dev| dev.salary }
assert_equal expected, received
end