1 files changed, 24 insertions, 4 deletions
diff --git a/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb b/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
index a9fd878b80..cdde6434f2 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
@@ -8,6 +8,16 @@ class ModuleAttributeAccessorPerThreadTest < ActiveSupport::TestCase
       thread_mattr_accessor :bar,  instance_writer: false
       thread_mattr_reader   :shaq, instance_reader: false
       thread_mattr_accessor :camp, instance_accessor: false
+
+      def self.name
+        'MyClass'
+      end
+    end
+
+    @subclass = Class.new(@class) do
+      def self.name
+        'SubMyClass'
+      end
     end
 
     @object = @class.new
@@ -65,15 +75,15 @@ class ModuleAttributeAccessorPerThreadTest < ActiveSupport::TestCase
     threads << Thread.new do
       @class.foo = 'other things'
       sleep 1
-      assert_equal 'other things', @class.foo      
+      assert_equal 'other things', @class.foo
     end
-    
+
     threads << Thread.new do
       @class.foo = 'really other things'
       sleep 1
-      assert_equal 'really other things', @class.foo      
+      assert_equal 'really other things', @class.foo
     end
-    
+
     threads.each { |t| t.join }
   end
 
@@ -112,4 +122,14 @@ class ModuleAttributeAccessorPerThreadTest < ActiveSupport::TestCase
 
     assert_equal @class.foo, @object.foo
   end
+
+  def test_should_not_affect_superclass_if_subclass_set_value
+    @class.foo = 'super'
+    assert_equal @class.foo, 'super'
+    assert_nil @subclass.foo
+
+    @subclass.foo = 'sub'
+    assert_equal @class.foo, 'super'
+    assert_equal @subclass.foo, 'sub'
+  end
 end