aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-04-21 08:37:14 -0700
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-04-21 08:37:14 -0700
commit52ba5a5bec5b2961711be459982b6a58eed63f46 (patch)
tree0e8bff87116490ec823bc8e66d407c46c0e3bcd7 /activemodel/test
parent5cffc7eb1c9655c93007a7f58e30af96ed81f73a (diff)
parentcf69d527feb9faadb7feb7afcc1c0d5cd5e6f77a (diff)
downloadrails-52ba5a5bec5b2961711be459982b6a58eed63f46.tar.gz
rails-52ba5a5bec5b2961711be459982b6a58eed63f46.tar.bz2
rails-52ba5a5bec5b2961711be459982b6a58eed63f46.zip
Merge pull request #10284 from neerajdotname/missing-active-model-tests
Added tests for if condition in Active Model callbacks
Diffstat (limited to 'activemodel/test')
-rw-r--r--activemodel/test/cases/validations/callbacks_test.rb21
1 files changed, 21 insertions, 0 deletions
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 0015b3c196..6cd0f4ed4d 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -40,8 +40,29 @@ class DogWithMissingName < Dog
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?