aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/transactions_test.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 3c6bfd7e22..069ba9d6c5 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -215,7 +215,7 @@ class TransactionTest < ActiveRecord::TestCase
def test_invalid_keys_for_transaction
assert_raises ArgumentError do
- Topic.transaction :forced => true do
+ Topic.transaction :nested => true do
end
end
end
@@ -228,7 +228,7 @@ class TransactionTest < ActiveRecord::TestCase
@second.save!
begin
- Topic.transaction :force => true do
+ Topic.transaction :nest => true do
@first.happy = false
@first.save!
raise
@@ -268,17 +268,17 @@ class TransactionTest < ActiveRecord::TestCase
@first.save!
begin
- Topic.transaction :force => true do
+ Topic.transaction :nest => true do
@first.content = "Two"
@first.save!
begin
- Topic.transaction :force => true do
+ Topic.transaction :nest => true do
@first.content = "Three"
@first.save!
begin
- Topic.transaction :force => true do
+ Topic.transaction :nest => true do
@first.content = "Four"
@first.save!
raise