aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/transaction_callbacks_test.rb
diff options
context:
space:
mode:
authorBen Moss <ben@mossity.com>2013-03-09 14:54:19 -0500
committerBen Moss <ben@mossity.com>2013-03-09 15:16:15 -0500
commit992d87db02507363a4ad4ab40a3e4c4b32cf0408 (patch)
tree9802314e8600e0bd5640538e00fd581c6cdf7e79 /activerecord/test/cases/transaction_callbacks_test.rb
parentca35454b498657cd94cb0a4203801e52687aa9e0 (diff)
downloadrails-992d87db02507363a4ad4ab40a3e4c4b32cf0408.tar.gz
rails-992d87db02507363a4ad4ab40a3e4c4b32cf0408.tar.bz2
rails-992d87db02507363a4ad4ab40a3e4c4b32cf0408.zip
Deprecate #connection in favour of accessing it via the class
This allows end-users to have a `connection` method on their models without clashing with ActiveRecord internals.
Diffstat (limited to 'activerecord/test/cases/transaction_callbacks_test.rb')
-rw-r--r--activerecord/test/cases/transaction_callbacks_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/transaction_callbacks_test.rb b/activerecord/test/cases/transaction_callbacks_test.rb
index eb4ffd4498..766a5c0c90 100644
--- a/activerecord/test/cases/transaction_callbacks_test.rb
+++ b/activerecord/test/cases/transaction_callbacks_test.rb
@@ -182,9 +182,9 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
end
def test_call_after_rollback_when_commit_fails
- @first.connection.class.send(:alias_method, :real_method_commit_db_transaction, :commit_db_transaction)
+ @first.class.connection.class.send(:alias_method, :real_method_commit_db_transaction, :commit_db_transaction)
begin
- @first.connection.class.class_eval do
+ @first.class.connection.class.class_eval do
def commit_db_transaction; raise "boom!"; end
end
@@ -194,8 +194,8 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
assert !@first.save rescue nil
assert_equal [:after_rollback], @first.history
ensure
- @first.connection.class.send(:remove_method, :commit_db_transaction)
- @first.connection.class.send(:alias_method, :commit_db_transaction, :real_method_commit_db_transaction)
+ @first.class.connection.class.send(:remove_method, :commit_db_transaction)
+ @first.class.connection.class.send(:alias_method, :commit_db_transaction, :real_method_commit_db_transaction)
end
end