aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/custom_locking_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/test/cases/custom_locking_test.rb')
-rw-r--r--activerecord/test/cases/custom_locking_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/custom_locking_test.rb b/activerecord/test/cases/custom_locking_test.rb
index 42ef51ef3e..e8290297e3 100644
--- a/activerecord/test/cases/custom_locking_test.rb
+++ b/activerecord/test/cases/custom_locking_test.rb
@@ -9,7 +9,7 @@ module ActiveRecord
if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
assert_match 'SHARE MODE', Person.lock('LOCK IN SHARE MODE').to_sql
assert_sql(/LOCK IN SHARE MODE/) do
- Person.scoped(:lock => 'LOCK IN SHARE MODE').find(1)
+ Person.all.merge!(:lock => 'LOCK IN SHARE MODE').find(1)
end
end
end