diff options
Diffstat (limited to 'activerecord/test/mixin_test.rb')
| -rw-r--r-- | activerecord/test/mixin_test.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/activerecord/test/mixin_test.rb b/activerecord/test/mixin_test.rb index f8d9edc646..d2118e6764 100644 --- a/activerecord/test/mixin_test.rb +++ b/activerecord/test/mixin_test.rb @@ -78,10 +78,17 @@ class TouchTest < Test::Unit::TestCase def test_create_turned_off Mixin.record_timestamps = false - assert_nil mixins(:set_1).updated_at - mixins(:set_1).save - assert_nil mixins(:set_1).updated_at + mixin = Mixin.new + assert_nil mixin.updated_at + mixin.save + assert_nil mixin.updated_at + + # Make sure Mixin.record_timestamps gets reset, even if this test fails, + # so that other tests do not fail because Mixin.record_timestamps == false + rescue Exception => e + raise e + ensure Mixin.record_timestamps = true end |