X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/908f9b5276602f21f7d492c9949c934dfb1e9365..18b9b9f14cd4dace0aded89ca0c42562faced74f:/test/helpers/application_helper_test.rb?ds=sidebyside

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 80613a81a..fe4587b87 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -13,38 +13,38 @@ class ApplicationHelperTest < ActionView::TestCase
 
   def test_linkify
     %w[http://example.com/test ftp://example.com/test https://example.com/test].each do |link|
-      text = "Test #{link} is made into a link"
+      text = "Test #{link} is <b>made</b> into a link"
 
       html = linkify(text)
-      assert_equal false, html.html_safe?
-      assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is made into a link", html
+      assert html.html_safe?
+      assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is &lt;b&gt;made&lt;/b&gt; into a link", html
 
       html = linkify(text.html_safe)
-      assert_equal true, html.html_safe?
-      assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is made into a link", html
+      assert html.html_safe?
+      assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is <b>made</b> into a link", html
     end
 
     %w[test@example.com mailto:test@example.com].each do |link|
-      text = "Test #{link} is not made into a link"
+      text = "Test #{link} is not <b>made</b> into a link"
 
       html = linkify(text)
-      assert_equal false, html.html_safe?
-      assert_dom_equal text, html
+      assert html.html_safe?
+      assert_dom_equal "Test #{link} is not &lt;b&gt;made&lt;/b&gt; into a link", html
 
       html = linkify(text.html_safe)
-      assert_equal true, html.html_safe?
-      assert_dom_equal text, html
+      assert html.html_safe?
+      assert_dom_equal "Test #{link} is not <b>made</b> into a link", html
     end
   end
 
   def test_rss_link_to
-    link = rss_link_to(:controller => :diary_entry, :action => :rss)
-    assert_dom_equal "<a class=\"rsssmall\" href=\"/diary/rss\"><img alt=\"Rss\" border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
+    link = rss_link_to(:controller => :diary_entries, :action => :rss)
+    assert_dom_equal "<a class=\"rsssmall\" href=\"/diary/rss\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
   end
 
   def test_atom_link_to
-    link = atom_link_to(:controller => :changeset, :action => :feed)
-    assert_dom_equal "<a class=\"rsssmall\" href=\"/history/feed\"><img alt=\"Rss\" border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
+    link = atom_link_to(:controller => :changesets, :action => :feed)
+    assert_dom_equal "<a class=\"rsssmall\" href=\"/history/feed\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
   end
 
   def test_richtext_area