Default to sync instrumentation.

1 files changed, 2 insertions, 11 deletions

diff --git a/actionmailer/test/subscriber_test.rb b/actionmailer/test/subscriber_test.rb
index 01a71f481d..aed5d2ca7e 100644
--- a/actionmailer/test/subscriber_test.rb
+++ b/actionmailer/test/subscriber_test.rb
@@ -2,7 +2,8 @@ require "abstract_unit"
 require "rails/subscriber/test_helper"
 require "action_mailer/railties/subscriber"
 
-module SubscriberTest
+class AMSubscriberTest < ActionMailer::TestCase
+  include Rails::Subscriber::TestHelper
   Rails::Subscriber.add(:action_mailer, ActionMailer::Railties::Subscriber.new)
 
   class TestMailer < ActionMailer::Base
@@ -40,14 +41,4 @@ module SubscriberTest
     assert_equal 1, @logger.logged(:debug).size
     assert_match /Jamis/, @logger.logged(:debug).first
   end
-
-  class SyncSubscriberTest < ActionMailer::TestCase
-    include Rails::Subscriber::SyncTestHelper
-    include SubscriberTest
-  end
-
-  class AsyncSubscriberTest < ActionMailer::TestCase
-    include Rails::Subscriber::AsyncTestHelper
-    include SubscriberTest
-  end
 end
\ No newline at end of file