From 7406f9ccafaea97dc40ea620bfee2bbbec3ca4d7 Mon Sep 17 00:00:00 2001
From: Pablo Brasero <pablo@pablobm.com>
Date: Wed, 11 Mar 2026 14:27:01 +0000
Subject: [PATCH] Convert `UserMailer#email_confirm` to new style

---
 app/controllers/concerns/user_methods.rb     | 2 +-
 app/mailers/user_mailer.rb                   | 4 +++-
 test/mailers/previews/user_mailer_preview.rb | 2 +-
 test/mailers/user_mailer_test.rb             | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/concerns/user_methods.rb b/app/controllers/concerns/user_methods.rb
index 0179bb738..1e3148c9d 100644
--- a/app/controllers/concerns/user_methods.rb
+++ b/app/controllers/concerns/user_methods.rb
@@ -56,7 +56,7 @@ module UserMethods
           flash[:notice] = t "accounts.update.success_confirm_needed"
 
           begin
-            UserMailer.email_confirm(user, token).deliver_later
+            UserMailer.with(:user => user, :token => token).email_confirm.deliver_later
           rescue StandardError
             # Ignore errors sending email
           end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index bce5658f5..dc03ea888 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -27,7 +27,9 @@ class UserMailer < ApplicationMailer
     end
   end
 
-  def email_confirm(user, token)
+  def email_confirm
+    user, token = params.fetch_values(:user, :token)
+
     with_recipient_locale user do
       @address = user.new_email
       @url = url_for(:controller => "confirmations", :action => "confirm_email",
diff --git a/test/mailers/previews/user_mailer_preview.rb b/test/mailers/previews/user_mailer_preview.rb
index fe93e3f70..b393d00f1 100644
--- a/test/mailers/previews/user_mailer_preview.rb
+++ b/test/mailers/previews/user_mailer_preview.rb
@@ -27,7 +27,7 @@ class UserMailerPreview < ActionMailer::Preview
   def email_confirm
     user = create(:user, :languages => [I18n.locale], :new_email => "newemail@example.com")
     token = "token-123456"
-    UserMailer.email_confirm(user, token)
+    UserMailer.with(:user => user, :token => token).email_confirm
   end
 
   def lost_password
diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb
index 8f6413fe3..b2b93a038 100644
--- a/test/mailers/user_mailer_test.rb
+++ b/test/mailers/user_mailer_test.rb
@@ -27,7 +27,7 @@ class UserMailerTest < ActionMailer::TestCase
   def test_email_confirm
     user = create(:user, :languages => [I18n.locale])
     token = "token-123456"
-    email = UserMailer.email_confirm(user, token)
+    email = UserMailer.with(:user => user, :token => token).email_confirm
 
     confirmation_url = url_helpers.url_for(
       :controller => "confirmations",
-- 
2.39.5