mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Make TimeWithZone#to_formatted_s an alias to TimeWithZone#to_s [#1796 state:resolved]
This commit is contained in:
committed by
Geoff Buesing
parent
5fbacde2af
commit
18d6369344
@@ -1,5 +1,7 @@
|
||||
*Edge*
|
||||
|
||||
* Make TimeWithZone#to_formatted_s an alias to TimeWithZone#to_s #1796 [Levin Alexander]
|
||||
|
||||
* Introduce Array.wrap(foo) to wrap the argument in an array unless it's already an array. Wraps nil as an empty array. Use instead of Array(foo) and foo.to_a since they treat String as Enumerable. [Jeremy Kemper]
|
||||
|
||||
|
||||
|
||||
@@ -155,6 +155,7 @@ module ActiveSupport
|
||||
"#{time.strftime("%Y-%m-%d %H:%M:%S")} #{formatted_offset(false, 'UTC')}" # mimicking Ruby 1.9 Time#to_s format
|
||||
end
|
||||
end
|
||||
alias_method :to_formatted_s, :to_s
|
||||
|
||||
# Replaces <tt>%Z</tt> and <tt>%z</tt> directives with +zone+ and +formatted_offset+, respectively, before passing to
|
||||
# Time#strftime, so that zone information is correct
|
||||
|
||||
@@ -93,6 +93,12 @@ class TimeWithZoneTest < Test::Unit::TestCase
|
||||
end
|
||||
end
|
||||
|
||||
def test_to_formatted_s
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
assert_equal '1999-12-31 19:00:00 -0500', @twz.to_formatted_s
|
||||
end
|
||||
end
|
||||
|
||||
def test_to_s_db
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
assert_equal '2000-01-01 00:00:00', @twz.to_s(:db)
|
||||
|
||||
Reference in New Issue
Block a user