Merge remote-tracking branch 'upstream/pull/4518'

[rails.git] / test / mailers / user_mailer_test.rb

diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb
index 7857773eec2c1e1bb9bf107954150ee9dbe7532a..751adcd82dc361583bf4e8ea7ca4ad8a8d3ac8f9 100644 (file)
--- a/test/mailers/user_mailer_test.rb
+++ b/test/mailers/user_mailer_test.rb
@@ -15,7 +15,16 @@ class UserMailerTest < ActionMailer::TestCase
     end
     email = UserMailer.gpx_success(trace, 100)
 
-    assert_match(/one two three/, email.html_part.body.to_s)
+    assert_match("<em>one</em>, <em>two</em>, <em>three</em>", email.html_part.body.to_s)
+  end
+
+  def test_gpx_success_all_traces_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.url_for(:controller => "traces", :action => "mine", :host => Settings.server_url, :protocol => Settings.server_protocol)
+    assert_select body, "a[href='#{url}']"
   end
 
   def test_gpx_success_trace_link