aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-09-25 13:20:26 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-09-25 13:20:35 -0700
commitd665f91d412a29d7bd93db38b8fdbc07ed50c510 (patch)
tree2006c2c448b42c9ce8578c541b6fbe913d263f97 /activerecord/test/cases
parentf58e82cd736ecaf6edb3cbc5d0a27e9378b9a127 (diff)
downloadrails-d665f91d412a29d7bd93db38b8fdbc07ed50c510.tar.gz
rails-d665f91d412a29d7bd93db38b8fdbc07ed50c510.tar.bz2
rails-d665f91d412a29d7bd93db38b8fdbc07ed50c510.zip
Fix destructive side effects from marshaling an association caused by 65843e1acc0c8d285ff79f8c9c49d4d1215440be
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/associations/extension_test.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/test/cases/associations/extension_test.rb b/activerecord/test/cases/associations/extension_test.rb
index bd5a426ca8..da767a2a7e 100644
--- a/activerecord/test/cases/associations/extension_test.rb
+++ b/activerecord/test/cases/associations/extension_test.rb
@@ -40,9 +40,12 @@ class AssociationsExtensionsTest < ActiveRecord::TestCase
assert_equal projects(:action_controller), david.projects.find_most_recent
marshalled = Marshal.dump(david)
- david = Marshal.load(marshalled)
- assert_equal projects(:action_controller), david.projects.find_most_recent
+ # Marshaling an association shouldn't make it unusable by wiping its reflection.
+ assert_not_nil david.association(:projects).reflection
+
+ david_too = Marshal.load(marshalled)
+ assert_equal projects(:action_controller), david_too.projects.find_most_recent
end
def test_marshalling_named_extensions