Merge pull request #9406 from rails/3-2-stable-ruby-2

Rails 3.2.x is now compatible with Ruby 2.0.0

3 files changed, 3 insertions, 2 deletions

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index c4c753caed..6db1746672 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -690,7 +690,6 @@ uses_memcached 'memcached backed store' do
       @data = @cache.instance_variable_get(:@data)
       @cache.clear
       @cache.silence!
-      @cache.logger = Logger.new("/dev/null")
     end
 
     include CacheStoreBehavior
diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
index 0b5f912dc4..a7fd9402c8 100644
--- a/activesupport/test/ordered_hash_test.rb
+++ b/activesupport/test/ordered_hash_test.rb
@@ -221,7 +221,6 @@ class OrderedHashTest < Test::Unit::TestCase
     alternate = ActiveSupport::OrderedHash[ [
       [1, 2],
       [3, 4],
-      "bad key value pair",
       [ 'missing value' ]
     ]]
 
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index c4653b1ae6..ab74d579fc 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -16,6 +16,9 @@ module ActiveSupport
       def options
         nil
       end
+
+      def record(*args)
+      end
     end
 
     if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions