2 files changed, 10 insertions, 12 deletions

diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb
index 46bc0d7a34..7662e9b765 100644
--- a/activesupport/test/safe_buffer_test.rb
+++ b/activesupport/test/safe_buffer_test.rb
@@ -80,14 +80,12 @@ class SafeBufferTest < ActiveSupport::TestCase
   end
 
   test "Should escape dirty buffers on add" do
-    dirty = @buffer
     clean = "hello".html_safe
     @buffer.gsub!('', '<>')
     assert_equal "hello&lt;&gt;", clean + @buffer
   end
 
   test "Should concat as a normal string when dirty" do
-    dirty = @buffer
     clean = "hello".html_safe
     @buffer.gsub!('', '<>')
     assert_equal "<>hello", @buffer + clean
diff --git a/activesupport/test/xml_mini_test.rb b/activesupport/test/xml_mini_test.rb
index e2b90ae16e..dde17ea403 100644
--- a/activesupport/test/xml_mini_test.rb
+++ b/activesupport/test/xml_mini_test.rb
@@ -50,49 +50,49 @@ module XmlMiniTest
 
     def test_rename_key_does_not_dasherize_multiple_trailing_underscores
       assert_equal "id__", ActiveSupport::XmlMini.rename_key("id__")
-    end  
+    end
   end
 
   class ToTagTest < ActiveSupport::TestCase
     def assert_xml(xml)
       assert_equal xml, @options[:builder].target!
     end
-    
-    setup do
+
+    def setup
       @xml = ActiveSupport::XmlMini
       @options = {:skip_instruct => true, :builder => Builder::XmlMarkup.new}
     end
-    
+
     test "#to_tag accepts a callable object and passes options with the builder" do
       @xml.to_tag(:some_tag, lambda {|o| o[:builder].br }, @options)
       assert_xml "<br/>"
     end
-    
+
     test "#to_tag accepts a callable object and passes options and tag name" do
       @xml.to_tag(:tag, lambda {|o, t| o[:builder].b(t) }, @options)
       assert_xml "<b>tag</b>"
     end
-    
+
     test "#to_tag accepts an object responding to #to_xml and passes the options, where :root is key" do
       obj = Object.new
       obj.instance_eval do
         def to_xml(options) options[:builder].yo(options[:root].to_s) end
       end
-      
+
       @xml.to_tag(:tag, obj, @options)
       assert_xml "<yo>tag</yo>"
     end
-    
+
     test "#to_tag accepts arbitrary objects responding to #to_str" do
       @xml.to_tag(:b, "Howdy", @options)
       assert_xml "<b>Howdy</b>"
     end
-    
+
     test "#to_tag should dasherize the space when passed a string with spaces as a key" do
       @xml.to_tag("New   York", 33, @options)
       assert_xml "<New---York type=\"integer\">33</New---York>"
     end
-    
+
     test "#to_tag should dasherize the space when passed a symbol with spaces as a key" do
       @xml.to_tag(:"New   York", 33, @options)
       assert_xml "<New---York type=\"integer\">33</New---York>"