Merge remote branch 'rails/master'

4 files changed, 68 insertions, 5 deletions

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 212c1f82a8..b79a7bbaec 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -7,6 +7,49 @@ class CacheKeyTest < ActiveSupport::TestCase
     assert_equal '1/2/true', ActiveSupport::Cache.expand_cache_key([1, '2', true])
     assert_equal 'name/1/2/true', ActiveSupport::Cache.expand_cache_key([1, '2', true], :name)
   end
+
+  def test_expand_cache_key_with_rails_cache_id
+    begin
+      ENV['RAILS_CACHE_ID'] = 'c99'
+      assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
+      assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
+      assert_equal 'c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
+      assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key(:foo, :nm)
+      assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
+      assert_equal 'nm/c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
+    ensure
+      ENV['RAILS_CACHE_ID'] = nil
+    end
+  end
+
+  def test_expand_cache_key_with_rails_app_version
+    begin
+      ENV['RAILS_APP_VERSION'] = 'rails3'
+      assert_equal 'rails3/foo', ActiveSupport::Cache.expand_cache_key(:foo)
+    ensure
+      ENV['RAILS_APP_VERSION'] = nil
+    end
+  end
+
+  def test_expand_cache_key_rails_cache_id_should_win_over_rails_app_version
+    begin
+      ENV['RAILS_CACHE_ID'] = 'c99'
+      ENV['RAILS_APP_VERSION'] = 'rails3'
+      assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
+    ensure
+      ENV['RAILS_CACHE_ID'] = nil
+      ENV['RAILS_APP_VERSION'] = nil
+    end
+  end
+
+  def test_respond_to_cache_key
+    key = 'foo'
+    def key.cache_key
+      :foo_key
+    end
+    assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key(key)
+  end
+
 end
 
 class CacheStoreSettingTest < ActiveSupport::TestCase
diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
index 54376deee5..009a254c64 100644
--- a/activesupport/test/core_ext/array_ext_test.rb
+++ b/activesupport/test/core_ext/array_ext_test.rb
@@ -398,6 +398,18 @@ class ArrayWrapperTests < Test::Unit::TestCase
     def method_missing(*a) @target.send(*a) end
   end
 
+  class DoubtfulToAry
+    def to_ary
+      :not_an_array
+    end
+  end
+
+  class NilToAry
+    def to_ary
+      nil
+    end
+  end
+
   def test_array
     ary = %w(foo bar)
     assert_same ary, Array.wrap(ary)
@@ -438,4 +450,12 @@ class ArrayWrapperTests < Test::Unit::TestCase
     o = Struct.new(:foo).new(123)
     assert_equal [o], Array.wrap(o)
   end
+
+  def test_wrap_returns_nil_if_to_ary_returns_nil
+    assert_nil Array.wrap(NilToAry.new)
+  end
+
+  def test_wrap_does_not_complain_if_to_ary_does_not_return_an_array
+    assert_equal DoubtfulToAry.new.to_ary, Array.wrap(DoubtfulToAry.new)
+  end
 end
diff --git a/activesupport/test/deprecation/proxy_wrappers_test.rb b/activesupport/test/deprecation/proxy_wrappers_test.rb
index c507eff38e..aa887f274d 100644
--- a/activesupport/test/deprecation/proxy_wrappers_test.rb
+++ b/activesupport/test/deprecation/proxy_wrappers_test.rb
@@ -4,19 +4,19 @@ require 'active_support/deprecation'
 class ProxyWrappersTest < Test::Unit::TestCase
   Waffles     = false
   NewWaffles  = :hamburgers
-  
+
   def test_deprecated_object_proxy_doesnt_wrap_falsy_objects
     proxy = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(nil, "message")
     assert !proxy
   end
-  
+
   def test_deprecated_instance_variable_proxy_doesnt_wrap_falsy_objects
     proxy = ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(nil, :waffles)
     assert !proxy
   end
-  
+
   def test_deprecated_constant_proxy_doesnt_wrap_falsy_objects
     proxy = ActiveSupport::Deprecation::DeprecatedConstantProxy.new(Waffles, NewWaffles)
     assert !proxy
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/test/load_paths_test.rb b/activesupport/test/load_paths_test.rb
index c8bc1a2ffe..36e3726a02 100644
--- a/activesupport/test/load_paths_test.rb
+++ b/activesupport/test/load_paths_test.rb
@@ -10,6 +10,6 @@ class LoadPathsTest < Test::Unit::TestCase
     }
     load_paths_count[File.expand_path('../../lib', __FILE__)] -= 1
 
-    assert_equal [], load_paths_count.select { |k, v| v > 1 }, $LOAD_PATH.inspect
+    assert load_paths_count.select { |k, v| v > 1 }.empty?, $LOAD_PATH.inspect
   end
 end