Link to trace pages from successful import emails

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 8ca186aad92141dcc235c9d7f1b634b3e93c7c1d..613c758792481af67da2f661bb3a707682eb25e0 100644 (file)
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -44,6 +44,7 @@ class UserMailer < ApplicationMailer
   def gpx_success(trace, possible_points)
     with_recipient_locale trace.user do
       @to_user = trace.user.display_name
+      @trace_url = show_trace_url(trace.user, trace)
       @trace_name = trace.name
       @trace_points = trace.size
       @trace_description = trace.description

diff --git a/app/views/user_mailer/_gpx_description.html.erb b/app/views/user_mailer/_gpx_description.html.erb
index 50fcd69600ff05d966de48f29318df88619113ae..eb9d5e102340e12f0d5f1435d8cdc702369bbc56 100644 (file)
--- a/app/views/user_mailer/_gpx_description.html.erb
+++ b/app/views/user_mailer/_gpx_description.html.erb
@@ -1,4 +1,4 @@
-<% trace_name = tag.strong(@trace_name) %>
+<% trace_name = link_to tag.strong(@trace_name), @trace_url %>
 <% trace_description = tag.em(@trace_description) %>
 <% if @trace_tags.length > 0 %>
   <% tags = @trace_tags.map(&:tag).join(" ") %>

diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb
index 537bb9d0ddf60ec4220007d56d3c6986f524be7b..1e3d9cc743f0c1f183a06439a8146ef1f0d1dc5a 100644 (file)
--- a/test/mailers/user_mailer_test.rb
+++ b/test/mailers/user_mailer_test.rb
@@ -18,6 +18,15 @@ class UserMailerTest < ActionMailer::TestCase
     assert_match(/one two three/, email.html_part.body.to_s)
   end
 
+  def test_gpx_trace_link
+    trace = create(:trace)
+    email = UserMailer.gpx_success(trace, 100)
+    body = Rails::Dom::Testing.html_document_fragment.parse(email.html_part.body)
+
+    url = Rails.application.routes.url_helpers.show_trace_url(trace.user, trace, :host => Settings.server_url, :protocol => Settings.server_protocol)
+    assert_select body, "a[href='#{url}']", :text => trace.name
+  end
+
   def test_html_encoding
     user = create(:user, :display_name => "Jack & Jill <br>")
     message = create(:message, :sender => user)