diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-04-27 14:17:28 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-04-27 14:28:36 +0100 |
| commit | 3981a687f949f7b7b2c36d9dd15aa00e1542116d (patch) | |
| tree | 2f3163e2fa97280b4ec98dfebfc3f5edfc8386e3 /activerecord/test/cases/modules_test.rb | |
| parent | 0a8aec2c97ab93721d5671555f22975da0a20422 (diff) | |
| download | rails-3981a687f949f7b7b2c36d9dd15aa00e1542116d.tar.gz rails-3981a687f949f7b7b2c36d9dd15aa00e1542116d.tar.bz2 rails-3981a687f949f7b7b2c36d9dd15aa00e1542116d.zip | |
remove deprecated calls
Diffstat (limited to 'activerecord/test/cases/modules_test.rb')
| -rw-r--r-- | activerecord/test/cases/modules_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/modules_test.rb b/activerecord/test/cases/modules_test.rb index 76fc975a27..a03c4f552e 100644 --- a/activerecord/test/cases/modules_test.rb +++ b/activerecord/test/cases/modules_test.rb @@ -48,7 +48,7 @@ class ModulesTest < ActiveRecord::TestCase end def test_find_account_and_include_company - account = MyApplication::Billing::Account.find(1, :include => :firm) + account = MyApplication::Billing::Account.scoped(:includes => :firm).find(1) assert_kind_of MyApplication::Business::Firm, account.firm end @@ -72,8 +72,8 @@ class ModulesTest < ActiveRecord::TestCase clients = [] assert_nothing_raised NameError, "Should be able to resolve all class constants via reflection" do - clients << MyApplication::Business::Client.references(:accounts).find(3, :include => {:firm => :account}, :conditions => 'accounts.id IS NOT NULL') - clients << MyApplication::Business::Client.find(3, :include => {:firm => :account}) + clients << MyApplication::Business::Client.references(:accounts).scoped(:includes => {:firm => :account}, :where => 'accounts.id IS NOT NULL').find(3) + clients << MyApplication::Business::Client.scoped(:includes => {:firm => :account}).find(3) end clients.each do |client| |