aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/persistence_test.rb
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2015-09-07 00:10:50 +0930
committerMatthew Draper <matthew@trebex.net>2015-09-07 00:10:50 +0930
commite07b006d9c7b0a57c350d918259176089d6dedd6 (patch)
tree4a10983dc01217aee4c8f2e620fd3d77fcea8927 /activerecord/test/cases/persistence_test.rb
parentbc1f0c2e36ee705023dcbd513d99f834f8262ea3 (diff)
parentc82c5f8ffd7291186235c5912151c9dc0d262c4a (diff)
downloadrails-e07b006d9c7b0a57c350d918259176089d6dedd6.tar.gz
rails-e07b006d9c7b0a57c350d918259176089d6dedd6.tar.bz2
rails-e07b006d9c7b0a57c350d918259176089d6dedd6.zip
Merge pull request #21505 from morgoth/deprecate-passing-conditions-to-destroy_all-and-delete_all
Deprecate passing conditions to AR::Relation destroy_all and delete_all methods
Diffstat (limited to 'activerecord/test/cases/persistence_test.rb')
-rw-r--r--activerecord/test/cases/persistence_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb
index cdf63957f4..7f14082a9a 100644
--- a/activerecord/test/cases/persistence_test.rb
+++ b/activerecord/test/cases/persistence_test.rb
@@ -126,7 +126,7 @@ class PersistenceTest < ActiveRecord::TestCase
assert ! topics_by_mary.empty?
assert_difference('Topic.count', -topics_by_mary.size) do
- destroyed = Topic.destroy_all(conditions).sort_by(&:id)
+ destroyed = Topic.where(conditions).destroy_all.sort_by(&:id)
assert_equal topics_by_mary, destroyed
assert destroyed.all?(&:frozen?), "destroyed topics should be frozen"
end