aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorgbuesing <gbuesing@gmail.com>2008-05-08 21:30:17 -0500
committergbuesing <gbuesing@gmail.com>2008-05-08 21:30:17 -0500
commit06a7c2948a8dbf31357b552d468fcf42002736e7 (patch)
tree94a646f54e820dff7dbad3bc0a3928b1c5731fe6 /activesupport/test
parentfb9bf16e96e2c24d4996327500d8109b5d535e2c (diff)
downloadrails-06a7c2948a8dbf31357b552d468fcf42002736e7.tar.gz
rails-06a7c2948a8dbf31357b552d468fcf42002736e7.tar.bz2
rails-06a7c2948a8dbf31357b552d468fcf42002736e7.zip
Time.zone.parse: return nil for strings with no date information
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/time_zone_test.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index 0bfb89b675..3757ddcedb 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -198,6 +198,14 @@ class TimeZoneTest < Test::Unit::TestCase
assert_equal zone, twz.time_zone
end
end
+
+ def test_parse_returns_nil_when_string_without_date_information_is_passed_in
+ silence_warnings do # silence warnings raised by tzinfo gem
+ zone = TimeZone['Eastern Time (US & Canada)']
+ assert_nil zone.parse('foobar')
+ assert_nil zone.parse(' ')
+ end
+ end
uses_mocha 'TestParseWithIncompleteDate' do
def test_parse_with_incomplete_date