diff options
| author | José Valim and Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-22 13:37:29 +1100 |
|---|---|---|
| committer | José Valim and Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-22 13:37:29 +1100 |
| commit | 8a6a2ca712601a28087f78fb6080b05f526cb0fd (patch) | |
| tree | de9347d6a398a4317e0c87981e8c75d442e141d7 /activeresource | |
| parent | c9dc1ac95bc97800dd3deb82fe1cf6f98e27413d (diff) | |
| parent | 6d30002a52133bd105adb29084f4cc72b1ee847f (diff) | |
| download | rails-8a6a2ca712601a28087f78fb6080b05f526cb0fd.tar.gz rails-8a6a2ca712601a28087f78fb6080b05f526cb0fd.tar.bz2 rails-8a6a2ca712601a28087f78fb6080b05f526cb0fd.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/test/cases/subscriber_test.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/activeresource/test/cases/subscriber_test.rb b/activeresource/test/cases/subscriber_test.rb index 7100b02872..3556fbf7cb 100644 --- a/activeresource/test/cases/subscriber_test.rb +++ b/activeresource/test/cases/subscriber_test.rb @@ -3,7 +3,8 @@ require "fixtures/person" require "rails/subscriber/test_helper" require "active_resource/railties/subscriber" -module SubscriberTest +class SubscriberTest < ActiveSupport::TestCase + include Rails::Subscriber::TestHelper Rails::Subscriber.add(:active_resource, ActiveResource::Railties::Subscriber.new) def setup @@ -26,14 +27,4 @@ module SubscriberTest assert_equal "GET http://somewhere.else:80/people/1.xml", @logger.logged(:info)[0] assert_match /\-\-\> 200 200 106/, @logger.logged(:info)[1] 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 |