aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-07-20 00:53:30 -0300
committerGitHub <noreply@github.com>2016-07-20 00:53:30 -0300
commite2b71e9f8eeac691c6063d7d9cb52db1c1210bcb (patch)
tree17f0154bd6d67b481b6bc252f3deb118d6ef851d /activerecord/test
parent8a0b3ca8c4f0c3ae95b3a275f0f881092466e964 (diff)
parent780535017ae3071c87f29b1bf7ea2015959a6c21 (diff)
downloadrails-e2b71e9f8eeac691c6063d7d9cb52db1c1210bcb.tar.gz
rails-e2b71e9f8eeac691c6063d7d9cb52db1c1210bcb.tar.bz2
rails-e2b71e9f8eeac691c6063d7d9cb52db1c1210bcb.zip
Merge pull request #25834 from alpaca-tc/fixes_multiparameter_attributes_on_time_with_time_zone_aware_attributes
Fix bug in method AR TimeZoneConverter#set_time_zone_without_conversion
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/multiparameter_attributes_test.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/activerecord/test/cases/multiparameter_attributes_test.rb b/activerecord/test/cases/multiparameter_attributes_test.rb
index d05cb22740..59c340ceb7 100644
--- a/activerecord/test/cases/multiparameter_attributes_test.rb
+++ b/activerecord/test/cases/multiparameter_attributes_test.rb
@@ -202,6 +202,20 @@ class MultiParameterAttributeTest < ActiveRecord::TestCase
Topic.reset_column_information
end
+ def test_multiparameter_attributes_on_time_with_time_zone_aware_attributes_and_invalid_time_params
+ with_timezone_config aware_attributes: true do
+ Topic.reset_column_information
+ attributes = {
+ "written_on(1i)" => "2004", "written_on(2i)" => "", "written_on(3i)" => ""
+ }
+ topic = Topic.find(1)
+ topic.attributes = attributes
+ assert_nil topic.written_on
+ end
+ ensure
+ Topic.reset_column_information
+ end
+
def test_multiparameter_attributes_on_time_with_time_zone_aware_attributes_false
with_timezone_config default: :local, aware_attributes: false, zone: -28800 do
attributes = {