diff options
| author | Willian Gustavo Veiga <beberveiga@gmail.com> | 2018-10-02 12:55:36 -0300 |
|---|---|---|
| committer | Willian Gustavo Veiga <beberveiga@gmail.com> | 2018-10-02 12:57:37 -0300 |
| commit | 2d4df1349efdf8dd2c8cc4503fd5a871b0066500 (patch) | |
| tree | 9f71a297cf1bb30f1d59039997a60f97357d0782 /activesupport/lib/active_support/testing/time_helpers.rb | |
| parent | 00c50c2b5966fa1d719c8a58564811c672a0e8c6 (diff) | |
| parent | cf608ee34dd833b0357ef4eefa692db33242d2aa (diff) | |
| download | rails-2d4df1349efdf8dd2c8cc4503fd5a871b0066500.tar.gz rails-2d4df1349efdf8dd2c8cc4503fd5a871b0066500.tar.bz2 rails-2d4df1349efdf8dd2c8cc4503fd5a871b0066500.zip | |
Merge branch 'master' into feature/reselect-method
Diffstat (limited to 'activesupport/lib/active_support/testing/time_helpers.rb')
| -rw-r--r-- | activesupport/lib/active_support/testing/time_helpers.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/time_helpers.rb b/activesupport/lib/active_support/testing/time_helpers.rb index 801ea2909b..f160e66971 100644 --- a/activesupport/lib/active_support/testing/time_helpers.rb +++ b/activesupport/lib/active_support/testing/time_helpers.rb @@ -158,7 +158,7 @@ module ActiveSupport end # Returns the current time back to its original state, by removing the stubs added by - # +travel+ and +travel_to+. + # +travel+, +travel_to+, and +freeze_time+. # # Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00 # travel_to Time.zone.local(2004, 11, 24, 01, 04, 44) @@ -168,6 +168,7 @@ module ActiveSupport def travel_back simple_stubs.unstub_all! end + alias_method :unfreeze_time, :travel_back # Calls +travel_to+ with +Time.now+. # |