diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-10 13:36:09 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-10 13:39:37 -0800 |
commit | ab0ce052ba23a4cce7a84ecade0d00d9cc518ebd (patch) | |
tree | 431f973e36b90deaf1c78aaa7a0ee139a4336469 /activerecord/test/cases | |
parent | 223a1d9451c88800e9fcc93a726fdebec99e2650 (diff) | |
download | rails-ab0ce052ba23a4cce7a84ecade0d00d9cc518ebd.tar.gz rails-ab0ce052ba23a4cce7a84ecade0d00d9cc518ebd.tar.bz2 rails-ab0ce052ba23a4cce7a84ecade0d00d9cc518ebd.zip |
Introduce transaction_joinable flag to mark that the fixtures transaction can't joined, a new savepoint is required even if :requires_new is not set. Use :requires_new option instead of :nest. Update changelog.
[#383 state:committed]
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/transactions_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index 0c69fee8f2..f07fad1828 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -228,7 +228,7 @@ class TransactionTest < ActiveRecord::TestCase @second.save! begin - Topic.transaction :nest => true do + Topic.transaction :requires_new => true do @first.happy = false @first.save! raise @@ -268,17 +268,17 @@ class TransactionTest < ActiveRecord::TestCase @first.save! begin - Topic.transaction :nest => true do + Topic.transaction :requires_new => true do @first.content = "Two" @first.save! begin - Topic.transaction :nest => true do + Topic.transaction :requires_new => true do @first.content = "Three" @first.save! begin - Topic.transaction :nest => true do + Topic.transaction :requires_new => true do @first.content = "Four" @first.save! raise |