From: Tom Hughes <tom@compton.nu>
Date: Mon, 10 Sep 2018 17:53:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1983'
X-Git-Tag: live~2960
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/568a447a8cf8a9e3af4f0d776c7a776db7ab32c7?hp=744fadccd9e4d46ae9807f1a7634c910fa0255b6

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

diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb
index 605c47555..7cfc468b2 100644
--- a/test/controllers/traces_controller_test.rb
+++ b/test/controllers/traces_controller_test.rb
@@ -1032,8 +1032,8 @@ class TracesControllerTest < ActionController::TestCase
         assert_select "item", :count => traces.length do |items|
           traces.zip(items).each do |trace, item|
             assert_select item, "title", trace.name
-            assert_select item, "link", "http://test.host/user/#{trace.user.display_name.gsub(' ', '%20')}/traces/#{trace.id}"
-            assert_select item, "guid", "http://test.host/user/#{trace.user.display_name.gsub(' ', '%20')}/traces/#{trace.id}"
+            assert_select item, "link", "http://test.host/user/#{ERB::Util.u(trace.user.display_name)}/traces/#{trace.id}"
+            assert_select item, "guid", "http://test.host/user/#{ERB::Util.u(trace.user.display_name)}/traces/#{trace.id}"
             assert_select item, "description"
             # assert_select item, "dc:creator", trace.user.display_name
             assert_select item, "pubDate", trace.timestamp.rfc822