diff options
author | eileencodes <eileencodes@gmail.com> | 2016-02-23 15:12:57 -0500 |
---|---|---|
committer | eileencodes <eileencodes@gmail.com> | 2016-02-23 15:21:46 -0500 |
commit | 2c02bc0a47777ad8cf98e1465c08b1a68151803e (patch) | |
tree | 33f657c78b31370c283f130fc60d2ff65e28be09 /activerecord/test/cases/validations/presence_validation_test.rb | |
parent | e9b96f0d666adfd3484641a4a55feb1c774d3378 (diff) | |
download | rails-2c02bc0a47777ad8cf98e1465c08b1a68151803e.tar.gz rails-2c02bc0a47777ad8cf98e1465c08b1a68151803e.tar.bz2 rails-2c02bc0a47777ad8cf98e1465c08b1a68151803e.zip |
Revert changes to validations from PR #18612
In order to fix issue #17621 we added a check to validations that
determined if a record should be validated. Based on the existing tests
and behavior we wanted we determined the best way to do that was by
checking if `!record.peristed? || record.changed? || record.marked_for_destruction?`
This change didn't make it into a release until now. When #23790 was
opened we realized that `valid?` and `invalid?` were broken and did not
work on persisted records because of the `!record.persisted?`.
While there is still a bug that #17621 brought up, this change was too
drastic and should not be a RC blocker. I will work on fixing this so
that we don't break `valid?` but also aren't validating parent records
through child records if that parent record is validate false. This
change removes the code changes to validate and the corresponding tests.
It adds tests for two of the bugs found since Rails 5 beta2 release.
Fixes #17621
Diffstat (limited to 'activerecord/test/cases/validations/presence_validation_test.rb')
-rw-r--r-- | activerecord/test/cases/validations/presence_validation_test.rb | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/activerecord/test/cases/validations/presence_validation_test.rb b/activerecord/test/cases/validations/presence_validation_test.rb index 691f10a635..2ae30c7fd3 100644 --- a/activerecord/test/cases/validations/presence_validation_test.rb +++ b/activerecord/test/cases/validations/presence_validation_test.rb @@ -65,22 +65,6 @@ class PresenceValidationTest < ActiveRecord::TestCase assert_nothing_raised { s.valid? } end - def test_does_not_validate_presence_of_if_parent_record_is_validate_false - repair_validations(Interest) do - Interest.validates_presence_of(:topic) - interest = Interest.new - interest.save!(validate: false) - assert interest.persisted? - - man = Man.new(interest_ids: [interest.id]) - man.save! - - assert_equal man.interests.size, 1 - assert interest.valid? - assert man.valid? - end - end - def test_validates_presence_of_virtual_attribute_on_model repair_validations(Interest) do Interest.send(:attr_accessor, :abbreviation) @@ -95,4 +79,25 @@ class PresenceValidationTest < ActiveRecord::TestCase assert interest.invalid? end end + + def test_validations_run_on_persisted_record + repair_validations(Interest) do + interest = Interest.new + interest.save! + assert_predicate interest, :valid? + + Interest.validates_presence_of(:topic) + + assert_not_predicate interest, :valid? + end + end + + def test_validates_prescence_with_on_context + repair_validations(Interest) do + Interest.validates_presence_of(:topic, on: :required_name) + interest = Interest.new + interest.save! + assert_not interest.valid?(:required_name) + end + end end |