1 files changed, 34 insertions, 2 deletions
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 0015b3c196..5d6d48b824 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -30,18 +30,44 @@ class DogWithTwoValidators < Dog
   before_validation { self.history << 'before_validation_marker2' }
 end
 
-class DogValidatorReturningFalse < Dog
+class DogBeforeValidatorReturningFalse < Dog
   before_validation { false }
   before_validation { self.history << 'before_validation_marker2' }
 end
 
+class DogAfterValidatorReturningFalse < Dog
+  after_validation { false }
+  after_validation { self.history << 'after_validation_marker' }
+end
+
 class DogWithMissingName < Dog
   before_validation { self.history << 'before_validation_marker' }
   validates_presence_of :name
 end
 
+class DogValidatorWithIfCondition < Dog
+  before_validation :set_before_validation_marker1, if: -> { true }
+  before_validation :set_before_validation_marker2, if: -> { false }
+
+  after_validation :set_after_validation_marker1, if: -> { true }
+  after_validation :set_after_validation_marker2, if: -> { false }
+
+  def set_before_validation_marker1; self.history << 'before_validation_marker1'; end
+  def set_before_validation_marker2; self.history << 'before_validation_marker2' ; end
+
+  def set_after_validation_marker1; self.history << 'after_validation_marker1'; end
+  def set_after_validation_marker2; self.history << 'after_validation_marker2' ; end
+end
+
+
 class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
 
+  def test_if_condition_is_respected_for_before_validation
+    d = DogValidatorWithIfCondition.new
+    d.valid?
+    assert_equal ["before_validation_marker1", "after_validation_marker1"], d.history
+  end
+
   def test_before_validation_and_after_validation_callbacks_should_be_called
     d = DogWithMethodCallbacks.new
     d.valid?
@@ -61,12 +87,18 @@ class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
   end
 
   def test_further_callbacks_should_not_be_called_if_before_validation_returns_false
-    d = DogValidatorReturningFalse.new
+    d = DogBeforeValidatorReturningFalse.new
     output = d.valid?
     assert_equal [], d.history
     assert_equal false, output
   end
 
+  def test_further_callbacks_should_be_called_if_after_validation_returns_false
+    d = DogAfterValidatorReturningFalse.new
+    d.valid?
+    assert_equal ['after_validation_marker'], d.history
+  end
+
   def test_validation_test_should_be_done
     d = DogWithMissingName.new
     output = d.valid?