diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/validations/presence_validation_test.rb | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index b5d3420dd7..e60925827b 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Fix presence validator for association when the associated record responds to `to_a`. + + *gmarik* + * Fixed regression on preload/includes with multiple arguments failing in certain conditions, raising a NoMethodError internally by calling `reflect_on_association` for `NilClass:Class`. diff --git a/activerecord/test/cases/validations/presence_validation_test.rb b/activerecord/test/cases/validations/presence_validation_test.rb index fa04a7d02e..3790d3c8cf 100644 --- a/activerecord/test/cases/validations/presence_validation_test.rb +++ b/activerecord/test/cases/validations/presence_validation_test.rb @@ -51,7 +51,6 @@ class PresenceValidationTest < ActiveRecord::TestCase assert b.invalid? end - def test_validates_presence_doesnt_convert_to_array Speedometer.validates_presence_of :dashboard |