Merge pull request #207 from azranel/add_unfreeze_alias

Timecop#unfreeze - Add alias for Timecop#return
travisjeffery · Sep 10, 2019 · d860c3f · d860c3f
2 parents 736c647 + 6fe3c70
commit d860c3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/timecop/timecop.rb b/lib/timecop/timecop.rb
@@ -93,6 +93,7 @@ def return(&block)
         nil
       end
     end
+    alias :unfreeze :return
 
     def return_to_baseline
       instance.send(:return_to_baseline)

diff --git a/test/timecop_test.rb b/test/timecop_test.rb
@@ -37,6 +37,12 @@ def test_freeze_then_return_unsets_mock_time
     assert_nil Time.send(:mock_time)
   end
 
+  def test_freeze_then_unfreeze_unsets_mock_time
+    Timecop.freeze(1)
+    Timecop.unfreeze
+    assert_nil Time.send(:mock_time)
+  end
+
   def test_travel_then_return_unsets_mock_time
     Timecop.travel(1)
     Timecop.return
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,6 +93,7 @@ def return(&block) @@
             nil
           end
         end
+        alias :unfreeze :return
         def return_to_baseline
           instance.send(:return_to_baseline)
@@ Expand Down @@