Avoid using rinku's auto_link helper

It's currently broken (https://github.com/vmg/rinku/issues/70) and
in case our own linkify has some additional customisations.

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 41bd7c80a205ccf8231ad3e4f739a29d8c014682..b4104079cb75734dd1f5802d9a4401482fe7e598 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -82,7 +82,7 @@ Metrics/BlockNesting:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:

-  Max: 1790
+  Max: 1796

 
 # Offense count: 71
 Metrics/CyclomaticComplexity:
 
 # Offense count: 71
 Metrics/CyclomaticComplexity:

diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder
index ace586ae54cd25d64e987b1164d03fa7a3defcb5..a3b7a224091f66ab9b18f971e6795be211e0a5c9 100644 (file)
--- a/app/views/changeset/list.atom.builder
+++ b/app/views/changeset/list.atom.builder
@@ -62,7 +62,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
                 td.table :cellpadding => "0" do |table|
                   changeset.tags.sort.each do |tag|
                     table.tr do |tr|
                 td.table :cellpadding => "0" do |table|
                   changeset.tags.sort.each do |tag|
                     table.tr do |tr|

-                      tr.td << "#{h(tag[0])} = #{auto_link(h(tag[1]))}"
+                      tr.td << "#{h(tag[0])} = #{linkify(h(tag[1]))}"

                     end
                   end
                 end
                     end
                   end
                 end

diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index b1aa798108ad39d672df0ab37da640827cf7e867..a0f7960c31b7197702ac2927734853e7996c13b3 100644 (file)
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -2060,6 +2060,8 @@ CHANGESET
   # This should display the last 20 non-empty changesets
   def test_feed
     changeset = create(:changeset, :num_changes => 1)
   # This should display the last 20 non-empty changesets
   def test_feed
     changeset = create(:changeset, :num_changes => 1)

+    create(:changeset_tag, :changeset => changeset)
+    create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/")

     closed_changeset = create(:changeset, :closed, :num_changes => 1)
     _empty_changeset = create(:changeset, :num_changes => 0)
 
     closed_changeset = create(:changeset, :closed, :num_changes => 1)
     _empty_changeset = create(:changeset, :num_changes => 0)
 


@@ -2075,6 +2077,8 @@ CHANGESET
   # This should display the last 20 changesets closed in a specific area
   def test_feed_bbox
     changeset = create(:changeset, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
   # This should display the last 20 changesets closed in a specific area
   def test_feed_bbox
     changeset = create(:changeset, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)

+    create(:changeset_tag, :changeset => changeset)
+    create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/")

     closed_changeset = create(:changeset, :closed, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
     _elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
     _empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
     closed_changeset = create(:changeset, :closed, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
     _elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
     _empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)


@@ -2092,6 +2096,8 @@ CHANGESET
   def test_feed_user
     user = create(:user)
     changesets = create_list(:changeset, 3, :user => user, :num_changes => 4)
   def test_feed_user
     user = create(:user)
     changesets = create_list(:changeset, 3, :user => user, :num_changes => 4)

+    create(:changeset_tag, :changeset => changesets[1])
+    create(:changeset_tag, :changeset => changesets[1], :k => "website", :v => "http://example.com/")

     _other_changeset = create(:changeset)
 
     get :feed, :params => { :format => :atom, :display_name => user.display_name }
     _other_changeset = create(:changeset)
 
     get :feed, :params => { :format => :atom, :display_name => user.display_name }