Skip to content
Browse files

Add `travel_back` to remove stubs from `travel` and `travel_to`

  • Loading branch information...
1 parent 7f5466d commit 6b16c2788186d45c70bd1d9fc476407e3e265439 @rafaelfranca rafaelfranca committed Jan 29, 2014
View
4 activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Add `travel_back` to remove stubs from `travel` and `travel_to`.
+
+ *Rafael Mendonça França*
+
* Remove the deprecation about the `#filter` method.
Filter objects should now rely on method corresponding to the filter type
View
17 activesupport/lib/active_support/testing/time_helpers.rb
@@ -42,7 +42,7 @@ def unstub_object(stub)
# Containing helpers that helps you test passage of time.
module TimeHelpers
def after_teardown #:nodoc:
- simple_stubs.unstub_all!
+ travel_back
super
end
@@ -81,7 +81,7 @@ def travel(duration, &block)
#
# Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
# travel_to Time.new(2004, 11, 24, 01, 04, 44) do
- # User.create.created_at # => Wed, 24 Nov 2004 01:04:44 EST -05:00
+ # Time.current # => Wed, 24 Nov 2004 01:04:44 EST -05:00
# end
# Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
def travel_to(date_or_time, &block)
@@ -90,10 +90,21 @@ def travel_to(date_or_time, &block)
if block_given?
block.call
- simple_stubs.unstub_all!
+ travel_back
end
end
+ # Return the current time back to its original state.
+ #
+ # Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
+ # travel_to Time.new(2004, 11, 24, 01, 04, 44)
+ # Time.current # => Wed, 24 Nov 2004 01:04:44 EST -05:00
+ # travel_back
+ # Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
+ def travel_back
+ simple_stubs.unstub_all!
+ end
+
private
def simple_stubs
View
12 activesupport/test/test_test.rb
@@ -201,4 +201,16 @@ def test_time_helper_travel_to_with_block
assert_not_equal expected_time, Time.now
assert_not_equal Date.new(2004, 11, 24), Date.today
end
+
+ def test_time_helper_travel_back
+ expected_time = Time.new(2004, 11, 24, 01, 04, 44)
+
+ travel_to expected_time
+ assert_equal expected_time, Time.now
+ assert_equal Date.new(2004, 11, 24), Date.today
+ travel_back
+
+ assert_not_equal expected_time, Time.now
+ assert_not_equal Date.new(2004, 11, 24), Date.today
+ end
end
View
3 guides/source/4_1_release_notes.md
@@ -607,6 +607,9 @@ for detailed changes.
`Time.now` and
`Date.today`. ([Pull Request](https://github.com/rails/rails/pull/12824))
+* Added `ActiveSupport::Testing::TimeHelpers#travel_back`. This method return
+ the current time to the original state. ([Pull Request](https://github.com/rails/rails/pull/13884))
+
* Added `Numeric#in_milliseconds`, like `1.hour.in_milliseconds`, so we can feed
them to JavaScript functions like
`getTime()`. ([Commit](https://github.com/rails/rails/commit/423249504a2b468d7a273cbe6accf4f21cb0e643))

0 comments on commit 6b16c27

Please sign in to comment.
Something went wrong with that request. Please try again.