From 7333f50abce3ad6c83d13c66b85e371e7951c84d Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 25 Mar 2011 12:10:11 -0700 Subject: fixing whitespace errors. :bomb: --- activerecord/test/cases/attribute_methods_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/test/cases/attribute_methods_test.rb') diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb index d8638ee776..d03c3ee1a1 100644 --- a/activerecord/test/cases/attribute_methods_test.rb +++ b/activerecord/test/cases/attribute_methods_test.rb @@ -120,11 +120,11 @@ class AttributeMethodsTest < ActiveRecord::TestCase def test_read_attributes_before_type_cast_on_datetime in_time_zone "Pacific Time (US & Canada)" do record = @target.new - + record.written_on = "345643456" assert_equal "345643456", record.written_on_before_type_cast assert_equal nil, record.written_on - + record.written_on = "2009-10-11 12:13:14" assert_equal "2009-10-11 12:13:14", record.written_on_before_type_cast assert_equal Time.zone.parse("2009-10-11 12:13:14"), record.written_on -- cgit v1.2.3 From dea3d2dd203fe2008ccfae6b6575da0b0001e466 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Sat, 26 Mar 2011 11:47:20 -0700 Subject: adding a test for attributes after type cast. thanks nragaz. :heart: --- activerecord/test/cases/attribute_methods_test.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'activerecord/test/cases/attribute_methods_test.rb') diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb index d03c3ee1a1..eacb18980c 100644 --- a/activerecord/test/cases/attribute_methods_test.rb +++ b/activerecord/test/cases/attribute_methods_test.rb @@ -132,6 +132,23 @@ class AttributeMethodsTest < ActiveRecord::TestCase end end + def test_read_attributes_after_type_cast_on_datetime + in_time_zone "Pacific Time (US & Canada)" do + record = @target.new + + record.written_on = "2011-03-24" + assert_equal "2011-03-24", record.written_on_before_type_cast + assert_equal Time.zone.parse("2011-03-24"), record.written_on + assert_equal ActiveSupport::TimeZone["Pacific Time (US & Canada)"], + record.written_on.time_zone + + record.save + record.reload + + assert_equal Time.zone.parse("2011-03-24"), record.written_on + end + end + def test_hash_content topic = Topic.new topic.content = { "one" => 1, "two" => 2 } -- cgit v1.2.3 From 5013fe3a1dcc0472ff11b6f94260d5dc224b5305 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Sat, 26 Mar 2011 17:04:54 -0700 Subject: refactoring tz to a variable rather than repeating it --- activerecord/test/cases/attribute_methods_test.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'activerecord/test/cases/attribute_methods_test.rb') diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb index eacb18980c..34271be8b0 100644 --- a/activerecord/test/cases/attribute_methods_test.rb +++ b/activerecord/test/cases/attribute_methods_test.rb @@ -133,13 +133,15 @@ class AttributeMethodsTest < ActiveRecord::TestCase end def test_read_attributes_after_type_cast_on_datetime - in_time_zone "Pacific Time (US & Canada)" do + tz = "Pacific Time (US & Canada)" + + in_time_zone tz do record = @target.new record.written_on = "2011-03-24" assert_equal "2011-03-24", record.written_on_before_type_cast assert_equal Time.zone.parse("2011-03-24"), record.written_on - assert_equal ActiveSupport::TimeZone["Pacific Time (US & Canada)"], + assert_equal ActiveSupport::TimeZone[tz], record.written_on.time_zone record.save -- cgit v1.2.3 From a9d27c04abf24dc85be061ff9772d71897af02b1 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Sat, 26 Mar 2011 17:16:24 -0700 Subject: cleaning up typecast test a little --- activerecord/test/cases/attribute_methods_test.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'activerecord/test/cases/attribute_methods_test.rb') diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb index 34271be8b0..84f75cc803 100644 --- a/activerecord/test/cases/attribute_methods_test.rb +++ b/activerecord/test/cases/attribute_methods_test.rb @@ -138,16 +138,18 @@ class AttributeMethodsTest < ActiveRecord::TestCase in_time_zone tz do record = @target.new - record.written_on = "2011-03-24" - assert_equal "2011-03-24", record.written_on_before_type_cast - assert_equal Time.zone.parse("2011-03-24"), record.written_on - assert_equal ActiveSupport::TimeZone[tz], - record.written_on.time_zone + date_string = "2011-03-24" + time = Time.zone.parse date_string + + record.written_on = date_string + assert_equal date_string, record.written_on_before_type_cast + assert_equal time, record.written_on + assert_equal ActiveSupport::TimeZone[tz], record.written_on.time_zone record.save record.reload - assert_equal Time.zone.parse("2011-03-24"), record.written_on + assert_equal time, record.written_on end end -- cgit v1.2.3