diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-21 09:32:47 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-21 09:32:47 -0800 |
commit | 5984894fc9779ce625c9264d32d77581bd6c52ba (patch) | |
tree | e47766985a220dff11d95d35dc3012b048c148cf /activerecord/test | |
parent | c4106d0c08954b0761726e0015ec601b7bc7ea4b (diff) | |
parent | 26853e8948167b7388244ef67f0480211ad2d9f5 (diff) | |
download | rails-5984894fc9779ce625c9264d32d77581bd6c52ba.tar.gz rails-5984894fc9779ce625c9264d32d77581bd6c52ba.tar.bz2 rails-5984894fc9779ce625c9264d32d77581bd6c52ba.zip |
Merge pull request #9011 from wangjohn/activerecord_transaction_state
Refactored TransactionState into its own class
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/transactions_test.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index 9d278480ef..546737b398 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -456,9 +456,13 @@ class TransactionTest < ActiveRecord::TestCase transaction = ActiveRecord::ConnectionAdapters::ClosedTransaction.new(connection).begin assert transaction.open? + assert !transaction.state.rolledback? + assert !transaction.state.committed? + transaction.perform_rollback - assert transaction.rolledback? + assert transaction.state.rolledback? + assert !transaction.state.committed? end def test_transactions_state_from_commit @@ -466,9 +470,13 @@ class TransactionTest < ActiveRecord::TestCase transaction = ActiveRecord::ConnectionAdapters::ClosedTransaction.new(connection).begin assert transaction.open? + assert !transaction.state.rolledback? + assert !transaction.state.committed? + transaction.perform_commit - assert transaction.committed? + assert !transaction.state.rolledback? + assert transaction.state.committed? end private |