diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-09-24 21:37:53 -0700 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-09-24 21:37:53 -0700 |
| commit | f3982858359008ec8fe43b8fa2c75aad8788cd89 (patch) | |
| tree | 03699ec7b03e291982530c43bd84aff93d315d35 /activerecord/test | |
| parent | 1acef69aa65e3bc502128dddbaa93e2de108f99b (diff) | |
| parent | 8dd5a582f544ca86add20d46c2a62b965b28e08a (diff) | |
| download | rails-f3982858359008ec8fe43b8fa2c75aad8788cd89.tar.gz rails-f3982858359008ec8fe43b8fa2c75aad8788cd89.tar.bz2 rails-f3982858359008ec8fe43b8fa2c75aad8788cd89.zip | |
Merge pull request #12290 from kennyj/fix_12278
Closes #12278. AR::ConnectionAdapters::Column.string_to_time method respects string with timezone.
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/column_test.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/test/cases/column_test.rb b/activerecord/test/cases/column_test.rb index 3a4f414ae8..5ab2f18e9d 100644 --- a/activerecord/test/cases/column_test.rb +++ b/activerecord/test/cases/column_test.rb @@ -110,6 +110,16 @@ module ActiveRecord assert_equal 1800, column.type_cast(30.minutes) assert_equal 7200, column.type_cast(2.hours) end + + def test_string_to_time_with_timezone + old = ActiveRecord::Base.default_timezone + [:utc, :local].each do |zone| + ActiveRecord::Base.default_timezone = zone + assert_equal Time.utc(2013, 9, 4, 0, 0, 0), Column.string_to_time("Wed, 04 Sep 2013 03:00:00 EAT") + end + rescue + ActiveRecord::Base.default_timezone = old + end end end end |