diff options
| author | José Valim <jose.valim@gmail.com> | 2012-04-28 00:12:51 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-04-28 00:12:51 -0700 |
| commit | dd5524a70741e75d6232d0933f57793a33de5482 (patch) | |
| tree | a79c196af27043670ba85d745fb9889dc8e389da /activerecord/test/cases/locking_test.rb | |
| parent | 47a87fb0ec9d2e65914ff94abf2e5428d760fa39 (diff) | |
| parent | 3aec521c25a2498c92f721627fc6081c4ccc9e55 (diff) | |
| download | rails-dd5524a70741e75d6232d0933f57793a33de5482.tar.gz rails-dd5524a70741e75d6232d0933f57793a33de5482.tar.bz2 rails-dd5524a70741e75d6232d0933f57793a33de5482.zip | |
Merge pull request #6029 from aderyabin/fix_depr
removed deprecation warnings
Diffstat (limited to 'activerecord/test/cases/locking_test.rb')
| -rw-r--r-- | activerecord/test/cases/locking_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index ee180e4154..afb0bd6fd9 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -358,7 +358,7 @@ unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter) || in_memory_db? def test_sane_find_with_lock assert_nothing_raised do Person.transaction do - Person.find 1, :lock => true + Person.lock.find(1) end end end @@ -369,7 +369,7 @@ unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter) || in_memory_db? def test_eager_find_with_lock assert_nothing_raised do Person.transaction do - Person.find 1, :include => :readers, :lock => true + Person.includes(:readers).lock.find(1) end end end |