aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorlulalala <mark@goodlife.tw>2018-12-22 20:25:02 +0800
committerlulalala <mark@goodlife.tw>2019-03-31 22:59:12 +0800
commit67d262f70f47154b2476b5fcadf21dd63ebc2597 (patch)
treefce1f16b3c13e4a931d6c7216059a52fb64b3301 /activemodel
parentbe1585fca07c0823009014c5539e49dc7396524c (diff)
downloadrails-67d262f70f47154b2476b5fcadf21dd63ebc2597.tar.gz
rails-67d262f70f47154b2476b5fcadf21dd63ebc2597.tar.bz2
rails-67d262f70f47154b2476b5fcadf21dd63ebc2597.zip
Add deprecation to slice!
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/errors.rb2
-rw-r--r--activemodel/test/cases/errors_test.rb8
2 files changed, 5 insertions, 5 deletions
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index 3ba33bee4d..7c6346f577 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -147,6 +147,8 @@ module ActiveModel
# person.errors.slice!(:age, :gender) # => { :name=>["cannot be nil"], :city=>["cannot be nil"] }
# person.errors.keys # => [:age, :gender]
def slice!(*keys)
+ deprecation_removal_warning(:slice!)
+
keys = keys.map(&:to_sym)
results = messages.slice!(*keys)
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 048b8a92fb..5dbbf910de 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -563,11 +563,9 @@ class ErrorsTest < ActiveModel::TestCase
person.errors.add(:gender, "cannot be nil")
person.errors.add(:city, "cannot be nil")
- person.errors.slice!(:age, "gender")
+ assert_deprecated { person.errors.slice!(:age, "gender") }
- assert_deprecated do
- assert_equal [:age, :gender], person.errors.keys
- end
+ assert_equal [:age, :gender], assert_deprecated { person.errors.keys }
end
test "slice! returns the deleted errors" do
@@ -577,7 +575,7 @@ class ErrorsTest < ActiveModel::TestCase
person.errors.add(:gender, "cannot be nil")
person.errors.add(:city, "cannot be nil")
- removed_errors = person.errors.slice!(:age, "gender")
+ removed_errors = assert_deprecated { person.errors.slice!(:age, "gender") }
assert_equal({ name: ["cannot be nil"], city: ["cannot be nil"] }, removed_errors)
end