From 551d476fb107084deadfa91d79a0def1018dc9ce Mon Sep 17 00:00:00 2001 From: Pablo Brasero Date: Wed, 11 Mar 2026 16:18:50 +0000 Subject: [PATCH] Convert `UserMailer#lost_password` to new style --- app/controllers/passwords_controller.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/passwords_controller.rb b/app/controllers/passwords_controller.rb index 0c9570b5a..aa300b492 100644 --- a/app/controllers/passwords_controller.rb +++ b/app/controllers/passwords_controller.rb @@ -43,7 +43,7 @@ class PasswordsController < ApplicationController if user token = user.generate_token_for(:password_reset) - UserMailer.lost_password(user, token).deliver_later + UserMailer.with(:user => user, :token => token).lost_password.deliver_later end flash[:notice] = t ".send_paranoid_instructions" diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index dc03ea888..bd686eaec 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -40,7 +40,9 @@ class UserMailer < ApplicationMailer end end - def lost_password(user, token) + def lost_password + user, token = params.fetch_values(:user, :token) + with_recipient_locale user do @url = user_reset_password_url(:token => token) diff --git a/test/mailers/previews/user_mailer_preview.rb b/test/mailers/previews/user_mailer_preview.rb index b393d00f1..379f0079b 100644 --- a/test/mailers/previews/user_mailer_preview.rb +++ b/test/mailers/previews/user_mailer_preview.rb @@ -33,7 +33,7 @@ class UserMailerPreview < ActionMailer::Preview def lost_password user = create(:user, :languages => [I18n.locale]) token = "token-123456" - UserMailer.lost_password(user, token) + UserMailer.with(:user => user, :token => token).lost_password end def gpx_success diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb index b2b93a038..b9c382573 100644 --- a/test/mailers/user_mailer_test.rb +++ b/test/mailers/user_mailer_test.rb @@ -41,7 +41,7 @@ class UserMailerTest < ActionMailer::TestCase def test_lost_password user = create(:user, :languages => [I18n.locale]) token = "token-123456" - email = UserMailer.lost_password(user, token) + email = UserMailer.with(:user => user, :token => token).lost_password recovery_url = url_helpers.user_reset_password_url(:token => token) assert_match(ERB::Util.html_escape_once(recovery_url), email.html_part.body.to_s) -- 2.39.5