Browse files

Remove deprecated `Date#to_time_in_current_zone`

  • Loading branch information...
1 parent 9aaa311 commit 4bec1da79b337c26fac188c6fa10aec4f553b612 @vipulnsward vipulnsward committed Jul 2, 2013
View
4 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*
View
15 activesupport/lib/active_support/core_ext/date/zones.rb
@@ -2,21 +2,6 @@
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
#
View
7 activesupport/test/core_ext/date_ext_test.rb
@@ -363,10 +363,3 @@ def test_can_freeze_twice
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

0 comments on commit 4bec1da

Please sign in to comment.