From 80e66cc4d90bf8c15d1a5f6e3152e90147f00772 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 6 Aug 2016 19:55:02 +0200
Subject: normalizes indentation and whitespace across the project

---
 activesupport/test/xml_mini/jdom_engine_test.rb    |  12 +-
 activesupport/test/xml_mini/libxml_engine_test.rb  | 194 ++++++++++-----------
 .../test/xml_mini/libxmlsax_engine_test.rb         | 160 ++++++++---------
 .../test/xml_mini/nokogiri_engine_test.rb          | 182 +++++++++----------
 .../test/xml_mini/nokogirisax_engine_test.rb       | 182 +++++++++----------
 activesupport/test/xml_mini/rexml_engine_test.rb   |   4 +-
 6 files changed, 367 insertions(+), 367 deletions(-)

(limited to 'activesupport/test/xml_mini')

diff --git a/activesupport/test/xml_mini/jdom_engine_test.rb b/activesupport/test/xml_mini/jdom_engine_test.rb
index fea3711c37..43edd49663 100644
--- a/activesupport/test/xml_mini/jdom_engine_test.rb
+++ b/activesupport/test/xml_mini/jdom_engine_test.rb
@@ -19,18 +19,18 @@ if RUBY_PLATFORM.include?("java")
     end
 
     def test_file_from_xml
-       hash = Hash.from_xml(<<-eoxml)
+      hash = Hash.from_xml(<<-eoxml)
          <blog>
            <logo type="file" name="logo.png" content_type="image/png">
            </logo>
          </blog>
        eoxml
-       assert hash.has_key?("blog")
-       assert hash["blog"].has_key?("logo")
+      assert hash.has_key?("blog")
+      assert hash["blog"].has_key?("logo")
 
-       file = hash["blog"]["logo"]
-       assert_equal "logo.png", file.original_filename
-       assert_equal "image/png", file.content_type
+      file = hash["blog"]["logo"]
+      assert_equal "logo.png", file.original_filename
+      assert_equal "image/png", file.content_type
     end
 
     def test_not_allowed_to_expand_entities_to_files
diff --git a/activesupport/test/xml_mini/libxml_engine_test.rb b/activesupport/test/xml_mini/libxml_engine_test.rb
index c40145ae5f..d5fd17d06e 100644
--- a/activesupport/test/xml_mini/libxml_engine_test.rb
+++ b/activesupport/test/xml_mini/libxml_engine_test.rb
@@ -3,56 +3,56 @@ begin
 rescue LoadError
   # Skip libxml tests
 else
-require "abstract_unit"
-require "active_support/xml_mini"
-require "active_support/core_ext/hash/conversions"
+  require "abstract_unit"
+  require "active_support/xml_mini"
+  require "active_support/core_ext/hash/conversions"
 
-class LibxmlEngineTest < ActiveSupport::TestCase
-  include ActiveSupport
+  class LibxmlEngineTest < ActiveSupport::TestCase
+    include ActiveSupport
 
-  def setup
-    @default_backend = XmlMini.backend
-    XmlMini.backend = "LibXML"
+    def setup
+      @default_backend = XmlMini.backend
+      XmlMini.backend = "LibXML"
 
-    LibXML::XML::Error.set_handler(&lambda { |error| }) #silence libxml, exceptions will do
-  end
+      LibXML::XML::Error.set_handler(&lambda { |error| }) #silence libxml, exceptions will do
+    end
 
-  def teardown
-    XmlMini.backend = @default_backend
-  end
+    def teardown
+      XmlMini.backend = @default_backend
+    end
 
-  def test_exception_thrown_on_expansion_attack
-    assert_raise LibXML::XML::Error do
-      attack_xml = %{<?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;">
-        <!ENTITY c "&d;&d;&d;&d;&d;&d;&d;&d;&d;&d;">
-        <!ENTITY d "&e;&e;&e;&e;&e;&e;&e;&e;&e;&e;">
-        <!ENTITY e "&f;&f;&f;&f;&f;&f;&f;&f;&f;&f;">
-        <!ENTITY f "&g;&g;&g;&g;&g;&g;&g;&g;&g;&g;">
-        <!ENTITY g "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx">
-      ]>
-      <member>
-      &a;
-      </member>
-     }
-      Hash.from_xml(attack_xml)
+    def test_exception_thrown_on_expansion_attack
+      assert_raise LibXML::XML::Error do
+        attack_xml = %{<?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;">
+          <!ENTITY c "&d;&d;&d;&d;&d;&d;&d;&d;&d;&d;">
+          <!ENTITY d "&e;&e;&e;&e;&e;&e;&e;&e;&e;&e;">
+          <!ENTITY e "&f;&f;&f;&f;&f;&f;&f;&f;&f;&f;">
+          <!ENTITY f "&g;&g;&g;&g;&g;&g;&g;&g;&g;&g;">
+          <!ENTITY g "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx">
+        ]>
+        <member>
+        &a;
+        </member>
+       }
+        Hash.from_xml(attack_xml)
+      end
     end
-  end
 
-  def test_setting_libxml_as_backend
-    XmlMini.backend = "LibXML"
-    assert_equal XmlMini_LibXML, XmlMini.backend
-  end
+    def test_setting_libxml_as_backend
+      XmlMini.backend = "LibXML"
+      assert_equal XmlMini_LibXML, XmlMini.backend
+    end
 
-  def test_blank_returns_empty_hash
-    assert_equal({}, XmlMini.parse(nil))
-    assert_equal({}, XmlMini.parse(""))
-  end
+    def test_blank_returns_empty_hash
+      assert_equal({}, XmlMini.parse(nil))
+      assert_equal({}, XmlMini.parse(""))
+    end
 
-  def test_array_type_makes_an_array
-    assert_equal_rexml(<<-eoxml)
+    def test_array_type_makes_an_array
+      assert_equal_rexml(<<-eoxml)
       <blog>
         <posts type="array">
           <post>a post</post>
@@ -60,67 +60,67 @@ class LibxmlEngineTest < ActiveSupport::TestCase
         </posts>
       </blog>
     eoxml
-  end
+    end
 
-  def test_one_node_document_as_hash
-    assert_equal_rexml(<<-eoxml)
-    <products/>
-    eoxml
-  end
+    def test_one_node_document_as_hash
+      assert_equal_rexml(<<-eoxml)
+      <products/>
+      eoxml
+    end
 
-  def test_one_node_with_attributes_document_as_hash
-    assert_equal_rexml(<<-eoxml)
-    <products foo="bar"/>
-    eoxml
-  end
+    def test_one_node_with_attributes_document_as_hash
+      assert_equal_rexml(<<-eoxml)
+      <products foo="bar"/>
+      eoxml
+    end
 
-  def test_products_node_with_book_node_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_products_node_with_book_node_as_hash
+      assert_equal_rexml(<<-eoxml)
     <products>
       <book name="awesome" id="12345" />
     </products>
     eoxml
-  end
+    end
 
-  def test_products_node_with_two_book_nodes_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_products_node_with_two_book_nodes_as_hash
+      assert_equal_rexml(<<-eoxml)
     <products>
       <book name="awesome" id="12345" />
       <book name="america" id="67890" />
     </products>
     eoxml
-  end
+    end
 
-  def test_single_node_with_content_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_single_node_with_content_as_hash
+      assert_equal_rexml(<<-eoxml)
       <products>
         hello world
       </products>
     eoxml
-  end
+    end
 
-  def test_children_with_children
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_children
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         <book name="america" id="67890" />
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         hello everyone
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_non_adjacent_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_non_adjacent_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       good
       <products>
@@ -129,10 +129,10 @@ class LibxmlEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-  end
+    end
 
-  def test_parse_from_io
-    io = StringIO.new(<<-eoxml)
+    def test_parse_from_io
+      io = StringIO.new(<<-eoxml)
     <root>
       good
       <products>
@@ -141,31 +141,31 @@ class LibxmlEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-    assert_equal_rexml(io)
-  end
+      assert_equal_rexml(io)
+    end
 
-  def test_children_with_simple_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_simple_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
          <![CDATA[cdatablock]]>
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_multiple_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_multiple_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
          <![CDATA[cdatablock1]]><![CDATA[cdatablock2]]>
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_text_and_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_text_and_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         hello <![CDATA[cdatablock]]>
@@ -173,32 +173,32 @@ class LibxmlEngineTest < ActiveSupport::TestCase
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_blank_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_blank_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>   </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_blank_text_and_attribute
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_blank_text_and_attribute
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products type="file">   </products>
     </root>
     eoxml
-  end
+    end
 
 
-  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
-end
+    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
+  end
 
 end
diff --git a/activesupport/test/xml_mini/libxmlsax_engine_test.rb b/activesupport/test/xml_mini/libxmlsax_engine_test.rb
index a92cd9da8c..e25fa2813c 100644
--- a/activesupport/test/xml_mini/libxmlsax_engine_test.rb
+++ b/activesupport/test/xml_mini/libxmlsax_engine_test.rb
@@ -3,25 +3,25 @@ begin
 rescue LoadError
   # Skip libxml tests
 else
-require "abstract_unit"
-require "active_support/xml_mini"
-require "active_support/core_ext/hash/conversions"
+  require "abstract_unit"
+  require "active_support/xml_mini"
+  require "active_support/core_ext/hash/conversions"
 
-class LibXMLSAXEngineTest < ActiveSupport::TestCase
-  include ActiveSupport
+  class LibXMLSAXEngineTest < ActiveSupport::TestCase
+    include ActiveSupport
 
-  def setup
-    @default_backend = XmlMini.backend
-    XmlMini.backend = "LibXMLSAX"
-  end
+    def setup
+      @default_backend = XmlMini.backend
+      XmlMini.backend = "LibXMLSAX"
+    end
 
-  def teardown
-    XmlMini.backend = @default_backend
-  end
+    def teardown
+      XmlMini.backend = @default_backend
+    end
 
-  def test_exception_thrown_on_expansion_attack
-    assert_raise LibXML::XML::Error do
-      attack_xml = <<-EOT
+    def test_exception_thrown_on_expansion_attack
+      assert_raise LibXML::XML::Error do
+        attack_xml = <<-EOT
       <?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE member [
         <!ENTITY a "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;">
@@ -37,22 +37,22 @@ class LibXMLSAXEngineTest < ActiveSupport::TestCase
       </member>
       EOT
 
-      Hash.from_xml(attack_xml)
+        Hash.from_xml(attack_xml)
+      end
     end
-  end
 
-  def test_setting_libxml_as_backend
-    XmlMini.backend = "LibXMLSAX"
-    assert_equal XmlMini_LibXMLSAX, XmlMini.backend
-  end
+    def test_setting_libxml_as_backend
+      XmlMini.backend = "LibXMLSAX"
+      assert_equal XmlMini_LibXMLSAX, XmlMini.backend
+    end
 
-  def test_blank_returns_empty_hash
-    assert_equal({}, XmlMini.parse(nil))
-    assert_equal({}, XmlMini.parse(""))
-  end
+    def test_blank_returns_empty_hash
+      assert_equal({}, XmlMini.parse(nil))
+      assert_equal({}, XmlMini.parse(""))
+    end
 
-  def test_array_type_makes_an_array
-    assert_equal_rexml(<<-eoxml)
+    def test_array_type_makes_an_array
+      assert_equal_rexml(<<-eoxml)
       <blog>
         <posts type="array">
           <post>a post</post>
@@ -60,67 +60,67 @@ class LibXMLSAXEngineTest < ActiveSupport::TestCase
         </posts>
       </blog>
     eoxml
-  end
+    end
 
-  def test_one_node_document_as_hash
-    assert_equal_rexml(<<-eoxml)
-    <products/>
-    eoxml
-  end
+    def test_one_node_document_as_hash
+      assert_equal_rexml(<<-eoxml)
+      <products/>
+      eoxml
+    end
 
-  def test_one_node_with_attributes_document_as_hash
-    assert_equal_rexml(<<-eoxml)
-    <products foo="bar"/>
-    eoxml
-  end
+    def test_one_node_with_attributes_document_as_hash
+      assert_equal_rexml(<<-eoxml)
+      <products foo="bar"/>
+      eoxml
+    end
 
-  def test_products_node_with_book_node_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_products_node_with_book_node_as_hash
+      assert_equal_rexml(<<-eoxml)
     <products>
       <book name="awesome" id="12345" />
     </products>
     eoxml
-  end
+    end
 
-  def test_products_node_with_two_book_nodes_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_products_node_with_two_book_nodes_as_hash
+      assert_equal_rexml(<<-eoxml)
     <products>
       <book name="awesome" id="12345" />
       <book name="america" id="67890" />
     </products>
     eoxml
-  end
+    end
 
-  def test_single_node_with_content_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_single_node_with_content_as_hash
+      assert_equal_rexml(<<-eoxml)
       <products>
         hello world
       </products>
     eoxml
-  end
+    end
 
-  def test_children_with_children
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_children
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         <book name="america" id="67890" />
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         hello everyone
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_non_adjacent_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_non_adjacent_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       good
       <products>
@@ -129,10 +129,10 @@ class LibXMLSAXEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-  end
+    end
 
-  def test_parse_from_io
-    io = StringIO.new(<<-eoxml)
+    def test_parse_from_io
+      io = StringIO.new(<<-eoxml)
     <root>
       good
       <products>
@@ -141,31 +141,31 @@ class LibXMLSAXEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-    assert_equal_rexml(io)
-  end
+      assert_equal_rexml(io)
+    end
 
-  def test_children_with_simple_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_simple_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
          <![CDATA[cdatablock]]>
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_multiple_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_multiple_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
          <![CDATA[cdatablock1]]><![CDATA[cdatablock2]]>
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_text_and_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_text_and_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         hello <![CDATA[cdatablock]]>
@@ -173,23 +173,23 @@ class LibXMLSAXEngineTest < ActiveSupport::TestCase
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_blank_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_blank_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>   </products>
     </root>
     eoxml
-  end
-
-  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
-end
+
+    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
+  end
 
 end
diff --git a/activesupport/test/xml_mini/nokogiri_engine_test.rb b/activesupport/test/xml_mini/nokogiri_engine_test.rb
index dd169e7eb4..44b82da4e4 100644
--- a/activesupport/test/xml_mini/nokogiri_engine_test.rb
+++ b/activesupport/test/xml_mini/nokogiri_engine_test.rb
@@ -3,38 +3,38 @@ begin
 rescue LoadError
   # Skip nokogiri tests
 else
-require "abstract_unit"
-require "active_support/xml_mini"
-require "active_support/core_ext/hash/conversions"
-
-class NokogiriEngineTest < ActiveSupport::TestCase
-  def setup
-    @default_backend = ActiveSupport::XmlMini.backend
-    ActiveSupport::XmlMini.backend = "Nokogiri"
-  end
+  require "abstract_unit"
+  require "active_support/xml_mini"
+  require "active_support/core_ext/hash/conversions"
+
+  class NokogiriEngineTest < ActiveSupport::TestCase
+    def setup
+      @default_backend = ActiveSupport::XmlMini.backend
+      ActiveSupport::XmlMini.backend = "Nokogiri"
+    end
 
-  def teardown
-    ActiveSupport::XmlMini.backend = @default_backend
-  end
+    def teardown
+      ActiveSupport::XmlMini.backend = @default_backend
+    end
 
-  def test_file_from_xml
-    hash = Hash.from_xml(<<-eoxml)
+    def test_file_from_xml
+      hash = Hash.from_xml(<<-eoxml)
       <blog>
         <logo type="file" name="logo.png" content_type="image/png">
         </logo>
       </blog>
     eoxml
-    assert hash.has_key?("blog")
-    assert hash["blog"].has_key?("logo")
+      assert hash.has_key?("blog")
+      assert hash["blog"].has_key?("logo")
 
-    file = hash["blog"]["logo"]
-    assert_equal "logo.png", file.original_filename
-    assert_equal "image/png", file.content_type
-  end
+      file = hash["blog"]["logo"]
+      assert_equal "logo.png", file.original_filename
+      assert_equal "image/png", file.content_type
+    end
 
-  def test_exception_thrown_on_expansion_attack
-    assert_raise Nokogiri::XML::SyntaxError do
-      attack_xml = <<-EOT
+    def test_exception_thrown_on_expansion_attack
+      assert_raise Nokogiri::XML::SyntaxError do
+        attack_xml = <<-EOT
       <?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE member [
         <!ENTITY a "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;">
@@ -49,22 +49,22 @@ class NokogiriEngineTest < ActiveSupport::TestCase
       &a;
       </member>
       EOT
-      Hash.from_xml(attack_xml)
+        Hash.from_xml(attack_xml)
+      end
     end
-  end
 
-  def test_setting_nokogiri_as_backend
-    ActiveSupport::XmlMini.backend = "Nokogiri"
-    assert_equal ActiveSupport::XmlMini_Nokogiri, ActiveSupport::XmlMini.backend
-  end
+    def test_setting_nokogiri_as_backend
+      ActiveSupport::XmlMini.backend = "Nokogiri"
+      assert_equal ActiveSupport::XmlMini_Nokogiri, ActiveSupport::XmlMini.backend
+    end
 
-  def test_blank_returns_empty_hash
-    assert_equal({}, ActiveSupport::XmlMini.parse(nil))
-    assert_equal({}, ActiveSupport::XmlMini.parse(""))
-  end
+    def test_blank_returns_empty_hash
+      assert_equal({}, ActiveSupport::XmlMini.parse(nil))
+      assert_equal({}, ActiveSupport::XmlMini.parse(""))
+    end
 
-  def test_array_type_makes_an_array
-    assert_equal_rexml(<<-eoxml)
+    def test_array_type_makes_an_array
+      assert_equal_rexml(<<-eoxml)
       <blog>
         <posts type="array">
           <post>a post</post>
@@ -72,67 +72,67 @@ class NokogiriEngineTest < ActiveSupport::TestCase
         </posts>
       </blog>
     eoxml
-  end
+    end
 
-  def test_one_node_document_as_hash
-    assert_equal_rexml(<<-eoxml)
-    <products/>
-    eoxml
-  end
+    def test_one_node_document_as_hash
+      assert_equal_rexml(<<-eoxml)
+      <products/>
+      eoxml
+    end
 
-  def test_one_node_with_attributes_document_as_hash
-    assert_equal_rexml(<<-eoxml)
-    <products foo="bar"/>
-    eoxml
-  end
+    def test_one_node_with_attributes_document_as_hash
+      assert_equal_rexml(<<-eoxml)
+      <products foo="bar"/>
+      eoxml
+    end
 
-  def test_products_node_with_book_node_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_products_node_with_book_node_as_hash
+      assert_equal_rexml(<<-eoxml)
     <products>
       <book name="awesome" id="12345" />
     </products>
     eoxml
-  end
+    end
 
-  def test_products_node_with_two_book_nodes_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_products_node_with_two_book_nodes_as_hash
+      assert_equal_rexml(<<-eoxml)
     <products>
       <book name="awesome" id="12345" />
       <book name="america" id="67890" />
     </products>
     eoxml
-  end
+    end
 
-  def test_single_node_with_content_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_single_node_with_content_as_hash
+      assert_equal_rexml(<<-eoxml)
       <products>
         hello world
       </products>
     eoxml
-  end
+    end
 
-  def test_children_with_children
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_children
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         <book name="america" id="67890" />
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         hello everyone
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_non_adjacent_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_non_adjacent_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       good
       <products>
@@ -141,10 +141,10 @@ class NokogiriEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-  end
+    end
 
-  def test_parse_from_io
-    io = StringIO.new(<<-eoxml)
+    def test_parse_from_io
+      io = StringIO.new(<<-eoxml)
     <root>
       good
       <products>
@@ -153,31 +153,31 @@ class NokogiriEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-    assert_equal_rexml(io)
-  end
+      assert_equal_rexml(io)
+    end
 
-  def test_children_with_simple_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_simple_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
          <![CDATA[cdatablock]]>
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_multiple_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_multiple_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
          <![CDATA[cdatablock1]]><![CDATA[cdatablock2]]>
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_text_and_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_text_and_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         hello <![CDATA[cdatablock]]>
@@ -185,31 +185,31 @@ class NokogiriEngineTest < ActiveSupport::TestCase
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_blank_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_blank_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>   </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_blank_text_and_attribute
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_blank_text_and_attribute
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products type="file">   </products>
     </root>
     eoxml
-  end
-
-  private
-    def assert_equal_rexml(xml)
-      parsed_xml = ActiveSupport::XmlMini.parse(xml)
-      xml.rewind if xml.respond_to?(:rewind)
-      hash = ActiveSupport::XmlMini.with_backend("REXML") { ActiveSupport::XmlMini.parse(xml) }
-      assert_equal(hash, parsed_xml)
     end
-end
+
+    private
+      def assert_equal_rexml(xml)
+        parsed_xml = ActiveSupport::XmlMini.parse(xml)
+        xml.rewind if xml.respond_to?(:rewind)
+        hash = ActiveSupport::XmlMini.with_backend("REXML") { ActiveSupport::XmlMini.parse(xml) }
+        assert_equal(hash, parsed_xml)
+      end
+  end
 
 end
diff --git a/activesupport/test/xml_mini/nokogirisax_engine_test.rb b/activesupport/test/xml_mini/nokogirisax_engine_test.rb
index 9a2bcc3f7e..24b35cadf6 100644
--- a/activesupport/test/xml_mini/nokogirisax_engine_test.rb
+++ b/activesupport/test/xml_mini/nokogirisax_engine_test.rb
@@ -3,38 +3,38 @@ begin
 rescue LoadError
   # Skip nokogiri tests
 else
-require "abstract_unit"
-require "active_support/xml_mini"
-require "active_support/core_ext/hash/conversions"
-
-class NokogiriSAXEngineTest < ActiveSupport::TestCase
-  def setup
-    @default_backend = ActiveSupport::XmlMini.backend
-    ActiveSupport::XmlMini.backend = "NokogiriSAX"
-  end
+  require "abstract_unit"
+  require "active_support/xml_mini"
+  require "active_support/core_ext/hash/conversions"
+
+  class NokogiriSAXEngineTest < ActiveSupport::TestCase
+    def setup
+      @default_backend = ActiveSupport::XmlMini.backend
+      ActiveSupport::XmlMini.backend = "NokogiriSAX"
+    end
 
-  def teardown
-    ActiveSupport::XmlMini.backend = @default_backend
-  end
+    def teardown
+      ActiveSupport::XmlMini.backend = @default_backend
+    end
 
-  def test_file_from_xml
-    hash = Hash.from_xml(<<-eoxml)
+    def test_file_from_xml
+      hash = Hash.from_xml(<<-eoxml)
       <blog>
         <logo type="file" name="logo.png" content_type="image/png">
         </logo>
       </blog>
     eoxml
-    assert hash.has_key?("blog")
-    assert hash["blog"].has_key?("logo")
+      assert hash.has_key?("blog")
+      assert hash["blog"].has_key?("logo")
 
-    file = hash["blog"]["logo"]
-    assert_equal "logo.png", file.original_filename
-    assert_equal "image/png", file.content_type
-  end
+      file = hash["blog"]["logo"]
+      assert_equal "logo.png", file.original_filename
+      assert_equal "image/png", file.content_type
+    end
 
-  def test_exception_thrown_on_expansion_attack
-    assert_raise RuntimeError do
-      attack_xml = <<-EOT
+    def test_exception_thrown_on_expansion_attack
+      assert_raise RuntimeError do
+        attack_xml = <<-EOT
       <?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE member [
         <!ENTITY a "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;">
@@ -50,22 +50,22 @@ class NokogiriSAXEngineTest < ActiveSupport::TestCase
       </member>
       EOT
 
-      Hash.from_xml(attack_xml)
+        Hash.from_xml(attack_xml)
+      end
     end
-  end
 
-  def test_setting_nokogirisax_as_backend
-    ActiveSupport::XmlMini.backend = "NokogiriSAX"
-    assert_equal ActiveSupport::XmlMini_NokogiriSAX, ActiveSupport::XmlMini.backend
-  end
+    def test_setting_nokogirisax_as_backend
+      ActiveSupport::XmlMini.backend = "NokogiriSAX"
+      assert_equal ActiveSupport::XmlMini_NokogiriSAX, ActiveSupport::XmlMini.backend
+    end
 
-  def test_blank_returns_empty_hash
-    assert_equal({}, ActiveSupport::XmlMini.parse(nil))
-    assert_equal({}, ActiveSupport::XmlMini.parse(""))
-  end
+    def test_blank_returns_empty_hash
+      assert_equal({}, ActiveSupport::XmlMini.parse(nil))
+      assert_equal({}, ActiveSupport::XmlMini.parse(""))
+    end
 
-  def test_array_type_makes_an_array
-    assert_equal_rexml(<<-eoxml)
+    def test_array_type_makes_an_array
+      assert_equal_rexml(<<-eoxml)
       <blog>
         <posts type="array">
           <post>a post</post>
@@ -73,67 +73,67 @@ class NokogiriSAXEngineTest < ActiveSupport::TestCase
         </posts>
       </blog>
     eoxml
-  end
+    end
 
-  def test_one_node_document_as_hash
-    assert_equal_rexml(<<-eoxml)
-    <products/>
-    eoxml
-  end
+    def test_one_node_document_as_hash
+      assert_equal_rexml(<<-eoxml)
+      <products/>
+      eoxml
+    end
 
-  def test_one_node_with_attributes_document_as_hash
-    assert_equal_rexml(<<-eoxml)
-    <products foo="bar"/>
-    eoxml
-  end
+    def test_one_node_with_attributes_document_as_hash
+      assert_equal_rexml(<<-eoxml)
+      <products foo="bar"/>
+      eoxml
+    end
 
-  def test_products_node_with_book_node_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_products_node_with_book_node_as_hash
+      assert_equal_rexml(<<-eoxml)
     <products>
       <book name="awesome" id="12345" />
     </products>
     eoxml
-  end
+    end
 
-  def test_products_node_with_two_book_nodes_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_products_node_with_two_book_nodes_as_hash
+      assert_equal_rexml(<<-eoxml)
     <products>
       <book name="awesome" id="12345" />
       <book name="america" id="67890" />
     </products>
     eoxml
-  end
+    end
 
-  def test_single_node_with_content_as_hash
-    assert_equal_rexml(<<-eoxml)
+    def test_single_node_with_content_as_hash
+      assert_equal_rexml(<<-eoxml)
       <products>
         hello world
       </products>
     eoxml
-  end
+    end
 
-  def test_children_with_children
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_children
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         <book name="america" id="67890" />
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         hello everyone
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_non_adjacent_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_non_adjacent_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       good
       <products>
@@ -142,10 +142,10 @@ class NokogiriSAXEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-  end
+    end
 
-  def test_parse_from_io
-    io = StringIO.new(<<-eoxml)
+    def test_parse_from_io
+      io = StringIO.new(<<-eoxml)
     <root>
       good
       <products>
@@ -154,31 +154,31 @@ class NokogiriSAXEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-    assert_equal_rexml(io)
-  end
+      assert_equal_rexml(io)
+    end
 
-  def test_children_with_simple_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_simple_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
          <![CDATA[cdatablock]]>
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_multiple_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_multiple_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
          <![CDATA[cdatablock1]]><![CDATA[cdatablock2]]>
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_text_and_cdata
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_text_and_cdata
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>
         hello <![CDATA[cdatablock]]>
@@ -186,31 +186,31 @@ class NokogiriSAXEngineTest < ActiveSupport::TestCase
       </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_blank_text
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_blank_text
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products>   </products>
     </root>
     eoxml
-  end
+    end
 
-  def test_children_with_blank_text_and_attribute
-    assert_equal_rexml(<<-eoxml)
+    def test_children_with_blank_text_and_attribute
+      assert_equal_rexml(<<-eoxml)
     <root>
       <products type="file">   </products>
     </root>
     eoxml
-  end
-
-  private
-    def assert_equal_rexml(xml)
-      parsed_xml = ActiveSupport::XmlMini.parse(xml)
-      xml.rewind if xml.respond_to?(:rewind)
-      hash = ActiveSupport::XmlMini.with_backend("REXML") { ActiveSupport::XmlMini.parse(xml) }
-      assert_equal(hash, parsed_xml)
     end
-end
+
+    private
+      def assert_equal_rexml(xml)
+        parsed_xml = ActiveSupport::XmlMini.parse(xml)
+        xml.rewind if xml.respond_to?(:rewind)
+        hash = ActiveSupport::XmlMini.with_backend("REXML") { ActiveSupport::XmlMini.parse(xml) }
+        assert_equal(hash, parsed_xml)
+      end
+  end
 
 end
diff --git a/activesupport/test/xml_mini/rexml_engine_test.rb b/activesupport/test/xml_mini/rexml_engine_test.rb
index 2af98f7fe2..a3bae7a89c 100644
--- a/activesupport/test/xml_mini/rexml_engine_test.rb
+++ b/activesupport/test/xml_mini/rexml_engine_test.rb
@@ -26,8 +26,8 @@ class REXMLEngineTest < ActiveSupport::TestCase
     assert hash.has_key?("root")
     assert hash["root"].has_key?("products")
     assert_match "good", hash["root"]["__content__"]
-    products = hash["root"]["products"]    
-    assert products.has_key?("__content__")    
+    products = hash["root"]["products"]
+    assert products.has_key?("__content__")
     assert_match "hello everyone", products["__content__"]
   end
 
-- 
cgit v1.2.3