From 5d037819ca80606638212f83de741cc2041db28f Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Tue, 18 Feb 2014 10:22:43 +0100
Subject: travel_to travels back and re-raises if the block raises

---
 activesupport/test/time_zone_test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'activesupport/test/time_zone_test.rb')

diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index 9fa2f45de5..79ec57af2b 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -138,6 +138,18 @@ class TimeZoneTest < ActiveSupport::TestCase
     end
   end
 
+  def test_travel_to_travels_back_and_reraises_if_the_block_raises
+    ts = Time.current - 1.second
+
+    travel_to ts do
+      raise
+    end
+
+    flunk # ensure travel_to re-raises
+  rescue
+    assert_not_equal ts, Time.current
+  end
+
   def test_local
     time = ActiveSupport::TimeZone["Hawaii"].local(2007, 2, 5, 15, 30, 45)
     assert_equal Time.utc(2007, 2, 5, 15, 30, 45), time.time
-- 
cgit v1.2.3