Fix legacy fallback for parameterized mailers

2 files changed, 4 insertions, 5 deletions

diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index f647896374..448807c144 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -33,6 +33,8 @@ I18n.enforce_available_locales = false
 FIXTURE_LOAD_PATH = File.expand_path("fixtures", __dir__)
 ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
 
+ActionMailer::Base.delivery_job = ActionMailer::MailDeliveryJob
+
 class ActiveSupport::TestCase
   include ActiveSupport::Testing::MethodCallAssertions
 
diff --git a/actionmailer/test/legacy_delivery_job_test.rb b/actionmailer/test/legacy_delivery_job_test.rb
index 112c842beb..3a3872df47 100644
--- a/actionmailer/test/legacy_delivery_job_test.rb
+++ b/actionmailer/test/legacy_delivery_job_test.rb
@@ -11,9 +11,6 @@ class LegacyDeliveryJobTest < ActiveSupport::TestCase
   class LegacyDeliveryJob < ActionMailer::DeliveryJob
   end
 
-  class LegacyParmeterizedDeliveryJob < ActionMailer::Parameterized::DeliveryJob
-  end
-
   setup do
     @previous_logger = ActiveJob::Base.logger
     ActiveJob::Base.logger = Logger.new(nil)
@@ -42,9 +39,9 @@ class LegacyDeliveryJobTest < ActiveSupport::TestCase
       { inviter: "david@basecamp.com", invitee: "jason@basecamp.com" },
     ]
 
-    with_delivery_job(LegacyParmeterizedDeliveryJob) do
+    with_delivery_job(LegacyDeliveryJob) do
       assert_deprecated do
-        assert_performed_with(job: LegacyParmeterizedDeliveryJob, args: args) do
+        assert_performed_with(job: ActionMailer::Parameterized::DeliveryJob, args: args) do
           mail.deliver_later
         end
       end