aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test/cases/validations
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-02-07 12:13:15 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-02-07 12:19:37 -0300
commit3a25cdca3e0d29ee2040931d0cb6c275d612dffe (patch)
tree1071341bba3fd9f75ca59cb1820ade7322423065 /activemodel/test/cases/validations
parent64f4930afc2cd9d1a607c38099c3482b420a0512 (diff)
downloadrails-3a25cdca3e0d29ee2040931d0cb6c275d612dffe.tar.gz
rails-3a25cdca3e0d29ee2040931d0cb6c275d612dffe.tar.bz2
rails-3a25cdca3e0d29ee2040931d0cb6c275d612dffe.zip
Remove deprecated behavior that halts callbacks when the return is false
Diffstat (limited to 'activemodel/test/cases/validations')
-rw-r--r--activemodel/test/cases/validations/callbacks_test.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 83e8ac9522..f2e4a5946d 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -29,7 +29,7 @@ class DogWithTwoValidators < Dog
before_validation { history << "before_validation_marker2" }
end
-class DogDeprecatedBeforeValidatorReturningFalse < Dog
+class DogBeforeValidatorReturningFalse < Dog
before_validation { false }
before_validation { history << "before_validation_marker2" }
end
@@ -121,13 +121,11 @@ class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
assert_equal false, output
end
- def test_deprecated_further_callbacks_should_not_be_called_if_before_validation_returns_false
- d = DogDeprecatedBeforeValidatorReturningFalse.new
- assert_deprecated do
- output = d.valid?
- assert_equal [], d.history
- assert_equal false, output
- end
+ def test_further_callbacks_should_be_called_if_before_validation_returns_false
+ d = DogBeforeValidatorReturningFalse.new
+ output = d.valid?
+ assert_equal ["before_validation_marker2"], d.history
+ assert_equal true, output
end
def test_further_callbacks_should_be_called_if_after_validation_returns_false