diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-07-05 20:26:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 20:26:24 +0200 |
| commit | 2dfb06a9b5a5d29354a20b9527941910e8467636 (patch) | |
| tree | a12d2c124cbdf14dee78035318a1aa3fc4ab2467 /activerecord/test/cases | |
| parent | 55c7de37a618ac68936365657160260150db907d (diff) | |
| parent | 919e7053622422d4a653f43b57da5a4179d5bbb2 (diff) | |
| download | rails-2dfb06a9b5a5d29354a20b9527941910e8467636.tar.gz rails-2dfb06a9b5a5d29354a20b9527941910e8467636.tar.bz2 rails-2dfb06a9b5a5d29354a20b9527941910e8467636.zip | |
Merge pull request #24890 from vipulnsward/travel-to-raise
`travel/travel_to` travel time helpers, now raise on nested calls
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/mixin_test.rb | 11 |
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 |