From 998ba0e7084345a045d49a64ee9cf9d2d2441780 Mon Sep 17 00:00:00 2001 From: Bogdan Gusiev Date: Wed, 4 Dec 2013 16:16:11 +0200 Subject: Fix bugs with changed attributes tracking when transaction gets rollback --- activerecord/test/cases/transactions_test.rb | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'activerecord/test/cases/transactions_test.rb') diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index 89dab16975..4edb200b1d 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -268,6 +268,62 @@ class TransactionTest < ActiveRecord::TestCase end end + def test_dirty_state_rollback + assert !@first.approved? + Topic.transaction do + @first.approved = true + @first.save! + raise ActiveRecord::Rollback + end + assert @first.approved + assert @first.changes["approved"] + @first.save! + assert @first.reload.approved + end + + def test_dirty_state_rollback2 + assert !@first.approved? + @first.approved = true + Topic.transaction do + @first.save! + raise ActiveRecord::Rollback + end + assert @first.changes["approved"] + assert @first.approved + @first.save! + assert @first.reload.approved + end + + def test_dirty_state_rollback3 + assert !@first.approved? + @first.approved = true + @first.save! + Topic.transaction do + @first.approved = false + @first.save! + raise ActiveRecord::Rollback + end + assert !@first.approved + assert @first.changes["approved"] + @first.save! + assert !@first.reload.approved + end + + def test_dirty_state_rollback4 + assert !@first.approved? + Topic.transaction do + @first.approved = true + @first.save! + @first.approved = false + @first.save! + raise ActiveRecord::Rollback + end + assert !@first.approved + assert !@first.changes["approved"] + @first.save! + assert !@first.reload.approved + end + def test_force_savepoint_in_nested_transaction Topic.transaction do @first.approved = true -- cgit v1.2.3 From 37c238927fbed059de3f26a90d8923fb377568a5 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Wed, 7 May 2014 16:02:22 -0400 Subject: Keep track of dirty attrs after after rollback. [related #13166] --- activerecord/test/cases/transactions_test.rb | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'activerecord/test/cases/transactions_test.rb') diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index bb5548a60f..7f2e830083 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -274,7 +274,7 @@ class TransactionTest < ActiveRecord::TestCase end end - def test_dirty_state_rollback + def test_rollback_when_changing_inside_transaction assert !@first.approved? Topic.transaction do @first.approved = true @@ -287,7 +287,7 @@ class TransactionTest < ActiveRecord::TestCase assert @first.reload.approved end - def test_dirty_state_rollback2 + def test_rollback_when_changing_outside_transaction assert !@first.approved? @first.approved = true Topic.transaction do @@ -300,22 +300,7 @@ class TransactionTest < ActiveRecord::TestCase assert @first.reload.approved end - def test_dirty_state_rollback3 - assert !@first.approved? - @first.approved = true - @first.save! - Topic.transaction do - @first.approved = false - @first.save! - raise ActiveRecord::Rollback - end - assert !@first.approved - assert @first.changes["approved"] - @first.save! - assert !@first.reload.approved - end - - def test_dirty_state_rollback4 + def test_rollback_when_changing_back_to_prev_stage assert !@first.approved? Topic.transaction do @first.approved = true @@ -330,6 +315,7 @@ class TransactionTest < ActiveRecord::TestCase assert !@first.reload.approved end + def test_force_savepoint_in_nested_transaction Topic.transaction do @first.approved = true -- cgit v1.2.3