diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-24 01:33:18 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-24 01:33:18 +0530 |
| commit | efd0bd3b7390ebb8526b981169025f2860f6a113 (patch) | |
| tree | 1cb3bcd8f9534f64e8a764af1010ce65303b42b0 /activerecord/test/cases/subscriber_test.rb | |
| parent | f4571e3617ccd9cc9e5ee9f7431066bd80395e22 (diff) | |
| parent | 8ff2fb6f3aa6140f5a8bd018d5919a8a1e707cda (diff) | |
| download | rails-efd0bd3b7390ebb8526b981169025f2860f6a113.tar.gz rails-efd0bd3b7390ebb8526b981169025f2860f6a113.tar.bz2 rails-efd0bd3b7390ebb8526b981169025f2860f6a113.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'activerecord/test/cases/subscriber_test.rb')
| -rw-r--r-- | activerecord/test/cases/subscriber_test.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/activerecord/test/cases/subscriber_test.rb b/activerecord/test/cases/subscriber_test.rb index ce91d9385d..5328d4468b 100644 --- a/activerecord/test/cases/subscriber_test.rb +++ b/activerecord/test/cases/subscriber_test.rb @@ -3,7 +3,8 @@ require "models/developer" require "rails/subscriber/test_helper" require "active_record/railties/subscriber" -module SubscriberTest +class SubscriberTest < ActiveSupport::TestCase + include Rails::Subscriber::TestHelper Rails::Subscriber.add(:active_record, ActiveRecord::Railties::Subscriber.new) def setup @@ -38,14 +39,4 @@ module SubscriberTest assert_match /CACHE/, @logger.logged(:debug).last assert_match /SELECT .*?FROM .?developers.?/, @logger.logged(:debug).last 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 |