diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-07-27 17:27:47 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-07-27 17:27:47 +0100 |
| commit | b658cf1198bbeb0fb702cd10c6f491cd90cedba0 (patch) | |
| tree | e3163ecc180fd799659ab4d9579f91c5ff293f5a /activerecord/test/cases/adapters/mysql2 | |
| parent | 6a81ccd69d96f36f4322ef927191ab5a35e68d68 (diff) | |
| download | rails-b658cf1198bbeb0fb702cd10c6f491cd90cedba0.tar.gz rails-b658cf1198bbeb0fb702cd10c6f491cd90cedba0.tar.bz2 rails-b658cf1198bbeb0fb702cd10c6f491cd90cedba0.zip | |
Deprecate ActiveRecord::Base.scoped.
It doesn't serve much purpose now that ActiveRecord::Base.all returns a
Relation.
The code is moved to active_record_deprecated_finders.
Diffstat (limited to 'activerecord/test/cases/adapters/mysql2')
| -rw-r--r-- | activerecord/test/cases/adapters/mysql2/reserved_word_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb index a8e2ea4f41..9fd07f014e 100644 --- a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb +++ b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb @@ -130,7 +130,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase end def test_associations_work_with_reserved_words - assert_nothing_raised { Select.scoped(:includes => [:groups]).to_a } + assert_nothing_raised { Select.all.merge!(:includes => [:groups]).to_a } end #the following functions were added to DRY test cases |