aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-05-06 11:39:32 -0500
committerVipul A M <vipulnsward@gmail.com>2016-07-02 15:09:34 -0700
commit919e7053622422d4a653f43b57da5a4179d5bbb2 (patch)
treec210813493a325f8e66c2b42fdea7f4e70175d37 /activerecord
parent173bf3506d99c0767a41d30fbe4d306201369194 (diff)
downloadrails-919e7053622422d4a653f43b57da5a4179d5bbb2.tar.gz
rails-919e7053622422d4a653f43b57da5a4179d5bbb2.tar.bz2
rails-919e7053622422d4a653f43b57da5a4179d5bbb2.zip
`travel/travel_to` travel time helpers, now raise on nested calls,
as this can lead to confusing time stubbing. Instead of: travel_to 2.days.from_now do # 2 days from today travel_to 3.days.from_now do # 5 days from today end end preferred way to achieve above is: travel_to 2.days.from_now # 2 days from today travel_back travel_to 5.days.from_now # 5 days from today Closes #24690 Fixes #24689
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/mixin_test.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/activerecord/test/cases/mixin_test.rb b/activerecord/test/cases/mixin_test.rb
index 7ebdcac711..06af75af0f 100644
--- a/activerecord/test/cases/mixin_test.rb
+++ b/activerecord/test/cases/mixin_test.rb
@@ -41,13 +41,12 @@ class TouchTest < ActiveRecord::TestCase
old_updated_at = stamped.updated_at
- travel 5.minutes do
- stamped.lft_will_change!
- stamped.save
+ travel 5.minutes
+ stamped.lft_will_change!
+ stamped.save
- assert_equal Time.now, stamped.updated_at
- assert_equal old_updated_at, stamped.created_at
- end
+ assert_equal Time.now, stamped.updated_at
+ assert_equal old_updated_at, stamped.created_at
end
def test_create_turned_off