aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-02-02 09:15:47 -0700
committerSean Griffin <sean@seantheprogrammer.com>2016-02-02 09:17:45 -0700
commit5bb26008ce7c979a87f0d8aef0dd10514838787f (patch)
tree20f719bc4ce22cd30e252b37280780b500157303 /activerecord/test/cases
parentf7775c74d0a9462e89325b145f1aafd029646ba6 (diff)
downloadrails-5bb26008ce7c979a87f0d8aef0dd10514838787f.tar.gz
rails-5bb26008ce7c979a87f0d8aef0dd10514838787f.tar.bz2
rails-5bb26008ce7c979a87f0d8aef0dd10514838787f.zip
Avoid infinite recursion when bad values are passed to tz aware fields
We had previously updated this to attempt to map over whatever was passed in, so that additional types like range and array could benefit from this behavior without the time zone converter having to deal with every known type. However, the default behavior of a type is to just yield the given value to `map`, which means that if we don't actually know how to handle a value, we'll just recurse infinitely. Since both uses of `map` in this case occur in cases where we know receiving the same object will recurse, we can just break on reference equality. Fixes #23241.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/attribute_methods_test.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 94dfbc3346..ef84624a8d 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -714,6 +714,13 @@ class AttributeMethodsTest < ActiveRecord::TestCase
end
end
+ def test_time_zone_aware_attributes_dont_recurse_infinitely_on_invalid_values
+ in_time_zone "Pacific Time (US & Canada)" do
+ record = @target.new(bonus_time: [])
+ assert_equal nil, record.bonus_time
+ end
+ end
+
def test_setting_time_zone_conversion_for_attributes_should_write_value_on_class_variable
Topic.skip_time_zone_conversion_for_attributes = [:field_a]
Minimalistic.skip_time_zone_conversion_for_attributes = [:field_b]