diff options
| author | Jeremy Kemper <jeremykemper@gmail.com> | 2014-08-05 10:05:10 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremykemper@gmail.com> | 2014-08-05 10:05:10 -0700 |
| commit | b89c5a043e81298527f369fdb5fc83eb1f290dfe (patch) | |
| tree | a7c1fa5f69d56e713a6406939bf7ccc13f4ac66a /activerecord/test | |
| parent | ed180eea48fdbfd26540145494fbbdfb1fa2d50b (diff) | |
| parent | 8298d3adb72eb17186dc0b155afec308071a3900 (diff) | |
| download | rails-b89c5a043e81298527f369fdb5fc83eb1f290dfe.tar.gz rails-b89c5a043e81298527f369fdb5fc83eb1f290dfe.tar.bz2 rails-b89c5a043e81298527f369fdb5fc83eb1f290dfe.zip | |
Merge pull request #16364 from arthurnn/make_transaction_one_class
Clarify Transaction responsibilities by breaking unneeded inheritance hierarchy.
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/transactions_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index e518033192..b4849222b8 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -552,7 +552,7 @@ class TransactionTest < ActiveRecord::TestCase assert !transaction.state.rolledback? assert !transaction.state.committed? - transaction.perform_rollback + transaction.rollback assert transaction.state.rolledback? assert !transaction.state.committed? @@ -566,7 +566,7 @@ class TransactionTest < ActiveRecord::TestCase assert !transaction.state.rolledback? assert !transaction.state.committed? - transaction.perform_commit + transaction.commit assert !transaction.state.rolledback? assert transaction.state.committed? |