Merge pull request rails#49711 from fatkodima/fix-time-travel-helpers-for-separate-object

Fix time travel helpers to work when nested using with separate classes

Author: rafaelfranca

activesupport/lib/active_support/testing/time_helpers.rb

@@ -25,7 +25,7 @@ def stub_object(object, method_name, &block)
           unstub_object(stub)
         end
 
-        new_name = "__simple_stub__#{method_name}"
+        new_name = "__simple_stub__#{method_name}__#{object_id}"
 
         @stubs[object.object_id][method_name] = Stub.new(object, method_name, new_name)
 

activesupport/test/time_travel_test.rb

@@ -13,6 +13,18 @@ class TimeSubclass < ::Time; end
   class DateSubclass < ::Date; end
   class DateTimeSubclass < ::DateTime; end
 
+  class TravelClass
+    include ActiveSupport::Testing::TimeHelpers
+
+    def travel_to_no_block(date)
+      travel_to(date)
+    end
+
+    def travel_to_block(date)
+      travel_to(date) { }
+    end
+  end
+
   def test_time_helper_travel
     Time.stub(:now, Time.now) do
       expected_time = Time.now + 1.day
@@ -124,6 +136,31 @@ def test_time_helper_travel_to_with_string_for_time_zone
     end
   end
 
+  def test_time_helper_travel_to_with_separate_class
+    travel_object = TravelClass.new
+    date1 = Date.new(2004, 11, 24)
+    date2 = Date.new(2005, 11, 24)
+
+    Time.stub(:now, now = Time.now) do
+      travel_to(date1) do
+        travel_object.travel_to_no_block(date2)
+      end
+      assert_equal now, Time.now
+
+      travel_to(date1) do
+        travel_object.travel_to_no_block(date2)
+        assert_equal date2, Date.today
+      end
+      assert_equal now, Time.now
+
+      travel_to(date1) do
+        travel_object.travel_to_block(date2)
+        assert_equal date1, Date.today
+      end
+      assert_equal now, Time.now
+    end
+  end
+
   def test_time_helper_travel_back
     Time.stub(:now, Time.now) do
       expected_time = Time.new(2004, 11, 24, 1, 4, 44)