From 1caa76304b6eef3d637d861585bda72ed367567f Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 26 Sep 2006 06:56:17 +0000 Subject: has_one associations with a nil target may be safely marshaled. Closes #6279. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5188 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/associations_test.rb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'activerecord/test/associations_test.rb') diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index aaafb0e396..5e9a39873d 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -102,13 +102,26 @@ class HasOneAssociationsTest < Test::Unit::TestCase end def test_has_one_cache_nils - assert_nil companies(:another_firm).account - assert_queries(0) { companies(:another_firm).account } + firm = companies(:another_firm) + assert_queries(1) { assert_nil firm.account } + assert_queries(0) { assert_nil firm.account } firms = Firm.find(:all, :include => :account) assert_queries(0) { firms.each(&:account) } end + def test_can_marshal_has_one_association_with_nil_target + firm = Firm.new + assert_nothing_raised do + assert_equal firm.attributes, Marshal.load(Marshal.dump(firm)).attributes + end + + firm.account + assert_nothing_raised do + assert_equal firm.attributes, Marshal.load(Marshal.dump(firm)).attributes + end + end + def test_proxy_assignment company = companies(:first_firm) assert_nothing_raised { company.account = company.account } -- cgit v1.2.3