aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/has_many_through_associations_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-02-03 18:25:37 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-02-03 18:40:22 -0800
commit278186534c0ccf285a20497461f40d2e54aa20a0 (patch)
treeeb39e80e8e02fa6f7e04d7803efc1fccda63d3a4 /activerecord/test/cases/associations/has_many_through_associations_test.rb
parent34a37ea9e8265972a93f0c4f62e44308c27751dd (diff)
downloadrails-278186534c0ccf285a20497461f40d2e54aa20a0.tar.gz
rails-278186534c0ccf285a20497461f40d2e54aa20a0.tar.bz2
rails-278186534c0ccf285a20497461f40d2e54aa20a0.zip
Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha.
Diffstat (limited to 'activerecord/test/cases/associations/has_many_through_associations_test.rb')
-rw-r--r--activerecord/test/cases/associations/has_many_through_associations_test.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index ad6a5d6840..1e5d1a0202 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -228,12 +228,10 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
assert !person.posts.loaded?
end
- uses_mocha 'mocking Tag.transaction' do
- def test_association_proxy_transaction_method_starts_transaction_in_association_class
- Tag.expects(:transaction)
- Post.find(:first).tags.transaction do
- # nothing
- end
+ def test_association_proxy_transaction_method_starts_transaction_in_association_class
+ Tag.expects(:transaction)
+ Post.find(:first).tags.transaction do
+ # nothing
end
end