diff options
| author | Andrew White <andrew.white@unboxed.co> | 2017-03-28 13:11:55 +0100 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2017-03-28 13:33:32 +0100 |
| commit | d28c48243521a978ba8d432092e11a4aafb2b154 (patch) | |
| tree | 64698eb1d21b1d1673af721ae996d693735fd553 /activesupport/test | |
| parent | 5561412ac2a22c24e9c481821a99ddc9f55911a2 (diff) | |
| download | rails-d28c48243521a978ba8d432092e11a4aafb2b154.tar.gz rails-d28c48243521a978ba8d432092e11a4aafb2b154.tar.bz2 rails-d28c48243521a978ba8d432092e11a4aafb2b154.zip | |
Return unmapped timezones from `country_zones`
If a country doesn't exist in the MAPPINGS hash then create a new
`ActiveSupport::Timezone` instance using the supplied timezone id.
Fixes #28431.
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/time_zone_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb index 1615d8fdb2..de111cc40e 100644 --- a/activesupport/test/time_zone_test.rb +++ b/activesupport/test/time_zone_test.rb @@ -714,6 +714,10 @@ class TimeZoneTest < ActiveSupport::TestCase assert_not_includes ActiveSupport::TimeZone.country_zones(:ru), ActiveSupport::TimeZone["Kuala Lumpur"] end + def test_country_zones_without_mappings + assert_includes ActiveSupport::TimeZone.country_zones(:sv), ActiveSupport::TimeZone["America/El_Salvador"] + end + def test_to_yaml assert_equal("--- !ruby/object:ActiveSupport::TimeZone\nname: Pacific/Honolulu\n", ActiveSupport::TimeZone["Hawaii"].to_yaml) assert_equal("--- !ruby/object:ActiveSupport::TimeZone\nname: Europe/London\n", ActiveSupport::TimeZone["Europe/London"].to_yaml) |