Merge pull request #55659 from chaadow/fix_deliver_all_later_inline_processing

fatkodima · web-flow · commit 864227e6c35a · 2025-09-11T23:19:00.000+03:00
Do not inline process mailers when calling `deliver_all_later`
diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb
@@ -20,7 +20,7 @@ def deliver_all_later!(*deliveries, **options)
 
     private
       def _deliver_all_later(delivery_method, *deliveries, **options)
-        deliveries.flatten!
+        deliveries = deliveries.first if deliveries.first.is_a?(Array)
 
         jobs = deliveries.map do |delivery|
           mailer_class = delivery.mailer_class
diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb
@@ -160,6 +160,16 @@ class DummyJob < ActionMailer::MailDeliveryJob; end
     end
   end
 
+  test "deliver_all_later does not inline process the mailers" do
+    mail1 = DelayedMailer.test_message(1)
+    mail2 = DelayedMailer.test_message(2)
+
+    ActionMailer.deliver_all_later(mail1, mail2)
+
+    assert_not mail1.processed?
+    assert_not mail2.processed?
+  end
+
   test "deliver_all_later enqueues multiple deliveries with correct jobs" do
     old_delivery_job = BaseMailer.delivery_job
     BaseMailer.delivery_job = DummyJob
