]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f635b98)
Fix trace tag interpolation, and add a test
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 25 Nov 2020 11:34:35 +0000 (11:34 +0000)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 25 Nov 2020 11:34:35 +0000 (11:34 +0000)
app/views/user_mailer/_gpx_description.html.erb patch | blob | history
test/mailers/user_mailer_test.rb patch | blob | history

diff --git a/app/views/user_mailer/_gpx_description.html.erb b/app/views/user_mailer/_gpx_description.html.erb
index ac60ef7b92ffbf793003e2bb9dbd47b29310d146..50fcd69600ff05d966de48f29318df88619113ae 100644 (file)
--- a/app/views/user_mailer/_gpx_description.html.erb
+++ b/app/views/user_mailer/_gpx_description.html.erb
@@ -1,7 +1,7 @@
 <% trace_name = tag.strong(@trace_name) %>
 <% trace_description = tag.em(@trace_description) %>
 <% if @trace_tags.length > 0 %>
 <% trace_name = tag.strong(@trace_name) %>
 <% trace_description = tag.em(@trace_description) %>
 <% if @trace_tags.length > 0 %>
-  <% tags = @trace_tags.map { tag.tag.rstrip.join(" ") } %>
+  <% tags = @trace_tags.map(&:tag).join(" ") %>
   <%= t ".description_with_tags_html", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %>
 <% else %>
   <%= t ".description_with_no_tags_html", :trace_name => trace_name, :trace_description => trace_description %>
   <%= t ".description_with_tags_html", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %>
 <% else %>
   <%= t ".description_with_no_tags_html", :trace_name => trace_name, :trace_description => trace_description %>
diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb
index 23136951cfa9728d3fff6267a9188485c1c8d886..2a4b5a417a92a834c64d65be825d6fa6ed40b232 100644 (file)
--- a/test/mailers/user_mailer_test.rb
+++ b/test/mailers/user_mailer_test.rb
@@ -6,4 +6,15 @@ class UserMailerTest < ActionMailer::TestCase
 
     assert_match(/<html lang=/, email.html_part.body.to_s)
   end
 
     assert_match(/<html lang=/, email.html_part.body.to_s)
   end
+
+  def test_gpx_description_tags
+    trace = create(:trace) do |t|
+      create(:tracetag, :trace => t, :tag => "one")
+      create(:tracetag, :trace => t, :tag => "two")
+      create(:tracetag, :trace => t, :tag => "three")
+    end
+    email = UserMailer.gpx_success(trace, 100)
+
+    assert_match(/one two three/, email.html_part.body.to_s)
+  end
 end
 end
The OpenStreetMap web site