From 5d037819ca80606638212f83de741cc2041db28f Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Tue, 18 Feb 2014 10:22:43 +0100 Subject: travel_to travels back and re-raises if the block raises --- activesupport/lib/active_support/testing/time_helpers.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'activesupport/lib/active_support') diff --git a/activesupport/lib/active_support/testing/time_helpers.rb b/activesupport/lib/active_support/testing/time_helpers.rb index b36f3cf94c..eefa84262e 100644 --- a/activesupport/lib/active_support/testing/time_helpers.rb +++ b/activesupport/lib/active_support/testing/time_helpers.rb @@ -10,7 +10,7 @@ module ActiveSupport def stub_object(object, method_name, return_value) key = [object.object_id, method_name] - if (stub = @stubs[key]) + if stub = @stubs[key] unstub_object(stub) end @@ -97,8 +97,11 @@ module ActiveSupport simple_stubs.stub_object(Date, :today, now.to_date) if block_given? - block.call - travel_back + begin + block.call + ensure + travel_back + end end end -- cgit v1.2.3