diff options
Diffstat (limited to 'activesupport')
23 files changed, 74 insertions, 104 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 7afd9926b5..c617a0ec3b 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,6 +1,8 @@ *Rails 3.0.0 [beta 4/release candidate] (unreleased)* -* Defines prev_(month|year) in Date and Time, and deprecates last_(month|year). [fxn] +* Renames Array#rand -> Array#random_element. [Santiago Pastorino, Rizwan Reza] + +* 1.9 compat: Renames last_(month|year) to prev_(month|year) in Date and Time. [fxn] * Aliases Date#sunday to Date#end_of_week. [fxn] diff --git a/activesupport/lib/active_support/core_ext/array/random_access.rb b/activesupport/lib/active_support/core_ext/array/random_access.rb index 5338836b29..67c322daea 100644 --- a/activesupport/lib/active_support/core_ext/array/random_access.rb +++ b/activesupport/lib/active_support/core_ext/array/random_access.rb @@ -1,16 +1,6 @@ class Array - # This method is deprecated because it masks Kernel#rand within the Array class itself, - # which may be used by a 3rd party library extending Array in turn. See - # - # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4555 - # - def rand # :nodoc: - ActiveSupport::Deprecation.warn "Array#rand is deprecated, use random_element instead", caller - random_element - end - # Returns a random element from the array. def random_element self[Kernel.rand(length)] end -end +end
\ No newline at end of file diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb index 755d96ce91..579079d4f1 100644 --- a/activesupport/lib/active_support/core_ext/date/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date/calculations.rb @@ -2,7 +2,6 @@ require 'date' require 'active_support/duration' require 'active_support/core_ext/time/zones' require 'active_support/core_ext/object/acts_like' -require 'active_support/deprecation' class Date if RUBY_VERSION < '1.9' @@ -147,11 +146,6 @@ class Date advance(:years => years) end - def last_year # :nodoc: - ActiveSupport::Deprecation.warn("Date#last_year has been deprecated, please use Date#prev_year instead", caller) - prev_year - end - # Shorthand for years_ago(1) def prev_year years_ago(1) @@ -161,11 +155,6 @@ class Date def next_year years_since(1) end unless method_defined?(:next_year) - - def last_month # :nodoc: - ActiveSupport::Deprecation.warn("Date#last_month has been deprecated, please use Date#prev_month instead", caller) - prev_month - end # Short-hand for months_ago(1) def prev_month diff --git a/activesupport/lib/active_support/core_ext/string/encoding.rb b/activesupport/lib/active_support/core_ext/string/encoding.rb new file mode 100644 index 0000000000..d4781bfe0c --- /dev/null +++ b/activesupport/lib/active_support/core_ext/string/encoding.rb @@ -0,0 +1,11 @@ +class String + if defined?(Encoding) && "".respond_to?(:encode) + def encoding_aware? + true + end + else + def encoding_aware? + false + end + end +end
\ No newline at end of file diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index e27b08ec2e..3c218d88e5 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -2,7 +2,6 @@ require 'active_support/duration' require 'active_support/core_ext/date/acts_like' require 'active_support/core_ext/date/calculations' require 'active_support/core_ext/date_time/conversions' -require 'active_support/deprecation' class Time COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] @@ -133,11 +132,6 @@ class Time advance(:years => years) end - def last_year # :nodoc: - ActiveSupport::Deprecation.warn("Time#last_year has been deprecated, please use Time#prev_year instead", caller) - prev_year - end - # Short-hand for years_ago(1) def prev_year years_ago(1) @@ -148,11 +142,6 @@ class Time years_since(1) end - def last_month # :nodoc: - ActiveSupport::Deprecation.warn("Time#last_month has been deprecated, please use Time#prev_month instead", caller) - prev_month - end - # Short-hand for months_ago(1) def prev_month months_ago(1) diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb index 4a9ac920e8..608b3fe4b9 100644 --- a/activesupport/lib/active_support/ruby/shim.rb +++ b/activesupport/lib/active_support/ruby/shim.rb @@ -15,6 +15,7 @@ require 'active_support/core_ext/enumerable' require 'active_support/core_ext/process/daemon' require 'active_support/core_ext/string/conversions' require 'active_support/core_ext/string/interpolation' +require 'active_support/core_ext/string/encoding' require 'active_support/core_ext/rexml' require 'active_support/core_ext/time/conversions' require 'active_support/core_ext/file/path' diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb index 5b072d4102..850febb959 100644 --- a/activesupport/test/buffered_logger_test.rb +++ b/activesupport/test/buffered_logger_test.rb @@ -69,11 +69,11 @@ class BufferedLoggerTest < Test::Unit::TestCase 4.times do @logger.info 'wait for it..' - assert @output.string.empty?, @output.string + assert @output.string.empty?, "@output.string should be empty but it is #{@output.string}" end @logger.flush - assert !@output.string.empty?, @logger.send(:buffer).size.to_s + assert !@output.string.empty?, "@logger.send(:buffer).size.to_s should not be empty but it is empty" end define_method "test_disabling_auto_flush_with_#{disable.inspect}_should_flush_at_max_buffer_size_as_failsafe" do @@ -82,11 +82,11 @@ class BufferedLoggerTest < Test::Unit::TestCase (Logger::MAX_BUFFER_SIZE - 1).times do @logger.info 'wait for it..' - assert @output.string.empty?, @output.string + assert @output.string.empty?, "@output.string should be empty but is #{@output.string}" end @logger.info 'there it is.' - assert !@output.string.empty?, @logger.send(:buffer).size.to_s + assert !@output.string.empty?, "@logger.send(:buffer).size.to_s should not be empty but it is empty" end end @@ -102,11 +102,11 @@ class BufferedLoggerTest < Test::Unit::TestCase 4.times do @logger.info 'wait for it..' - assert @output.string.empty?, @output.string + assert @output.string.empty?, "@output.string should be empty but it is #{@output.string}" end @logger.info 'there it is.' - assert !@output.string.empty?, @output.string + assert !@output.string.empty?, "@output.string should not be empty but it is empty" end def test_should_create_the_log_directory_if_it_doesnt_exist diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb index 49d9de63b0..70a2950f9b 100644 --- a/activesupport/test/callbacks_test.rb +++ b/activesupport/test/callbacks_test.rb @@ -521,7 +521,7 @@ module CallbacksTest def test_save obj = HyphenatedCallbacks.new obj.save - assert_equal obj.stuff, "ACTION" + assert_equal "ACTION", obj.stuff end end end diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb index ebd6806416..1f7cdb8ec1 100644 --- a/activesupport/test/core_ext/array_ext_test.rb +++ b/activesupport/test/core_ext/array_ext_test.rb @@ -368,10 +368,6 @@ class ArrayExtRandomTests < ActiveSupport::TestCase Kernel.expects(:rand).with(3).returns(1) assert_equal 2, [1, 2, 3].random_element end - - def test_deprecated_rand_on_array - assert_deprecated { [].rand } - end end class ArrayWrapperTests < Test::Unit::TestCase diff --git a/activesupport/test/core_ext/class/attribute_accessor_test.rb b/activesupport/test/core_ext/class/attribute_accessor_test.rb index 0f579d12e5..2c896d0cdb 100644 --- a/activesupport/test/core_ext/class/attribute_accessor_test.rb +++ b/activesupport/test/core_ext/class/attribute_accessor_test.rb @@ -25,14 +25,14 @@ class ClassAttributeAccessorTest < Test::Unit::TestCase end def test_should_not_create_instance_writer - assert @class.respond_to?(:foo) - assert @class.respond_to?(:foo=) - assert @object.respond_to?(:bar) + assert_respond_to @class, :foo + assert_respond_to @class, :foo= + assert_respond_to @object, :bar assert !@object.respond_to?(:bar=) end def test_should_not_create_instance_reader - assert @class.respond_to?(:shaq) + assert_respond_to @class, :shaq assert !@object.respond_to?(:shaq) end end diff --git a/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb b/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb index eeda468d9c..63ea46b564 100644 --- a/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb +++ b/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb @@ -219,7 +219,7 @@ class ClassInheritableAttributesTest < Test::Unit::TestCase @klass.reset_inheritable_attributes @sub = eval("class NotInheriting < @klass; end; NotInheriting") - assert_equal nil, @klass.a - assert_equal nil, @sub.a + assert_nil @klass.a + assert_nil @sub.a end end diff --git a/activesupport/test/core_ext/class/delegating_attributes_test.rb b/activesupport/test/core_ext/class/delegating_attributes_test.rb index 6d6cb61571..cbfb290c48 100644 --- a/activesupport/test/core_ext/class/delegating_attributes_test.rb +++ b/activesupport/test/core_ext/class/delegating_attributes_test.rb @@ -32,16 +32,16 @@ class DelegatingAttributesTest < Test::Unit::TestCase single_class.superclass_delegating_accessor :both # Class should have accessor and mutator # the instance should have an accessor only - assert single_class.respond_to?(:both) - assert single_class.respond_to?(:both=) + assert_respond_to single_class, :both + assert_respond_to single_class, :both= assert single_class.public_instance_methods.map(&:to_s).include?("both") assert !single_class.public_instance_methods.map(&:to_s).include?("both=") end def test_simple_accessor_declaration_with_instance_reader_false single_class.superclass_delegating_accessor :no_instance_reader, :instance_reader => false - assert single_class.respond_to?(:no_instance_reader) - assert single_class.respond_to?(:no_instance_reader=) + assert_respond_to single_class, :no_instance_reader + assert_respond_to single_class, :no_instance_reader= assert !single_class.public_instance_methods.map(&:to_s).include?("no_instance_reader") end diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb index 1bf118e3b7..a3a2f13436 100644 --- a/activesupport/test/core_ext/date_ext_test.rb +++ b/activesupport/test/core_ext/date_ext_test.rb @@ -145,10 +145,6 @@ class DateExtCalculationsTest < ActiveSupport::TestCase assert_equal Date.new(2005,2,28), Date.new(2004,2,29).years_since(1) # 1 year since leap day end - def test_last_year_is_deprecated - assert_deprecated { Date.today.last_year } - end - def test_prev_year assert_equal Date.new(2004,6,5), Date.new(2005,6,5).prev_year end @@ -229,10 +225,6 @@ class DateExtCalculationsTest < ActiveSupport::TestCase assert_equal Date.new(2005, 9, 30), Date.new(2005, 8, 31).next_month end - def test_last_month_is_deprecated - assert_deprecated { Date.today.last_month } - end - def test_prev_month_on_31st assert_equal Date.new(2004, 2, 29), Date.new(2004, 3, 31).prev_month end diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb index 4780760a19..eba8170cda 100644 --- a/activesupport/test/core_ext/date_time_ext_test.rb +++ b/activesupport/test/core_ext/date_time_ext_test.rb @@ -275,12 +275,12 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase end def test_current_without_time_zone - assert DateTime.current.is_a?(DateTime) + assert_kind_of DateTime, DateTime.current end def test_current_with_time_zone with_env_tz 'US/Eastern' do - assert DateTime.current.is_a?(DateTime) + assert_kind_of DateTime, DateTime.current end end diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb index 6530de1ef4..05f529dc7d 100644 --- a/activesupport/test/core_ext/duration_test.rb +++ b/activesupport/test/core_ext/duration_test.rb @@ -5,8 +5,8 @@ class DurationTest < ActiveSupport::TestCase def test_is_a d = 1.day assert d.is_a?(ActiveSupport::Duration) - assert d.is_a?(Numeric) - assert d.is_a?(Fixnum) + assert_kind_of Numeric, d + assert_kind_of Fixnum, d assert !d.is_a?(Hash) k = Class.new diff --git a/activesupport/test/core_ext/module/attribute_accessor_test.rb b/activesupport/test/core_ext/module/attribute_accessor_test.rb index 263e78feaa..67fcd437d0 100644 --- a/activesupport/test/core_ext/module/attribute_accessor_test.rb +++ b/activesupport/test/core_ext/module/attribute_accessor_test.rb @@ -27,14 +27,14 @@ class ModuleAttributeAccessorTest < Test::Unit::TestCase end def test_should_not_create_instance_writer - assert @module.respond_to?(:foo) - assert @module.respond_to?(:foo=) - assert @object.respond_to?(:bar) + assert_respond_to @module, :foo + assert_respond_to @module, :foo= + assert_respond_to @object, :bar assert !@object.respond_to?(:bar=) end def test_should_not_create_instance_reader - assert @module.respond_to?(:shaq) + assert_respond_to @module, :shaq assert !@object.respond_to?(:shaq) end end diff --git a/activesupport/test/core_ext/module/synchronization_test.rb b/activesupport/test/core_ext/module/synchronization_test.rb index 43d65ab249..eb850893f0 100644 --- a/activesupport/test/core_ext/module/synchronization_test.rb +++ b/activesupport/test/core_ext/module/synchronization_test.rb @@ -16,8 +16,8 @@ class SynchronizationTest < Test::Unit::TestCase attr_accessor :value synchronize :value, :with => :mutex end - assert @instance.respond_to?(:value_with_synchronization) - assert @instance.respond_to?(:value_without_synchronization) + assert_respond_to @instance, :value_with_synchronization + assert_respond_to @instance, :value_without_synchronization end def test_synchronize_does_not_change_behavior @@ -81,7 +81,7 @@ class SynchronizationTest < Test::Unit::TestCase class << @target synchronize :to_s, :with => :mutex end - assert @target.respond_to?(:to_s_without_synchronization) + assert_respond_to @target, :to_s_without_synchronization assert_nothing_raised { @target.to_s; @target.to_s } assert_equal 2, @target.mutex.sync_count end diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb index 1712b0649b..39ee0ac748 100644 --- a/activesupport/test/core_ext/module_test.rb +++ b/activesupport/test/core_ext/module_test.rb @@ -225,7 +225,7 @@ class MethodAliasingTest < Test::Unit::TestCase FooClassWithBarMethod.class_eval { include BarMethodAliaser } feature_aliases.each do |method| - assert @instance.respond_to?(method) + assert_respond_to @instance, method end assert_equal 'bar_with_baz', @instance.bar @@ -242,7 +242,7 @@ class MethodAliasingTest < Test::Unit::TestCase include BarMethodAliaser alias_method_chain :quux!, :baz end - assert @instance.respond_to?(:quux_with_baz!) + assert_respond_to @instance, :quux_with_baz! assert_equal 'quux_with_baz', @instance.quux! assert_equal 'quux', @instance.quux_without_baz! @@ -260,9 +260,9 @@ class MethodAliasingTest < Test::Unit::TestCase assert !@instance.respond_to?(:quux_with_baz=) FooClassWithBarMethod.class_eval { include BarMethodAliaser } - assert @instance.respond_to?(:quux_with_baz!) - assert @instance.respond_to?(:quux_with_baz?) - assert @instance.respond_to?(:quux_with_baz=) + assert_respond_to @instance, :quux_with_baz! + assert_respond_to @instance, :quux_with_baz? + assert_respond_to @instance, :quux_with_baz= FooClassWithBarMethod.alias_method_chain :quux!, :baz diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index 97b08da0e4..ea21e445e2 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -117,7 +117,7 @@ class StringInflectionsTest < Test::Unit::TestCase assert_equal Time.local(2005, 2, 27, 23, 50, 19, 275038), "2005-02-27T23:50:19.275038".to_time(:local) assert_equal DateTime.civil(2039, 2, 27, 23, 50), "2039-02-27 23:50".to_time assert_equal Time.local_time(2039, 2, 27, 23, 50), "2039-02-27 23:50".to_time(:local) - assert_equal nil, "".to_time + assert_nil "".to_time end def test_string_to_datetime @@ -125,12 +125,12 @@ class StringInflectionsTest < Test::Unit::TestCase assert_equal 0, "2039-02-27 23:50".to_datetime.offset # use UTC offset assert_equal ::Date::ITALY, "2039-02-27 23:50".to_datetime.start # use Ruby's default start value assert_equal DateTime.civil(2039, 2, 27, 23, 50, 19 + Rational(275038, 1000000), "-04:00"), "2039-02-27T23:50:19.275038-04:00".to_datetime - assert_equal nil, "".to_datetime + assert_nil "".to_datetime end def test_string_to_date assert_equal Date.new(2005, 2, 27), "2005-02-27".to_date - assert_equal nil, "".to_date + assert_nil "".to_date end def test_access @@ -224,7 +224,7 @@ class CoreExtStringMultibyteTest < ActiveSupport::TestCase BYTE_STRING = "\270\236\010\210\245" def test_core_ext_adds_mb_chars - assert UNICODE_STRING.respond_to?(:mb_chars) + assert_respond_to UNICODE_STRING, :mb_chars end def test_string_should_recognize_utf8_strings @@ -236,20 +236,20 @@ class CoreExtStringMultibyteTest < ActiveSupport::TestCase if RUBY_VERSION < '1.9' def test_mb_chars_returns_self_when_kcode_not_set with_kcode('none') do - assert UNICODE_STRING.mb_chars.kind_of?(String) + assert_kind_of String, UNICODE_STRING.mb_chars end end def test_mb_chars_returns_an_instance_of_the_chars_proxy_when_kcode_utf8 with_kcode('UTF8') do - assert UNICODE_STRING.mb_chars.kind_of?(ActiveSupport::Multibyte.proxy_class) + assert_kind_of ActiveSupport::Multibyte.proxy_class, UNICODE_STRING.mb_chars end end end if RUBY_VERSION >= '1.9' def test_mb_chars_returns_string - assert UNICODE_STRING.mb_chars.kind_of?(String) + assert_kind_of String, UNICODE_STRING.mb_chars end end end @@ -439,6 +439,14 @@ class OutputSafetyTest < ActiveSupport::TestCase test 'emits normal string yaml' do assert_equal 'foo'.to_yaml, 'foo'.html_safe.to_yaml(:foo => 1) end + + test 'knows whether it is encoding aware' do + if RUBY_VERSION >= "1.9" + assert 'ruby'.encoding_aware? + else + assert !'ruby'.encoding_aware? + end + end end class StringExcludeTest < ActiveSupport::TestCase diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb index 30ee1d1652..1cf84df386 100644 --- a/activesupport/test/core_ext/time_ext_test.rb +++ b/activesupport/test/core_ext/time_ext_test.rb @@ -166,10 +166,6 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase # assert_equal Time.local(2182,6,5,10), Time.local(2005,6,5,10,0,0).years_since(177) end - def test_last_year_is_deprecated - assert_deprecated { Time.now.last_year } - end - def test_prev_year assert_equal Time.local(2004,6,5,10), Time.local(2005,6,5,10,0,0).prev_year end @@ -619,10 +615,6 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase assert_equal Time.local(2005, 9, 30), Time.local(2005, 8, 31).next_month end - def test_last_month_is_deprecated - assert_deprecated { Time.now.last_month } - end - def test_prev_month_on_31st assert_equal Time.local(2004, 2, 29), Time.local(2004, 3, 31).prev_month end diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index a808a25821..77b1893f77 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -279,13 +279,13 @@ class TimeWithZoneTest < Test::Unit::TestCase def test_to_f result = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), ActiveSupport::TimeZone['Hawaii'] ).to_f assert_equal 946684800.0, result - assert result.is_a?(Float) + assert_kind_of Float, result end def test_to_i result = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), ActiveSupport::TimeZone['Hawaii'] ).to_i assert_equal 946684800, result - assert result.is_a?(Integer) + assert_kind_of Integer, result end def test_to_i_with_wrapped_datetime @@ -324,9 +324,9 @@ class TimeWithZoneTest < Test::Unit::TestCase end def test_is_a - assert @twz.is_a?(Time) - assert @twz.kind_of?(Time) - assert @twz.is_a?(ActiveSupport::TimeWithZone) + assert_kind_of Time, @twz + assert_kind_of Time, @twz + assert ActiveSupport::TimeWithZone, @twz end def test_class_name @@ -830,7 +830,7 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase assert_raise(TZInfo::InvalidTimezoneIdentifier) { Time.zone.utc_offset } Time.zone = -15.hours - assert_equal nil, Time.zone + assert_nil Time.zone end def test_current_returns_time_now_when_zone_default_not_set diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb index caf50aa1c9..f15b1351f7 100644 --- a/activesupport/test/multibyte_chars_test.rb +++ b/activesupport/test/multibyte_chars_test.rb @@ -31,12 +31,12 @@ class MultibyteCharsTest < Test::Unit::TestCase end def test_forwarded_method_calls_should_return_new_chars_instance - assert @chars.__method_for_multibyte_testing.kind_of?(@proxy_class) + assert_kind_of @proxy_class, @chars.__method_for_multibyte_testing assert_not_equal @chars.object_id, @chars.__method_for_multibyte_testing.object_id end def test_forwarded_bang_method_calls_should_return_the_original_chars_instance - assert @chars.__method_for_multibyte_testing!.kind_of?(@proxy_class) + assert_kind_of @proxy_class, @chars.__method_for_multibyte_testing! assert_equal @chars.object_id, @chars.__method_for_multibyte_testing!.object_id end @@ -114,7 +114,7 @@ class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase if RUBY_VERSION < '1.9' def test_split_should_return_an_array_of_chars_instances @chars.split(//).each do |character| - assert character.kind_of?(ActiveSupport::Multibyte.proxy_class) + assert_kind_of ActiveSupport::Multibyte.proxy_class, character end end diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb index 516da7a14c..620623b389 100644 --- a/activesupport/test/time_zone_test.rb +++ b/activesupport/test/time_zone_test.rb @@ -22,7 +22,7 @@ class TimeZoneTest < Test::Unit::TestCase ActiveSupport::TimeZone::MAPPING.keys.each do |name| define_method("test_map_#{name.downcase.gsub(/[^a-z]/, '_')}_to_tzinfo") do zone = ActiveSupport::TimeZone[name] - assert zone.tzinfo.respond_to?(:period_for_local) + assert_respond_to zone.tzinfo, :period_for_local end end |