Changeset 4794

Timestamp:

08/20/06 14:38:58 (2 years ago)

Author:

bitsweat

Message:

to_xml: correct naming of included associations. Closes #5831.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/xml_serialization.rb (modified) (1 diff)
• trunk/activerecord/test/base_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* to_xml: correct naming of included associations.  #5831 [josh.starcher@gmail.com]
-
-* Pushing a record onto a has_many :through sets the association's foreign key to the associate's primary key and adds it to the correct association.  #5815, #5829 [josh@hasmanythrough.com]

trunk/activerecord/lib/active_record/xml_serialization.rb

@@ -191 +191 @@
-
-              builder.tag!(tag) do
-
+.merge(:root => association.to_s.singularize)
-              end
-            end

trunk/activerecord/test/base_test.rb

@@ -1320 +1320 @@
-    assert xml.include?(%(<title>The Second Topic's of the day</title>))
-  end
+
+  def test_array_to_xml_including_has_many_association
+    xml = [ topics(:first), topics(:second) ].to_xml(:indent => 0, :skip_instruct => true, :include => :replies)
+    assert xml.include?(%(<replies><reply>))
+  end
-  
-  def test_array_to_xml_including_has_one_association