Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

after_validation should be called irrespective of the result of valid…

…ation.

I confirmed that this is the behavior on 2.3.x .

[5419 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
  • Loading branch information...
commit 8f72ddc12b14225499363d1def99f770e33dfe47 1 parent 47280f0
@neerajdotname neerajdotname authored josevalim committed
View
2  activemodel/lib/active_model/validations/callbacks.rb
@@ -40,7 +40,7 @@ def after_validation(*args, &block)
options = args.extract_options!
options[:prepend] = true
options[:if] = Array.wrap(options[:if])
- options[:if] << "!halted && value != false"
+ options[:if] << "!halted"
options[:if] << "self.validation_context == :#{options[:on]}" if options[:on]
set_callback(:validation, :after, *(args << options), &block)
end
View
2  activemodel/test/cases/validations_test.rb
@@ -25,9 +25,11 @@ def test_single_field_validation
r = Reply.new
r.title = "There's no content!"
assert r.invalid?, "A reply without content shouldn't be saveable"
+ assert r.after_validation_performed, "after_validation callback should be called"
r.content = "Messa content!"
assert r.valid?, "A reply with content should be saveable"
+ assert r.after_validation_performed, "after_validation callback should be called"
end
def test_single_attr_validation_and_error_msg
View
9 activemodel/test/models/topic.rb
@@ -1,7 +1,11 @@
class Topic
include ActiveModel::Validations
+ include ActiveModel::Validations::Callbacks
attr_accessor :title, :author_name, :content, :approved
+ attr_accessor :after_validation_performed
+
+ after_validation :perform_after_validation
def initialize(attributes = {})
attributes.each do |key, value|
@@ -16,4 +20,9 @@ def condition_is_true
def condition_is_true_but_its_not
false
end
+
+ def perform_after_validation
+ self.after_validation_performed = true
+ end
+
end
Please sign in to comment.
Something went wrong with that request. Please try again.