From 0f8d2794f229175447163d2b5e16d94d2cee5468 Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Sun, 27 Feb 2011 20:24:39 +0100
Subject: updated Time, Date and DateTime current methods in AS to use
 Time.zone and not Time.zone_default.

[#6410 state:committed]
---
 actionpack/test/template/date_helper_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 3334f4ffb0..b4eb3f76e1 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1885,7 +1885,7 @@ class DateHelperTest < ActionView::TestCase
     time = stub(:year => 2004, :month => 6, :day => 15, :hour => 16, :min => 35, :sec => 0)
     time_zone = mock()
     time_zone.expects(:now).returns time
-    Time.zone_default = time_zone
+    Time.zone = time_zone
     @post = Post.new
 
     expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
@@ -1912,7 +1912,7 @@ class DateHelperTest < ActionView::TestCase
 
     assert_dom_equal expected, datetime_select("post", "updated_at")
   ensure
-    Time.zone_default = nil
+    Time.zone = nil
   end
 
   def test_datetime_select_with_html_options_within_fields_for
-- 
cgit v1.2.3