From 689984ddd3a482b5c0986fdf1889323f096050fa Mon Sep 17 00:00:00 2001
From: Willem van Bergen <willem@vanbergen.org>
Date: Fri, 1 Jan 2010 13:44:42 +0100
Subject: Fixed some bugs and fixed some tests in new SAX-based XmlMini
 backends.

[#3636 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activesupport/test/xml_mini/libxmlsax_engine_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'activesupport/test/xml_mini/libxmlsax_engine_test.rb')

diff --git a/activesupport/test/xml_mini/libxmlsax_engine_test.rb b/activesupport/test/xml_mini/libxmlsax_engine_test.rb
index 6d5b3673fa..864810099e 100644
--- a/activesupport/test/xml_mini/libxmlsax_engine_test.rb
+++ b/activesupport/test/xml_mini/libxmlsax_engine_test.rb
@@ -14,8 +14,6 @@ class LibXMLSAXEngineTest < Test::Unit::TestCase
   def setup
     @default_backend = XmlMini.backend
     XmlMini.backend = 'LibXMLSAX'
-
-    LibXML::XML::Error.set_handler(&lambda { |error| }) #silence libxml, exceptions will do
   end
 
   def teardown
@@ -24,7 +22,8 @@ class LibXMLSAXEngineTest < Test::Unit::TestCase
 
   def test_exception_thrown_on_expansion_attack
     assert_raise LibXML::XML::Error do
-      attack_xml = %{<?xml version="1.0" encoding="UTF-8"?>
+      attack_xml = <<-EOT
+      <?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE member [
         <!ENTITY a "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;">
         <!ENTITY b "&c;&c;&c;&c;&c;&c;&c;&c;&c;&c;">
@@ -37,7 +36,8 @@ class LibXMLSAXEngineTest < Test::Unit::TestCase
       <member>
       &a;
       </member>
-     }
+      EOT
+
       Hash.from_xml(attack_xml)
     end
   end
-- 
cgit v1.2.3