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]

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