aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-09-07 13:08:30 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-09-07 13:18:23 -0300
commitd65adc742565b6bd448179faf7edb4098db432e5 (patch)
tree3c942ae14612cd0828985f347e6c46e3b61d378b
parent5054e266ac07da7a2a15173d3d2919948ae1eb6e (diff)
downloadrails-d65adc742565b6bd448179faf7edb4098db432e5.tar.gz
rails-d65adc742565b6bd448179faf7edb4098db432e5.tar.bz2
rails-d65adc742565b6bd448179faf7edb4098db432e5.zip
Update Active Model xml serialization test to reflect a change in builder
Due to a change in builder, nil values and empty strings now generates closed tags, so instead of this: <pseudonyms nil=\"true\"></pseudonyms> It generates this: <pseudonyms nil=\"true\"/> Document this change in Rails so that people can track it down easily if necessary. Conflicts: activemodel/CHANGELOG.md
-rw-r--r--activemodel/CHANGELOG.md13
-rw-r--r--activemodel/test/cases/serializers/xml_serialization_test.rb2
2 files changed, 14 insertions, 1 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 2a3c51172b..d3056e73a2 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,3 +1,16 @@
+## Rails 3.2.9 (unreleased)
+
+* Due to a change in builder, nil values and empty strings now generates
+ closed tags, so instead of this:
+
+ <pseudonyms nil=\"true\"></pseudonyms>
+
+ It generates this:
+
+ <pseudonyms nil=\"true\"/>
+
+ *Carlos Antonio da Silva*
+
## Rails 3.2.8 (Aug 9, 2012) ##
* No changes.
diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index 38aecf51ff..7f14b21cf4 100644
--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -132,7 +132,7 @@ class XmlSerializationTest < ActiveModel::TestCase
end
test "should serialize nil" do
- assert_match %r{<pseudonyms nil=\"true\"></pseudonyms>}, @contact.to_xml(:methods => :pseudonyms)
+ assert_match %r{<pseudonyms nil=\"true\"/>}, @contact.to_xml(:methods => :pseudonyms)
end
test "should serialize integer" do