From 25d0ecf36833e912c972459364b8a06cabfe12ac Mon Sep 17 00:00:00 2001 From: Pablo Brasero Date: Thu, 12 Mar 2026 17:45:36 +0000 Subject: [PATCH] Convert `UserMailer#gpx_success` to new style --- app/jobs/trace_importer_job.rb | 2 +- app/mailers/user_mailer.rb | 4 +++- test/mailers/previews/user_mailer_preview.rb | 2 +- test/mailers/user_mailer_test.rb | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/jobs/trace_importer_job.rb b/app/jobs/trace_importer_job.rb index abb14c1b9..c529eb56e 100644 --- a/app/jobs/trace_importer_job.rb +++ b/app/jobs/trace_importer_job.rb @@ -7,7 +7,7 @@ class TraceImporterJob < ApplicationJob gpx = trace.import if gpx.actual_points.positive? - UserMailer.gpx_success(trace, gpx.actual_points).deliver + UserMailer.with(:trace => trace, :possible_points => gpx.actual_points).gpx_success.deliver else UserMailer.gpx_failure(trace, "0 points parsed ok. Do they all have lat,lng,alt,timestamp?").deliver trace.destroy diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index abfadbd23..c547bd34f 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -51,7 +51,9 @@ class UserMailer < ApplicationMailer end end - def gpx_success(trace, possible_points) + def gpx_success + trace, possible_points = params.fetch_values(:trace, :possible_points) + with_recipient_locale trace.user do @to_user = trace.user.display_name @trace_url = show_trace_url(trace.user, trace) diff --git a/test/mailers/previews/user_mailer_preview.rb b/test/mailers/previews/user_mailer_preview.rb index ebce04c72..368d21d77 100644 --- a/test/mailers/previews/user_mailer_preview.rb +++ b/test/mailers/previews/user_mailer_preview.rb @@ -39,7 +39,7 @@ class UserMailerPreview < ActionMailer::Preview def gpx_success user = create(:user, :languages => [I18n.locale]) trace = create(:trace, :user => user) - UserMailer.gpx_success(trace, trace.size + 2) + UserMailer.with(:trace => trace, :possible_points => trace.size + 2).gpx_success end def gpx_failure diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb index a0de146d2..9aff18958 100644 --- a/test/mailers/user_mailer_test.rb +++ b/test/mailers/user_mailer_test.rb @@ -54,7 +54,7 @@ class UserMailerTest < ActionMailer::TestCase create(:tracetag, :trace => t, :tag => "two&three") create(:tracetag, :trace => t, :tag => "four trace, :possible_points => 100).gpx_success assert_match("one, two&three, four<five", email.html_part.body.to_s) assert_match("one, two&three, four trace, :possible_points => 100).gpx_success url = url_helpers.url_for(:controller => "traces", :action => "mine") assert_select Rails::Dom::Testing.html_document_fragment.parse(email.html_part.body), @@ -72,7 +72,7 @@ class UserMailerTest < ActionMailer::TestCase def test_gpx_success_trace_link trace = create(:trace) - email = UserMailer.gpx_success(trace, 100) + email = UserMailer.with(:trace => trace, :possible_points => 100).gpx_success url = url_helpers.show_trace_url(trace.user, trace) assert_select parse_html_body(email), "a[href='#{url}']", :text => trace.name -- 2.39.5