Require mocha >= 0.9.0 for AS tests

1 files changed, 32 insertions, 36 deletions

diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index b53c754780..2cedf65153 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -210,50 +210,46 @@ class DateExtCalculationsTest < Test::Unit::TestCase
     end
   end
 
-  uses_mocha 'past?, today? and future?' do
-    def test_today
-      Date.stubs(:current).returns(Date.new(2000, 1, 1))
-      assert_equal false, Date.new(1999, 12, 31).today?
-      assert_equal true, Date.new(2000,1,1).today?
-      assert_equal false, Date.new(2000,1,2).today?
-    end
-    
-    def test_past
-      Date.stubs(:current).returns(Date.new(2000, 1, 1))
-      assert_equal true, Date.new(1999, 12, 31).past?
-      assert_equal false, Date.new(2000,1,1).past?
-      assert_equal false, Date.new(2000,1,2).past?
-    end
-    
-    def test_future
-      Date.stubs(:current).returns(Date.new(2000, 1, 1))
-      assert_equal false, Date.new(1999, 12, 31).future?
-      assert_equal false, Date.new(2000,1,1).future?
-      assert_equal true, Date.new(2000,1,2).future?
+  def test_today
+    Date.stubs(:current).returns(Date.new(2000, 1, 1))
+    assert_equal false, Date.new(1999, 12, 31).today?
+    assert_equal true, Date.new(2000,1,1).today?
+    assert_equal false, Date.new(2000,1,2).today?
+  end
+
+  def test_past
+    Date.stubs(:current).returns(Date.new(2000, 1, 1))
+    assert_equal true, Date.new(1999, 12, 31).past?
+    assert_equal false, Date.new(2000,1,1).past?
+    assert_equal false, Date.new(2000,1,2).past?
+  end
+
+  def test_future
+    Date.stubs(:current).returns(Date.new(2000, 1, 1))
+    assert_equal false, Date.new(1999, 12, 31).future?
+    assert_equal false, Date.new(2000,1,1).future?
+    assert_equal true, Date.new(2000,1,2).future?
+  end
+
+  def test_current_returns_date_today_when_zone_default_not_set
+    with_env_tz 'US/Central' do
+      Time.stubs(:now).returns Time.local(1999, 12, 31, 23)
+      assert_equal Date.new(1999, 12, 31), Date.today
+      assert_equal Date.new(1999, 12, 31), Date.current
     end
   end
 
-  uses_mocha 'TestDateCurrent' do
-    def test_current_returns_date_today_when_zone_default_not_set
+  def test_current_returns_time_zone_today_when_zone_default_set
+    silence_warnings do # silence warnings raised by tzinfo gem
+      Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
       with_env_tz 'US/Central' do
         Time.stubs(:now).returns Time.local(1999, 12, 31, 23)
         assert_equal Date.new(1999, 12, 31), Date.today
-        assert_equal Date.new(1999, 12, 31), Date.current
-      end
-    end
-
-    def test_current_returns_time_zone_today_when_zone_default_set
-      silence_warnings do # silence warnings raised by tzinfo gem
-        Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
-        with_env_tz 'US/Central' do
-          Time.stubs(:now).returns Time.local(1999, 12, 31, 23)
-          assert_equal Date.new(1999, 12, 31), Date.today
-          assert_equal Date.new(2000, 1, 1), Date.current
-        end
+        assert_equal Date.new(2000, 1, 1), Date.current
       end
-    ensure
-      Time.zone_default = nil
     end
+  ensure
+    Time.zone_default = nil
   end
 
   protected