aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/time_zone_test.rb
diff options
context:
space:
mode:
authorJohn Gesimondo <john@jmondo.com>2016-07-11 20:48:56 -0700
committerJohn Gesimondo <john@jmondo.com>2016-07-11 20:49:21 -0700
commit424e961be776d9918f39660d43439fc1973f680e (patch)
tree4447425d796bd6223f3df4f334c86b3b77a099c5 /activesupport/test/time_zone_test.rb
parent108a407b7d41ba47317cf448dbb5e032ba1b039f (diff)
downloadrails-424e961be776d9918f39660d43439fc1973f680e.tar.gz
rails-424e961be776d9918f39660d43439fc1973f680e.tar.bz2
rails-424e961be776d9918f39660d43439fc1973f680e.zip
Raise ArgumentError for bad strptime arguments
Diffstat (limited to 'activesupport/test/time_zone_test.rb')
-rw-r--r--activesupport/test/time_zone_test.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index a15d5c6a0e..76cbb5ce8b 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -388,6 +388,13 @@ class TimeZoneTest < ActiveSupport::TestCase
end
end
+ def test_strptime_with_malformed_string
+ with_env_tz 'US/Eastern' do
+ zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+ assert_raise(ArgumentError) { zone.strptime('1999-12-31', '%Y/%m/%d') }
+ end
+ end
+
def test_utc_offset_lazy_loaded_from_tzinfo_when_not_passed_in_to_initialize
tzinfo = TZInfo::Timezone.get('America/New_York')
zone = ActiveSupport::TimeZone.create(tzinfo.name, nil, tzinfo)