From 7abb6e00c0f1d6cc98b10b0e7620dfb9786449a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 29 Jan 2014 22:41:30 -0200
Subject: [PATCH] Remove automatic removal of Date/Time stubs after each test
 case

This behavior is only work out-of-box with minitest and also add a
downside to run after each test case, even if we don't used the travel
or travel_to methods
---
 activerecord/test/cases/mixin_test.rb                 |  6 +++++-
 activesupport/CHANGELOG.md                            |  8 ++++++++
 .../lib/active_support/testing/time_helpers.rb        | 11 ++---------
 activesupport/test/test_test.rb                       |  4 ++++
 activesupport/test/time_zone_test.rb                  |  3 +++
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/activerecord/test/cases/mixin_test.rb b/activerecord/test/cases/mixin_test.rb
index ad0d5cce27..7ddb2bfee1 100644
--- a/activerecord/test/cases/mixin_test.rb
+++ b/activerecord/test/cases/mixin_test.rb
@@ -6,10 +6,14 @@ end
 class TouchTest < ActiveRecord::TestCase
   fixtures :mixins
 
-  def setup
+  setup do
     travel_to Time.now
   end
 
+  teardown do
+    travel_back
+  end
+
   def test_update
     stamped = Mixin.new
 
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index eecb13207c..17890b2668 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,11 @@
+*   Remove behavior that automatically remove the Date/Time stubs, added by `travel`
+    and `travel_to` methods, after each test case.
+
+    Now users have to use the `travel_back` or the block version of `travel` and
+    `travel_to` methods to clean the stubs.
+
+    *Rafael Mendonça França*
+
 *   Add `travel_back` to remove stubs from `travel` and `travel_to`.
 
     *Rafael Mendonça França*
diff --git a/activesupport/lib/active_support/testing/time_helpers.rb b/activesupport/lib/active_support/testing/time_helpers.rb
index b183b8d8ef..4c6bca5ada 100644
--- a/activesupport/lib/active_support/testing/time_helpers.rb
+++ b/activesupport/lib/active_support/testing/time_helpers.rb
@@ -41,14 +41,8 @@ module ActiveSupport
 
     # Containing helpers that helps you test passage of time.
     module TimeHelpers
-      def after_teardown #:nodoc:
-        travel_back
-        super
-      end
-
       # Change current time to the time in the future or in the past by a given time difference by
-      # stubbing +Time.now+ and +Date.today+. Note that the stubs are automatically removed
-      # at the end of each test.
+      # stubbing +Time.now+ and +Date.today+.
       #
       #   Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
       #   travel 1.day
@@ -68,8 +62,7 @@ module ActiveSupport
       end
 
       # Change current time to the given time by stubbing +Time.now+ and +Date.today+ to return the
-      # time or date passed into this method. Note that the stubs are automatically removed
-      # at the end of each test.
+      # time or date passed into this method.
       #
       #   Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
       #   travel_to Time.new(2004, 11, 24, 01, 04, 44)
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index 1e539d8d06..0fa08c0e3a 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -162,6 +162,10 @@ class TimeHelperTest < ActiveSupport::TestCase
     Time.stubs now: Time.now
   end
 
+  teardown do
+    travel_back
+  end
+
   def test_time_helper_travel
     expected_time = Time.now + 1.day
     travel 1.day
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index 1107b48460..cd79efbe8c 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -97,6 +97,7 @@ class TimeZoneTest < ActiveSupport::TestCase
     assert_equal Date.new(2000, 1, 1), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
     travel_to(Time.utc(2000, 1, 2, 5)) # midnight Jan 2 EST
     assert_equal Date.new(2000, 1, 2), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
+    travel_back
   end
 
   def test_tomorrow
@@ -108,6 +109,7 @@ class TimeZoneTest < ActiveSupport::TestCase
     assert_equal Date.new(2000, 1, 2), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].tomorrow
     travel_to(Time.utc(2000, 1, 2, 5)) # midnight Jan 2 EST
     assert_equal Date.new(2000, 1, 3), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].tomorrow
+    travel_back
   end
 
   def test_yesterday
@@ -119,6 +121,7 @@ class TimeZoneTest < ActiveSupport::TestCase
     assert_equal Date.new(1999, 12, 31), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].yesterday
     travel_to(Time.utc(2000, 1, 2, 5)) # midnight Jan 2 EST
     assert_equal Date.new(2000, 1, 1), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].yesterday
+    travel_back
   end
 
   def test_local