From 2cef2d411a20b89b71fb76876c33b331f94d0cc5 Mon Sep 17 00:00:00 2001
From: Joshua Wehner <joshua.wehner@gmail.com>
Date: Thu, 3 Mar 2011 15:43:42 -0500
Subject: Methods that return nil should not be considered YAML

---
 activemodel/test/cases/serializers/xml_serialization_test.rb | 4 ++++
 activemodel/test/models/contact.rb                           | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index b6a2f88667..8f5c196850 100644
--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -92,6 +92,10 @@ class XmlSerializationTest < ActiveModel::TestCase
   test "should serialize string" do
     assert_match %r{<name>aaron stack</name>}, @contact.to_xml
   end
+  
+  test "should serialize nil" do
+    assert_match %r{<pseudonyms nil=\"true\"></pseudonyms>}, @contact.to_xml(:methods => :pseudonyms)
+  end
 
   test "should serialize integer" do
     assert_match %r{<age type="integer">25</age>}, @contact.to_xml
diff --git a/activemodel/test/models/contact.rb b/activemodel/test/models/contact.rb
index f4f3078473..7bfc542afb 100644
--- a/activemodel/test/models/contact.rb
+++ b/activemodel/test/models/contact.rb
@@ -16,6 +16,10 @@ class Contact
     options.each { |name, value| send("#{name}=", value) }
   end
 
+  def pseudonyms
+    nil
+  end
+
   def persisted?
     id
   end
-- 
cgit v1.2.3