From 743cafb7f4a54d162a432c43974a5e5be55fd0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 12 Jan 2010 20:00:53 +0100
Subject: Create Rails::Subscriber::TestHelper and use it to make ActiveRecord
 subscriber tests run in both sync and async scenarios.

---
 railties/test/subscriber_test.rb | 49 +++++++++++++---------------------------
 1 file changed, 16 insertions(+), 33 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/subscriber_test.rb b/railties/test/subscriber_test.rb
index 0d8793abab..db953bb041 100644
--- a/railties/test/subscriber_test.rb
+++ b/railties/test/subscriber_test.rb
@@ -1,25 +1,5 @@
 require 'abstract_unit'
-require 'rails/subscriber'
-
-Thread.abort_on_exception = true
-
-class MockLogger
-  def initialize
-    @logged = Hash.new { |h,k| h[k] = [] }
-  end
-
-  def method_missing(level, message)
-    @logged[level] << message
-  end
-
-  def logged(level)
-    @logged[level].compact.map { |l| l.to_s.strip }
-  end
-end
-
-ActiveSupport::Notifications.subscribe do |*args|
-  Rails::Subscriber.dispatch(args)
-end
+require 'rails/subscriber/test_helper'
 
 class MySubscriber < Rails::Subscriber
   attr_reader :event
@@ -40,16 +20,14 @@ class MySubscriber < Rails::Subscriber
   end
 end
 
-class SubscriberTest < ActiveSupport::TestCase
+module SubscriberTest
   def setup
-    @logger = MockLogger.new
-    @previous_logger, Rails.logger = Rails.logger, @logger
+    super
     @subscriber = MySubscriber.new
-    wait
   end
 
   def teardown
-    Rails.logger = @previous_logger
+    super
     Rails::Subscriber.subscribers.clear
   end
 
@@ -57,10 +35,6 @@ class SubscriberTest < ActiveSupport::TestCase
     ActiveSupport::Notifications.instrument(*args, &block)
   end
 
-  def wait
-    ActiveSupport::Notifications.notifier.wait
-  end
-
   def test_proxies_method_to_rails_logger
     @subscriber.foo(nil)
     assert_equal %w(debug), @logger.logged(:debug)
@@ -69,16 +43,14 @@ class SubscriberTest < ActiveSupport::TestCase
   end
 
   def test_set_color_for_messages
+    Rails::Subscriber.colorize_logging = true
     @subscriber.bar(nil)
     assert_equal "\e[31mcool\e[0m, \e[1m\e[34misn't it?\e[0m", @logger.logged(:info).last
   end
 
   def test_does_not_set_color_if_colorize_logging_is_set_to_false
-    Rails::Subscriber.colorize_logging = false
     @subscriber.bar(nil)
     assert_equal "cool, isn't it?", @logger.logged(:info).last
-  ensure
-    Rails::Subscriber.colorize_logging = true
   end
 
   def test_event_is_sent_to_the_registered_class
@@ -109,4 +81,15 @@ class SubscriberTest < ActiveSupport::TestCase
     wait
     assert_equal [], @logger.logged(:info)
   end
+
+  class SyncSubscriberTest < ActiveSupport::TestCase
+    include Rails::Subscriber::SyncTestHelper
+    include SubscriberTest
+  end
+
+  class AsyncSubscriberTest < ActiveSupport::TestCase
+    include Rails::Subscriber::AsyncTestHelper
+    include SubscriberTest
+  end
+
 end
\ No newline at end of file
-- 
cgit v1.2.3