Removed mocha stubbing in active_support

1 files changed, 18 insertions, 16 deletions

diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb
index c283b546e6..9e97acaffb 100644
--- a/activesupport/test/core_ext/duration_test.rb
+++ b/activesupport/test/core_ext/duration_test.rb
@@ -140,28 +140,30 @@ class DurationTest < ActiveSupport::TestCase
   def test_since_and_ago_anchored_to_time_now_when_time_zone_is_not_set
     Time.zone = nil
     with_env_tz 'US/Eastern' do
-      Time.stubs(:now).returns Time.local(2000)
-      # since
-      assert_not_instance_of ActiveSupport::TimeWithZone, 5.seconds.since
-      assert_equal Time.local(2000,1,1,0,0,5), 5.seconds.since
-      # ago
-      assert_not_instance_of ActiveSupport::TimeWithZone, 5.seconds.ago
-      assert_equal Time.local(1999,12,31,23,59,55), 5.seconds.ago
+      Time.stub(:now, Time.local(2000)) do
+        # since
+        assert_not_instance_of ActiveSupport::TimeWithZone, 5.seconds.since
+        assert_equal Time.local(2000,1,1,0,0,5), 5.seconds.since
+        # ago
+        assert_not_instance_of ActiveSupport::TimeWithZone, 5.seconds.ago
+        assert_equal Time.local(1999,12,31,23,59,55), 5.seconds.ago
+      end
     end
   end
 
   def test_since_and_ago_anchored_to_time_zone_now_when_time_zone_is_set
     Time.zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'US/Eastern' do
-      Time.stubs(:now).returns Time.local(2000)
-      # since
-      assert_instance_of ActiveSupport::TimeWithZone, 5.seconds.since
-      assert_equal Time.utc(2000,1,1,0,0,5), 5.seconds.since.time
-      assert_equal 'Eastern Time (US & Canada)', 5.seconds.since.time_zone.name
-      # ago
-      assert_instance_of ActiveSupport::TimeWithZone, 5.seconds.ago
-      assert_equal Time.utc(1999,12,31,23,59,55), 5.seconds.ago.time
-      assert_equal 'Eastern Time (US & Canada)', 5.seconds.ago.time_zone.name
+      Time.stub(:now, Time.local(2000)) do
+        # since
+        assert_instance_of ActiveSupport::TimeWithZone, 5.seconds.since
+        assert_equal Time.utc(2000,1,1,0,0,5), 5.seconds.since.time
+        assert_equal 'Eastern Time (US & Canada)', 5.seconds.since.time_zone.name
+        # ago
+        assert_instance_of ActiveSupport::TimeWithZone, 5.seconds.ago
+        assert_equal Time.utc(1999,12,31,23,59,55), 5.seconds.ago.time
+        assert_equal 'Eastern Time (US & Canada)', 5.seconds.ago.time_zone.name
+      end
     end
   ensure
     Time.zone = nil