2 files changed, 32 insertions, 22 deletions

diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb
index 9525dd8307..6c9a24a760 100644
--- a/actionpack/test/activerecord/controller_runtime_test.rb
+++ b/actionpack/test/activerecord/controller_runtime_test.rb
@@ -1,38 +1,53 @@
 require 'active_record_unit'
 require 'active_record/railties/controller_runtime'
 require 'fixtures/project'
+require 'rails/subscriber/test_helper'
+require 'action_controller/railties/subscriber'
 
 ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime
 
-class ARLoggingController < ActionController::Base
-  def show
-    render :inline => "<%= Project.all %>"
+module ControllerRuntimeSubscriberTest
+  class SubscriberController < ActionController::Base
+    def show
+      render :inline => "<%= Project.all %>"
+    end
   end
-end
 
-class ARLoggingTest < ActionController::TestCase
-  tests ARLoggingController
+  def self.included(base)
+    base.tests SubscriberController
+  end
 
   def setup
+    @old_logger = ActionController::Base.logger
+    Rails::Subscriber.add(:action_controller, ActionController::Railties::Subscriber.new)
     super
-    set_logger
   end
 
-  def wait
-    ActiveSupport::Notifications.notifier.wait
+  def teardown
+    super
+    Rails::Subscriber.subscribers.clear
+    ActionController::Base.logger = @old_logger
   end
 
+  def set_logger(logger)
+    ActionController::Base.logger = logger
+  end
+ 
   def test_log_with_active_record
-    # Wait pending notifications to be published
-    wait
     get :show
     wait
-    assert_match /ActiveRecord runtime/, @controller.logger.logged[3]
+
+    assert_equal 4, @logger.logged(:info).size
+    assert_match /ActiveRecord runtime/, @logger.logged(:info)[2]
   end
 
-  private
-    def set_logger
-      @controller.logger = MockLogger.new
-    end
+  class SyncSubscriberTest < ActionController::TestCase
+    include Rails::Subscriber::SyncTestHelper
+    include ControllerRuntimeSubscriberTest
+  end
 
-end
+  class AsyncSubscriberTest < ActionController::TestCase
+    include Rails::Subscriber::AsyncTestHelper
+    include ControllerRuntimeSubscriberTest
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/controller/subscriber_test.rb b/actionpack/test/controller/subscriber_test.rb
index 485143d7b0..374dd63a7d 100644
--- a/actionpack/test/controller/subscriber_test.rb
+++ b/actionpack/test/controller/subscriber_test.rb
@@ -41,11 +41,6 @@ module ActionControllerSubscriberTest
     base.tests Another::SubscribersController
   end
 
-  def wait
-    sleep(0.01)
-    super
-  end
-
   def setup
     @old_logger = ActionController::Base.logger