diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-21 13:05:30 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-21 13:09:12 +0100 |
commit | 378464a2e47bb849f3351cb8c87366554b7ce74d (patch) | |
tree | 98a0aeb321ae4005f45e9c9d4147da1fbef0f7d5 /railties/lib/rails/subscriber/test_helper.rb | |
parent | dcb8b64975832ac75d92104da3c95876e56eec66 (diff) | |
download | rails-378464a2e47bb849f3351cb8c87366554b7ce74d.tar.gz rails-378464a2e47bb849f3351cb8c87366554b7ce74d.tar.bz2 rails-378464a2e47bb849f3351cb8c87366554b7ce74d.zip |
Default to sync instrumentation.
Diffstat (limited to 'railties/lib/rails/subscriber/test_helper.rb')
-rw-r--r-- | railties/lib/rails/subscriber/test_helper.rb | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/railties/lib/rails/subscriber/test_helper.rb b/railties/lib/rails/subscriber/test_helper.rb index 1464767ed9..39b4117372 100644 --- a/railties/lib/rails/subscriber/test_helper.rb +++ b/railties/lib/rails/subscriber/test_helper.rb @@ -1,12 +1,12 @@ require 'rails/subscriber' -require 'active_support/notifications' module Rails class Subscriber # Provides some helpers to deal with testing subscribers by setting up # notifications. Take for instance ActiveRecord subscriber tests: # - # module SubscriberTest + # class SyncSubscriberTest < ActiveSupport::TestCase + # include Rails::Subscriber::TestHelper # Rails::Subscriber.add(:active_record, ActiveRecord::Railties::Subscriber.new) # # def test_basic_query_logging @@ -39,8 +39,6 @@ module Rails # module TestHelper def setup - Thread.abort_on_exception = true - @logger = MockLogger.new @notifier = ActiveSupport::Notifications::Notifier.new(queue) @@ -54,7 +52,6 @@ module Rails def teardown set_logger(nil) ActiveSupport::Notifications.notifier = nil - Thread.abort_on_exception = false end class MockLogger @@ -92,26 +89,9 @@ module Rails def set_logger(logger) Rails.logger = logger end - end - - module SyncTestHelper - include TestHelper - - def queue - ActiveSupport::Notifications::Fanout.new(true) - end - end - - module AsyncTestHelper - include TestHelper def queue - ActiveSupport::Notifications::Fanout.new(false) - end - - def wait - sleep(0.01) - super + ActiveSupport::Notifications::Fanout.new end end end |