Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/CHANGELOG
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
	activerecord/lib/active_record/associations/has_many_association.rb
	activerecord/lib/active_record/associations/has_many_through_association.rb
	activerecord/lib/active_record/associations/has_one_association.rb
	activerecord/lib/active_record/associations/has_one_through_association.rb
	activerecord/lib/active_record/associations/through_association_scope.rb
	activerecord/lib/active_record/reflection.rb
	activerecord/test/cases/associations/has_many_through_associations_test.rb
	activerecord/test/cases/associations/has_one_through_associations_test.rb
	activerecord/test/cases/reflection_test.rb
	activerecord/test/cases/relations_test.rb
	activerecord/test/fixtures/memberships.yml
	activerecord/test/models/categorization.rb
	activerecord/test/models/category.rb
	activerecord/test/models/member.rb
	activerecord/test/models/reference.rb
	activerecord/test/models/tagging.rb

1 files changed, 108 insertions, 0 deletions

diff --git a/activesupport/test/class_cache_test.rb b/activesupport/test/class_cache_test.rb
new file mode 100644
index 0000000000..8445af8d25
--- /dev/null
+++ b/activesupport/test/class_cache_test.rb
@@ -0,0 +1,108 @@
+require 'abstract_unit'
+require 'active_support/dependencies'
+
+module ActiveSupport
+  module Dependencies
+    class ClassCacheTest < ActiveSupport::TestCase
+      def setup
+        @cache = ClassCache.new
+      end
+
+      def test_empty?
+        assert @cache.empty?
+        @cache[ClassCacheTest] = ClassCacheTest
+        assert !@cache.empty?
+      end
+
+      def test_clear!
+        assert @cache.empty?
+        @cache[ClassCacheTest] = ClassCacheTest
+        assert !@cache.empty?
+        @cache.clear!
+        assert @cache.empty?
+      end
+
+      def test_set_key
+        @cache[ClassCacheTest] = ClassCacheTest
+        assert @cache.key?(ClassCacheTest.name)
+      end
+
+      def test_set_rejects_strings
+        @cache[ClassCacheTest.name] = ClassCacheTest
+        assert @cache.empty?
+      end
+
+      def test_get_with_class
+        @cache[ClassCacheTest] = ClassCacheTest
+        assert_equal ClassCacheTest, @cache[ClassCacheTest]
+      end
+
+      def test_get_with_name
+        @cache[ClassCacheTest] = ClassCacheTest
+        assert_equal ClassCacheTest, @cache[ClassCacheTest.name]
+      end
+
+      def test_get_constantizes
+        assert @cache.empty?
+        assert_equal ClassCacheTest, @cache[ClassCacheTest.name]
+      end
+
+      def test_get_is_an_alias
+        assert_equal @cache[ClassCacheTest], @cache.get(ClassCacheTest.name)
+      end
+
+      def test_new
+        assert_deprecated do
+          @cache.new ClassCacheTest
+        end
+        assert @cache.key?(ClassCacheTest.name)
+      end
+
+      def test_new_rejects_strings
+        assert_deprecated do
+          @cache.new ClassCacheTest.name
+        end
+        assert !@cache.key?(ClassCacheTest.name)
+      end
+
+      def test_new_rejects_strings
+        @cache.store ClassCacheTest.name
+        assert !@cache.key?(ClassCacheTest.name)
+      end
+
+      def test_store_returns_self
+        x = @cache.store ClassCacheTest
+        assert_equal @cache, x
+      end
+
+      def test_new_returns_proxy
+        v = nil
+        assert_deprecated do
+          v = @cache.new ClassCacheTest.name
+        end
+
+        assert_deprecated do
+          assert_equal ClassCacheTest, v.get
+        end
+      end
+
+      def test_anonymous_class_fail
+        assert_raises(ArgumentError) do
+          assert_deprecated do
+            @cache.new Class.new
+          end
+        end
+
+        assert_raises(ArgumentError) do
+          x = Class.new
+          @cache[x] = x
+        end
+
+        assert_raises(ArgumentError) do
+          x = Class.new
+          @cache.store x
+        end
+      end
+    end
+  end
+end