From 1d42a855ce797040b58e6800eddba9ae6837bfc7 Mon Sep 17 00:00:00 2001 From: Pablo Brasero Date: Thu, 12 Mar 2026 17:45:36 +0000 Subject: [PATCH] Convert `UserMailer#gpx_failure` to new style --- app/jobs/trace_importer_job.rb | 6 +++--- app/mailers/user_mailer.rb | 4 +++- test/mailers/previews/user_mailer_preview.rb | 2 +- test/mailers/user_mailer_test.rb | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/jobs/trace_importer_job.rb b/app/jobs/trace_importer_job.rb index c529eb56e..953c20b40 100644 --- a/app/jobs/trace_importer_job.rb +++ b/app/jobs/trace_importer_job.rb @@ -9,17 +9,17 @@ class TraceImporterJob < ApplicationJob if gpx.actual_points.positive? 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 + UserMailer.with(:trace => trace, :error => "0 points parsed ok. Do they all have lat,lng,alt,timestamp?").gpx_failure.deliver trace.destroy end rescue LibXML::XML::Error => e logger.info e.to_s - UserMailer.gpx_failure(trace, e).deliver + UserMailer.with(:trace => trace, :error => e).gpx_failure.deliver trace.destroy rescue StandardError => e logger.info e.to_s e.backtrace.each { |l| logger.info l } - UserMailer.gpx_failure(trace, "#{e}\n#{e.backtrace.join("\n")}").deliver + UserMailer.with(:trace => trace, :error => "#{e}\n#{e.backtrace.join("\n")}").gpx_failure.deliver trace.destroy end end diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index c547bd34f..55dab3f87 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -69,7 +69,9 @@ class UserMailer < ApplicationMailer end end - def gpx_failure(trace, error) + def gpx_failure + trace, error = params.fetch_values(:trace, :error) + with_recipient_locale trace.user do @to_user = trace.user.display_name @trace_name = trace.name diff --git a/test/mailers/previews/user_mailer_preview.rb b/test/mailers/previews/user_mailer_preview.rb index 368d21d77..102d06200 100644 --- a/test/mailers/previews/user_mailer_preview.rb +++ b/test/mailers/previews/user_mailer_preview.rb @@ -50,7 +50,7 @@ class UserMailerPreview < ActionMailer::Preview rescue LibXML::XML::Error => e e.message end - UserMailer.gpx_failure(trace, error) + UserMailer.with(:trace => trace, :error => error).gpx_failure end def message_notification diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb index 9aff18958..dedc5e861 100644 --- a/test/mailers/user_mailer_test.rb +++ b/test/mailers/user_mailer_test.rb @@ -81,7 +81,7 @@ class UserMailerTest < ActionMailer::TestCase def test_gpx_failure_no_trace_link trace = create(:trace) - email = UserMailer.gpx_failure(trace, "some error") + email = UserMailer.with(:trace => trace, :error => "some error").gpx_failure url = url_helpers.show_trace_url(trace.user, trace) assert_select parse_html_body(email), "a[href='#{url}']", :count => 0 -- 2.47.3