Ruby 1.9 compat: shadowed vars, kcode

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8402 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 9 insertions, 5 deletions

diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index 3763f47c68..4d01faa5d2 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -145,7 +145,7 @@ class HashExtTest < Test::Unit::TestCase
     assert_equal updated_with_mixed[:a], 1
     assert_equal updated_with_mixed['b'], 2
 
-    assert [updated_with_strings, updated_with_symbols, updated_with_mixed].all? {|hash| hash.keys.size == 2}
+    assert [updated_with_strings, updated_with_symbols, updated_with_mixed].all? { |h| h.keys.size == 2 }
   end
 
   def test_indifferent_merging
@@ -371,8 +371,8 @@ class HashToXmlTest < Test::Unit::TestCase
   end
 
   def test_one_level_with_yielding
-    xml = { :name => "David", :street => "Paulina" }.to_xml(@xml_options) do |xml|
-      xml.creator("Rails")
+    xml = { :name => "David", :street => "Paulina" }.to_xml(@xml_options) do |x|
+      x.creator("Rails")
     end
 
     assert_equal "<person>", xml.first(8)
diff --git a/activesupport/test/core_ext/module/attribute_aliasing_test.rb b/activesupport/test/core_ext/module/attribute_aliasing_test.rb
index 05f7a5c4ca..bd23879513 100644
--- a/activesupport/test/core_ext/module/attribute_aliasing_test.rb
+++ b/activesupport/test/core_ext/module/attribute_aliasing_test.rb
@@ -3,11 +3,15 @@ require File.dirname(__FILE__) + '/../../abstract_unit'
 module AttributeAliasing
   class Content
     attr_accessor :title, :Data
-  
+
+    def initialize
+      @title, @Data = nil, nil
+    end
+
     def title?
       !title.nil?
     end
-    
+
     def Data?
       !self.Data.nil?
     end