diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-04-04 02:43:12 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-04-04 02:43:12 +0530 |
| commit | 4ac719686c0075b6ad6896becfe0f058efdb97ff (patch) | |
| tree | 6255a8fc483436dc0fc89c0a2bc2755a51ecc329 /activerecord/test/cases/relation_scoping_test.rb | |
| parent | 4c76f6894889e8e3f5cc3722d928954c79422542 (diff) | |
| parent | 3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d (diff) | |
| download | rails-4ac719686c0075b6ad6896becfe0f058efdb97ff.tar.gz rails-4ac719686c0075b6ad6896becfe0f058efdb97ff.tar.bz2 rails-4ac719686c0075b6ad6896becfe0f058efdb97ff.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/test/cases/relation_scoping_test.rb')
| -rw-r--r-- | activerecord/test/cases/relation_scoping_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb index 7369aaea1d..30a783d5a2 100644 --- a/activerecord/test/cases/relation_scoping_test.rb +++ b/activerecord/test/cases/relation_scoping_test.rb @@ -429,9 +429,9 @@ class DefaultScopingTest < ActiveRecord::TestCase assert_equal expected, received end - def test_except_and_order_overrides_default_scope_order + def test_reorder_overrides_default_scope_order expected = Developer.order('name DESC').collect { |dev| dev.name } - received = DeveloperOrderedBySalary.except(:order).order('name DESC').collect { |dev| dev.name } + received = DeveloperOrderedBySalary.reorder('name DESC').collect { |dev| dev.name } assert_equal expected, received end |