Make sure the time method is unstubed

The minitest stubs were conflicting with the time travel stubs so the
travel_back method call in the teardown block was actually keeping the
time stubbed.

1 files changed, 41 insertions, 29 deletions

diff --git a/activesupport/test/time_travel_test.rb b/activesupport/test/time_travel_test.rb
index e9f87bdf82..e75237e5a4 100644
--- a/activesupport/test/time_travel_test.rb
+++ b/activesupport/test/time_travel_test.rb
@@ -3,18 +3,18 @@ require 'active_support/core_ext/date_time'
 require 'active_support/core_ext/numeric/time'
 
 class TimeTravelTest < ActiveSupport::TestCase
-  teardown do
-    travel_back
-  end
-
   def test_time_helper_travel
     Time.stub(:now, Time.now) do
-      expected_time = Time.now + 1.day
-      travel 1.day
+      begin
+        expected_time = Time.now + 1.day
+        travel 1.day
 
-      assert_equal expected_time.to_s(:db), Time.now.to_s(:db)
-      assert_equal expected_time.to_date, Date.today
-      assert_equal expected_time.to_datetime.to_s(:db), DateTime.now.to_s(:db)
+        assert_equal expected_time.to_s(:db), Time.now.to_s(:db)
+        assert_equal expected_time.to_date, Date.today
+        assert_equal expected_time.to_datetime.to_s(:db), DateTime.now.to_s(:db)
+      ensure
+        travel_back
+      end
     end
   end
 
@@ -36,12 +36,16 @@ class TimeTravelTest < ActiveSupport::TestCase
 
   def test_time_helper_travel_to
     Time.stub(:now, Time.now) do
-      expected_time = Time.new(2004, 11, 24, 01, 04, 44)
-      travel_to expected_time
+      begin
+        expected_time = Time.new(2004, 11, 24, 01, 04, 44)
+        travel_to expected_time
 
-      assert_equal expected_time, Time.now
-      assert_equal Date.new(2004, 11, 24), Date.today
-      assert_equal expected_time.to_datetime, DateTime.now
+        assert_equal expected_time, Time.now
+        assert_equal Date.new(2004, 11, 24), Date.today
+        assert_equal expected_time.to_datetime, DateTime.now
+      ensure
+        travel_back
+      end
     end
   end
 
@@ -63,17 +67,21 @@ class TimeTravelTest < ActiveSupport::TestCase
 
   def test_time_helper_travel_back
     Time.stub(:now, Time.now) do
-      expected_time = Time.new(2004, 11, 24, 01, 04, 44)
+      begin
+        expected_time = Time.new(2004, 11, 24, 01, 04, 44)
 
-      travel_to expected_time
-      assert_equal expected_time, Time.now
-      assert_equal Date.new(2004, 11, 24), Date.today
-      assert_equal expected_time.to_datetime, DateTime.now
-      travel_back
+        travel_to expected_time
+        assert_equal expected_time, Time.now
+        assert_equal Date.new(2004, 11, 24), Date.today
+        assert_equal expected_time.to_datetime, DateTime.now
+        travel_back
 
-      assert_not_equal expected_time, Time.now
-      assert_not_equal Date.new(2004, 11, 24), Date.today
-      assert_not_equal expected_time.to_datetime, DateTime.now
+        assert_not_equal expected_time, Time.now
+        assert_not_equal Date.new(2004, 11, 24), Date.today
+        assert_not_equal expected_time.to_datetime, DateTime.now
+      ensure
+        travel_back
+      end
     end
   end
 
@@ -107,14 +115,18 @@ class TimeTravelTest < ActiveSupport::TestCase
 
   def test_time_helper_travel_to_with_subsequent_calls
     Time.stub(:now, Time.now) do
-      initial_expected_time = Time.new(2004, 11, 24, 01, 04, 44)
-      subsequent_expected_time = Time.new(2004, 10, 24, 01, 04, 44)
-      assert_nothing_raised do
-        travel_to initial_expected_time
-        travel_to subsequent_expected_time
+      begin
+        initial_expected_time = Time.new(2004, 11, 24, 01, 04, 44)
+        subsequent_expected_time = Time.new(2004, 10, 24, 01, 04, 44)
+        assert_nothing_raised do
+          travel_to initial_expected_time
+          travel_to subsequent_expected_time
 
-        assert_equal subsequent_expected_time, Time.now
+          assert_equal subsequent_expected_time, Time.now
 
+          travel_back
+        end
+      ensure
         travel_back
       end
     end