Skip to content
Browse files

Merge pull request #513 from BlackBulletIV/patch-1

Modified CollectionAssociation documentation to refer to the new class name
  • Loading branch information...
2 parents 1dd90f8 + 940c31f commit b3f45195aa8a35277c3f998917312797936a1f4e @fxn fxn committed May 11, 2011
View
2 activerecord/lib/active_record/associations/collection_association.rb
@@ -4,7 +4,7 @@ module ActiveRecord
module Associations
# = Active Record Association Collection
#
- # AssociationCollection is an abstract class that provides common stuff to
+ # CollectionAssociation is an abstract class that provides common stuff to
# ease the implementation of association proxies that represent
# collections. See the class hierarchy in AssociationProxy.
#
View
2 activerecord/test/cases/named_scope_test.rb
@@ -462,7 +462,7 @@ def test_scopes_are_reset_on_association_reload
[:destroy_all, :reset, :delete_all].each do |method|
before = post.comments.containing_the_letter_e
post.association(:comments).send(method)
- assert before.object_id != post.comments.containing_the_letter_e.object_id, "AssociationCollection##{method} should reset the named scopes cache"
+ assert before.object_id != post.comments.containing_the_letter_e.object_id, "CollectionAssociation##{method} should reset the named scopes cache"
end
end

0 comments on commit b3f4519

Please sign in to comment.
Something went wrong with that request. Please try again.