diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-07-24 01:01:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 01:01:25 -0400 |
| commit | 57a103c393361a139c7d5ae760dc611dcc470e6f (patch) | |
| tree | f1cc5fe1a6e3cb893bf99033d406354b5e95b686 /activesupport/lib | |
| parent | 934327e14ee107d531c8a48e297f74a5cd5eb8bb (diff) | |
| parent | f51cf2e4b558787e6027b63d1ad051d553dfc80f (diff) | |
| download | rails-57a103c393361a139c7d5ae760dc611dcc470e6f.tar.gz rails-57a103c393361a139c7d5ae760dc611dcc470e6f.tar.bz2 rails-57a103c393361a139c7d5ae760dc611dcc470e6f.zip | |
Merge pull request #29860 from georgeclaghorn/travel-back-automatically
Remove time stubs after each test
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/testing/time_helpers.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/time_helpers.rb b/activesupport/lib/active_support/testing/time_helpers.rb index b529592910..fa5f46736c 100644 --- a/activesupport/lib/active_support/testing/time_helpers.rb +++ b/activesupport/lib/active_support/testing/time_helpers.rb @@ -51,8 +51,14 @@ module ActiveSupport # Contains helpers that help you test passage of time. module TimeHelpers + def after_teardown + travel_back + super + end + # Changes current time to the time in the future or in the past by a given time difference by - # stubbing +Time.now+, +Date.today+, and +DateTime.now+. + # stubbing +Time.now+, +Date.today+, and +DateTime.now+. The stubs are automatically removed + # at the end of the test. # # Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00 # travel 1.day @@ -74,6 +80,7 @@ module ActiveSupport # Changes current time to the given time by stubbing +Time.now+, # +Date.today+, and +DateTime.now+ to return the time or date passed into this method. + # The stubs are automatically removed at the end of the test. # # Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00 # travel_to Time.zone.local(2004, 11, 24, 01, 04, 44) |