Ticket #6363: disable_default_date_format.2.diff
| File disable_default_date_format.2.diff, 1.5 kB (added by mpalmer, 1 year ago) |
|---|
-
activesupport/lib/active_support/core_ext/date/conversions.rb
old new 18 18 klass.send(:alias_method, :inspect, :readable_inspect) 19 19 end 20 20 21 def to_formatted_s(format = :default) 21 def to_formatted_s(format = nil) 22 return to_default_s if format.nil? 22 23 if formatter = DATE_FORMATS[format] 23 24 if formatter.respond_to?(:call) 24 25 formatter.call(self).to_s -
activesupport/test/core_ext/date_ext_test.rb
old new 161 161 def test_end_of_day 162 162 assert_equal Time.local(2005,2,21,23,59,59), Date.new(2005,2,21).end_of_day 163 163 end 164 165 def test_to_s_with_changed_default 166 ActiveSupport::CoreExtensions::Date::Conversions::DATE_FORMATS.update( :default => '%m-%d-%Y' ) 167 ActiveSupport::CoreExtensions::Date::Conversions::DATE_FORMATS.update( nil => '%m-%d-%Y' ) 168 assert_equal '10-08-2006', Date.new(2006,10,8).to_s(:default) 169 assert_equal '2006-10-08', Date.new(2006,10,8).to_s 170 end 164 171 end
