Return to previous date after block when in threadsafe mode

mick-t · Feb 5, 2021 · e75a43c · e75a43c
1 parent 589e515
commit e75a43c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/timecop/timecop.rb b/lib/timecop/timecop.rb
@@ -200,7 +200,7 @@ def travel(mock_type, *args, &block) #:nodoc:
       begin
         yield stack_item.time
       ensure
-        @stack.replace stack_backup
+        stack.replace stack_backup
         @safe = safe_backup
       end
     end

diff --git a/test/timecop_test.rb b/test/timecop_test.rb
@@ -550,7 +550,7 @@ def test_not_frozen_after_return
     assert !Timecop.frozen?
   end
 
-  def test_thread_safe_timecop
+  def test_thread_safe_timecop_in_parallel
     Timecop.thread_safe = true
     date = Time.local(2011, 01, 02)
     thread = Thread.new do
@@ -567,6 +567,16 @@ def test_thread_safe_timecop
     Timecop.thread_safe = false
   end
 
+  def test_thread_safe_timecop_returns_after_block
+    Timecop.thread_safe = true
+    date = Time.local(2017, 10, 8)
+
+    Timecop.freeze(date) { }
+    assert Time.now != date
+  ensure
+    Timecop.thread_safe = false
+  end
+
   private
 
   def with_safe_mode(enabled=true)