Merge pull request #20758 from xijo/action_mailer_message_delivery_respects_i18n_locale

ActionMailer::MessageDelivery respects current I18n.locale

1 files changed, 14 insertions, 6 deletions

diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb
index 862ce26187..7ee4b01067 100644
--- a/actionmailer/test/message_delivery_test.rb
+++ b/actionmailer/test/message_delivery_test.rb
@@ -57,20 +57,20 @@ class MessageDeliveryTest < ActiveSupport::TestCase
   end
 
   test 'should enqueue the email with :deliver_now delivery method' do
-    assert_performed_with(job: ActionMailer::DeliveryJob, args: ['DelayedMailer', 'test_message', 'deliver_now', 1, 2, 3]) do
+    assert_performed_with(job: ActionMailer::DeliveryJob, args: ['DelayedMailer', 'test_message', 'deliver_now', 'en', 1, 2, 3]) do
       @mail.deliver_later
     end
   end
 
   test 'should enqueue the email with :deliver_now! delivery method' do
-    assert_performed_with(job: ActionMailer::DeliveryJob, args: ['DelayedMailer', 'test_message', 'deliver_now!', 1, 2, 3]) do
+    assert_performed_with(job: ActionMailer::DeliveryJob, args: ['DelayedMailer', 'test_message', 'deliver_now!', 'en', 1, 2, 3]) do
       @mail.deliver_later!
     end
   end
 
   test 'should enqueue a delivery with a delay' do
     travel_to Time.new(2004, 11, 24, 01, 04, 44) do
-      assert_performed_with(job: ActionMailer::DeliveryJob, at: Time.current.to_f+600.seconds, args: ['DelayedMailer', 'test_message', 'deliver_now', 1, 2, 3]) do
+      assert_performed_with(job: ActionMailer::DeliveryJob, at: Time.current.to_f+600.seconds, args: ['DelayedMailer', 'test_message', 'deliver_now', 'en', 1, 2, 3]) do
         @mail.deliver_later wait: 600.seconds
       end
     end
@@ -78,20 +78,28 @@ class MessageDeliveryTest < ActiveSupport::TestCase
 
   test 'should enqueue a delivery at a specific time' do
     later_time = Time.now.to_f + 3600
-    assert_performed_with(job: ActionMailer::DeliveryJob, at: later_time, args: ['DelayedMailer', 'test_message', 'deliver_now', 1, 2, 3]) do
+    assert_performed_with(job: ActionMailer::DeliveryJob, at: later_time, args: ['DelayedMailer', 'test_message', 'deliver_now', 'en', 1, 2, 3]) do
       @mail.deliver_later wait_until: later_time
     end
   end
 
   test 'should enqueue the job on the correct queue' do
-    assert_performed_with(job: ActionMailer::DeliveryJob, args: ['DelayedMailer', 'test_message', 'deliver_now', 1, 2, 3], queue: "test_queue") do
+    assert_performed_with(job: ActionMailer::DeliveryJob, args: ['DelayedMailer', 'test_message', 'deliver_now', 'en', 1, 2, 3], queue: "test_queue") do
       @mail.deliver_later
     end
   end
 
   test 'can override the queue when enqueuing mail' do
-    assert_performed_with(job: ActionMailer::DeliveryJob, args: ['DelayedMailer', 'test_message', 'deliver_now', 1, 2, 3], queue: "another_queue") do
+    assert_performed_with(job: ActionMailer::DeliveryJob, args: ['DelayedMailer', 'test_message', 'deliver_now', 'en', 1, 2, 3], queue: "another_queue") do
       @mail.deliver_later(queue: :another_queue)
     end
   end
+
+  test 'should enqueue a delivery with the correct locale' do
+    I18n.with_locale('de') do
+      assert_performed_with(job: ActionMailer::DeliveryJob, args: ['DelayedMailer', 'test_message', 'deliver_now', 'de', 1, 2, 3]) do
+        @mail.deliver_later
+      end
+    end
+  end
 end