diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-01 23:00:22 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-07-01 23:00:22 -0700 |
| commit | 20b3704524d5f57b4ad51c6278519ad65a7a7e64 (patch) | |
| tree | f4ab2d3a3bd9318f822d5bf6f8742fadf39b3d6a | |
| parent | ac54b2e85ddeeef18b6c0ecee3b8b60025ed6416 (diff) | |
| parent | 4bec1da79b337c26fac188c6fa10aec4f553b612 (diff) | |
| download | rails-20b3704524d5f57b4ad51c6278519ad65a7a7e64.tar.gz rails-20b3704524d5f57b4ad51c6278519ad65a7a7e64.tar.bz2 rails-20b3704524d5f57b4ad51c6278519ad65a7a7e64.zip | |
Merge pull request #11236 from vipulnsward/deprecate_date_to_time_in_current_zone
Remove deprecated `Date#to_time_in_current_zone`
| -rw-r--r-- | activesupport/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date/zones.rb | 15 | ||||
| -rw-r--r-- | activesupport/test/core_ext/date_ext_test.rb | 7 |
3 files changed, 4 insertions, 22 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index d4679eac6c..1853c6048b 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove deprecated `Date#to_time_in_current_zone` in favour of `Date#in_time_zone`. + + *Vipul A M* + * Remove deprecated `Proc#bind` with no replacement. *Carlos Antonio da Silva* diff --git a/activesupport/lib/active_support/core_ext/date/zones.rb b/activesupport/lib/active_support/core_ext/date/zones.rb index b4548671bf..538ed00406 100644 --- a/activesupport/lib/active_support/core_ext/date/zones.rb +++ b/activesupport/lib/active_support/core_ext/date/zones.rb @@ -2,21 +2,6 @@ require 'date' require 'active_support/core_ext/time/zones' class Date - # *DEPRECATED*: Use +Date#in_time_zone+ instead. - # - # Converts Date to a TimeWithZone in the current zone if <tt>Time.zone</tt> or - # <tt>Time.zone_default</tt> is set, otherwise converts Date to a Time via - # Date#to_time. - def to_time_in_current_zone - ActiveSupport::Deprecation.warn 'Date#to_time_in_current_zone is deprecated. Use Date#in_time_zone instead', caller - - if ::Time.zone - ::Time.zone.local(year, month, day) - else - to_time - end - end - # Converts Date to a TimeWithZone in the current zone if Time.zone or Time.zone_default # is set, otherwise converts Date to a Time via Date#to_time # diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb index aa5e4461fd..c32056f672 100644 --- a/activesupport/test/core_ext/date_ext_test.rb +++ b/activesupport/test/core_ext/date_ext_test.rb @@ -363,10 +363,3 @@ class DateExtBehaviorTest < ActiveSupport::TestCase end end -class DateExtConversionsTest < ActiveSupport::TestCase - def test_to_time_in_current_zone_is_deprecated - assert_deprecated(/to_time_in_current_zone/) do - Date.new(2012,6,7).to_time_in_current_zone - end - end -end |