diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-02 03:21:40 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-02 03:21:40 -0300 |
| commit | 5e790d368c5d0e89cfd5ef1245e4b131be63716f (patch) | |
| tree | fe26ed0a2b3056dd67fe46558abd96712cef67d5 /activerecord/test/cases/method_scoping_test.rb | |
| parent | 9f36431f58c406312d0b0317543b7f69107e61e9 (diff) | |
| parent | 3be3470fab788856b4559742434f195cc6b1009a (diff) | |
| download | rails-5e790d368c5d0e89cfd5ef1245e4b131be63716f.tar.gz rails-5e790d368c5d0e89cfd5ef1245e4b131be63716f.tar.bz2 rails-5e790d368c5d0e89cfd5ef1245e4b131be63716f.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/test/cases/method_scoping_test.rb')
| -rw-r--r-- | activerecord/test/cases/method_scoping_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb index 4edf7558f7..015c6ac652 100644 --- a/activerecord/test/cases/method_scoping_test.rb +++ b/activerecord/test/cases/method_scoping_test.rb @@ -628,9 +628,9 @@ class DefaultScopingTest < ActiveRecord::TestCase assert_equal expected, received end - def test_named_scope - expected = Developer.find(:all, :order => 'salary DESC, name DESC').collect { |dev| dev.salary } - received = DeveloperOrderedBySalary.by_name.find(:all).collect { |dev| dev.salary } + def test_named_scope_overwrites_default + expected = Developer.find(:all, :order => 'name DESC').collect { |dev| dev.name } + received = DeveloperOrderedBySalary.by_name.find(:all).collect { |dev| dev.name } assert_equal expected, received end |