Merge pull request #10960 from pacoguzman/fix-build-due-to-10727

Fix build after #10727
rails · Jun 16, 2013 · 57c51e7 · 57c51e7
1 parent 62c1e6c
commit 57c51e7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/activesupport/test/xml_mini/libxml_engine_test.rb b/activesupport/test/xml_mini/libxml_engine_test.rb
@@ -195,6 +195,7 @@ def test_children_with_blank_text_and_attribute
   private
     def assert_equal_rexml(xml)
       parsed_xml = XmlMini.parse(xml)
+      xml.rewind if xml.respond_to?(:rewind)
       hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
       assert_equal(hash, parsed_xml)
     end

diff --git a/activesupport/test/xml_mini/libxmlsax_engine_test.rb b/activesupport/test/xml_mini/libxmlsax_engine_test.rb
@@ -186,6 +186,7 @@ def test_children_with_blank_text
   private
     def assert_equal_rexml(xml)
       parsed_xml = XmlMini.parse(xml)
+      xml.rewind if xml.respond_to?(:rewind)
       hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
       assert_equal(hash, parsed_xml)
     end

diff --git a/activesupport/test/xml_mini/nokogiri_engine_test.rb b/activesupport/test/xml_mini/nokogiri_engine_test.rb
@@ -208,7 +208,8 @@ def test_children_with_blank_text_and_attribute
   private
     def assert_equal_rexml(xml)
       parsed_xml = XmlMini.parse(xml)
-      hash = XmlMini.with_backend('REXML') { XmlMini.parse(parsed_xml) }
+      xml.rewind if xml.respond_to?(:rewind)
+      hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
       assert_equal(hash, parsed_xml)
     end
 end

diff --git a/activesupport/test/xml_mini/nokogirisax_engine_test.rb b/activesupport/test/xml_mini/nokogirisax_engine_test.rb
@@ -209,6 +209,7 @@ def test_children_with_blank_text_and_attribute
   private
     def assert_equal_rexml(xml)
       parsed_xml = XmlMini.parse(xml)
+      xml.rewind if xml.respond_to?(:rewind)
       hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
       assert_equal(hash, parsed_xml)
     end

diff --git a/activesupport/test/xml_mini/rexml_engine_test.rb b/activesupport/test/xml_mini/rexml_engine_test.rb
@@ -30,6 +30,7 @@ def test_parse_from_io
   private
     def assert_equal_rexml(xml)
       parsed_xml = XmlMini.parse(xml)
+      xml.rewind if xml.respond_to?(:rewind)
       hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
       assert_equal(hash, parsed_xml)
     end