4 files changed, 131 insertions, 21 deletions
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index a1bd2d5356..2701dc2fe9 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -493,28 +493,32 @@ module CacheStoreBehavior
 
   def test_cache_hit_instrumentation
     key = "test_key"
-    subscribe_executed = false
-    ActiveSupport::Notifications.subscribe "cache_read.active_support" do |name, start, finish, id, payload|
-      subscribe_executed = true
-      assert_equal :fetch, payload[:super_operation]
-      assert payload[:hit]
+    @events = []
+    ActiveSupport::Notifications.subscribe "cache_read.active_support" do |*args|
+      @events << ActiveSupport::Notifications::Event.new(*args)
     end
     assert @cache.write(key, "1", :raw => true)
     assert @cache.fetch(key) {}
-    assert subscribe_executed
+    assert_equal 1, @events.length
+    assert_equal 'cache_read.active_support', @events[0].name
+    assert_equal :fetch, @events[0].payload[:super_operation]
+    assert @events[0].payload[:hit]
   ensure
     ActiveSupport::Notifications.unsubscribe "cache_read.active_support"
   end
 
   def test_cache_miss_instrumentation
-    subscribe_executed = false
-    ActiveSupport::Notifications.subscribe "cache_read.active_support" do |name, start, finish, id, payload|
-      subscribe_executed = true
-      assert_equal :fetch, payload[:super_operation]
-      assert_not payload[:hit]
+    @events = []
+    ActiveSupport::Notifications.subscribe(/^cache_(.*)\.active_support$/) do |*args|
+      @events << ActiveSupport::Notifications::Event.new(*args)
     end
     assert_not @cache.fetch("bad_key") {}
-    assert subscribe_executed
+    assert_equal 3, @events.length
+    assert_equal 'cache_read.active_support', @events[0].name
+    assert_equal 'cache_generate.active_support', @events[1].name
+    assert_equal 'cache_write.active_support', @events[2].name
+    assert_equal :fetch, @events[0].payload[:super_operation]
+    assert_not @events[0].payload[:hit]
   ensure
     ActiveSupport::Notifications.unsubscribe "cache_read.active_support"
   end
@@ -655,14 +659,6 @@ module LocalCacheBehavior
     end
   end
 
-  def test_local_cache_of_read_nil
-    @cache.with_local_cache do
-      assert_equal nil, @cache.read('foo')
-      @cache.send(:bypass_local_cache) { @cache.write 'foo', 'bar' }
-      assert_equal nil, @cache.read('foo')
-    end
-  end
-
   def test_local_cache_of_delete
     @cache.with_local_cache do
       @cache.write('foo', 'bar')
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
new file mode 100644
index 0000000000..65fadc5c20
--- /dev/null
+++ b/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
@@ -0,0 +1,109 @@
+require 'abstract_unit'
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
+
+class ModuleAttributeAccessorPerThreadTest < ActiveSupport::TestCase
+  def setup
+    @class = Class.new do
+      thread_mattr_accessor :foo
+      thread_mattr_accessor :bar,  instance_writer: false
+      thread_mattr_reader   :shaq, instance_reader: false
+      thread_mattr_accessor :camp, instance_accessor: false
+    end
+
+    @object = @class.new
+  end
+
+  def test_should_use_mattr_default
+    Thread.new do
+      assert_nil @class.foo
+      assert_nil @object.foo
+    end.join
+  end
+
+  def test_should_set_mattr_value
+    Thread.new do
+      @class.foo = :test
+      assert_equal :test, @class.foo
+
+      @class.foo = :test2
+      assert_equal :test2, @class.foo
+    end.join
+  end
+
+  def test_should_not_create_instance_writer
+    Thread.new do
+      assert_respond_to @class, :foo
+      assert_respond_to @class, :foo=
+      assert_respond_to @object, :bar
+      assert !@object.respond_to?(:bar=)
+    end.join
+  end
+
+  def test_should_not_create_instance_reader
+    Thread.new do
+      assert_respond_to @class, :shaq
+      assert !@object.respond_to?(:shaq)
+    end.join
+  end
+
+  def test_should_not_create_instance_accessors
+    Thread.new do
+      assert_respond_to @class, :camp
+      assert !@object.respond_to?(:camp)
+      assert !@object.respond_to?(:camp=)
+    end.join
+  end
+
+  def test_values_should_not_bleed_between_threads
+    threads = []
+    threads << Thread.new do
+      @class.foo = 'things'
+      sleep 1
+      assert_equal 'things', @class.foo
+    end
+
+    threads << Thread.new do
+      @class.foo = 'other things'
+      sleep 1
+      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      
+    end
+    
+    threads.each { |t| t.join }
+  end
+
+  def test_should_raise_name_error_if_attribute_name_is_invalid
+    exception = assert_raises NameError do
+      Class.new do
+        thread_cattr_reader "1nvalid"
+      end
+    end
+    assert_equal "invalid attribute name: 1nvalid", exception.message
+
+    exception = assert_raises NameError do
+      Class.new do
+        thread_cattr_writer "1nvalid"
+      end
+    end
+    assert_equal "invalid attribute name: 1nvalid", exception.message
+
+    exception = assert_raises NameError do
+      Class.new do
+        thread_mattr_reader "1valid_part"
+      end
+    end
+    assert_equal "invalid attribute name: 1valid_part", exception.message
+
+    exception = assert_raises NameError do
+      Class.new do
+        thread_mattr_writer "2valid_part"
+      end
+    end
+    assert_equal "invalid attribute name: 2valid_part", exception.message
+  end
+end
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index cd02ad3f3f..58a0a3964d 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -199,7 +199,7 @@ class DeprecationTest < ActiveSupport::TestCase
   end
 
   def test_assert_deprecated_warn_work_with_default_behavior
-    ActiveSupport::Deprecation.instance_variable_set('@behavior' , nil)
+    ActiveSupport::Deprecation.instance_variable_set('@behavior', nil)
     assert_deprecated('abc') do
       ActiveSupport::Deprecation.warn 'abc'
     end
@@ -340,6 +340,10 @@ class DeprecationTest < ActiveSupport::TestCase
     assert_match(/You are calling deprecated method/, object.last_message)
   end
 
+  def test_default_deprecation_horizon_should_always_bigger_than_current_rails_version
+    assert ActiveSupport::Deprecation.new.deprecation_horizon > ActiveSupport::VERSION::STRING
+  end
+
   def test_default_gem_name
     deprecator = ActiveSupport::Deprecation.new
 
diff --git a/activesupport/test/file_update_checker_shared_tests.rb b/activesupport/test/file_update_checker_shared_tests.rb
index 100cbc9756..9c07e38fe5 100644
--- a/activesupport/test/file_update_checker_shared_tests.rb
+++ b/activesupport/test/file_update_checker_shared_tests.rb
@@ -21,6 +21,7 @@ module FileUpdateCheckerSharedTests
   end
 
   test 'should not execute the block if no paths are given' do
+    silence_warnings { require 'listen' }
     i = 0
 
     checker = new_checker { i += 1 }