X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/75e07dc5b8407b121b6228c4ee1ed595944a536a..ffdd812eaf77827c123d3ed30f638c506688c560:/test/helpers/browse_helper_test.rb?ds=sidebyside

diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index d5f7a91e6..a20e1703d 100644
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -1,207 +1,152 @@
-# -*- coding: utf-8 -*-
-
-require 'test_helper'
+require "test_helper"
 
 class BrowseHelperTest < ActionView::TestCase
   include ERB::Util
   include ApplicationHelper
 
-  api_fixtures
-
-  def setup
-    I18n.locale = "en"
-  end
-
   def test_printable_name
-    assert_equal "17", printable_name(current_nodes(:redacted_node))
-    assert_equal "<bdi>Test Node</bdi> (<bdi>18</bdi>)", printable_name(current_nodes(:node_with_name))
-    assert_equal "<bdi>Test Node</bdi> (<bdi>18</bdi>)", printable_name(nodes(:node_with_name_current_version))
-    assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
-    assert_equal "<bdi>Test Node</bdi> (<bdi>18, v2</bdi>)", printable_name(nodes(:node_with_name_current_version), true)
-    assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
-
-    I18n.locale = "ru"
-
-    assert_equal "17", printable_name(current_nodes(:redacted_node))
-    assert_equal "<bdi>проверки узла</bdi> (<bdi>18</bdi>)", printable_name(current_nodes(:node_with_name))
-    assert_equal "<bdi>проверки узла</bdi> (<bdi>18</bdi>)", printable_name(nodes(:node_with_name_current_version))
-    assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
-    assert_equal "<bdi>проверки узла</bdi> (<bdi>18, v2</bdi>)", printable_name(nodes(:node_with_name_current_version), true)
-    assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
-
-    I18n.locale = "ru-RU"
-
-    assert_equal "17", printable_name(current_nodes(:redacted_node))
-    assert_equal "<bdi>проверки узла</bdi> (<bdi>18</bdi>)", printable_name(current_nodes(:node_with_name))
-    assert_equal "<bdi>проверки узла</bdi> (<bdi>18</bdi>)", printable_name(nodes(:node_with_name_current_version))
-    assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
-    assert_equal "<bdi>проверки узла</bdi> (<bdi>18, v2</bdi>)", printable_name(nodes(:node_with_name_current_version), true)
-    assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
-
-    I18n.locale = "de"
-
-    assert_equal "17", printable_name(current_nodes(:redacted_node))
-    assert_equal "<bdi>Test Node</bdi> (<bdi>18</bdi>)", printable_name(current_nodes(:node_with_name))
-    assert_equal "<bdi>Test Node</bdi> (<bdi>18</bdi>)", printable_name(nodes(:node_with_name_current_version))
-    assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
-    assert_equal "<bdi>Test Node</bdi> (<bdi>18, v2</bdi>)", printable_name(nodes(:node_with_name_current_version), true)
-    assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
+    node = create(:node, :with_history, :version => 2)
+    node_v1 = node.old_nodes.find_by(:version => 1)
+    node_v2 = node.old_nodes.find_by(:version => 2)
+    node_v1.redact!(create(:redaction))
+
+    add_tags_selection(node)
+    add_old_tags_selection(node_v2)
+    add_old_tags_selection(node_v1)
+
+    node_with_ref_without_name = create(:node)
+    create(:node_tag, :node => node_with_ref_without_name, :k => "ref", :v => "3.1415926")
+
+    deleted_node = create(:node, :deleted)
+
+    assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
+    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
+    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
+    assert_dom_equal node.id.to_s, printable_name(node_v1)
+    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
+    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
+    assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
+
+    I18n.with_locale "pt" do
+      assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
+      assert_dom_equal node.id.to_s, printable_name(node_v1)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
+      assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
+      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
+    end
+
+    I18n.with_locale "pt-BR" do
+      assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
+      assert_dom_equal node.id.to_s, printable_name(node_v1)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
+      assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
+      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
+    end
+
+    I18n.with_locale "de" do
+      assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
+      assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
+      assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
+      assert_dom_equal node.id.to_s, printable_name(node_v1)
+      assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
+      assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
+      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
+    end
   end
 
   def test_link_class
-    assert_equal "node", link_class("node", current_nodes(:visible_node))
-    assert_equal "node deleted", link_class("node", current_nodes(:invisible_node))
-    assert_equal "node deleted", link_class("node", current_nodes(:redacted_node))
-    assert_equal "node building yes shop gift tourism museum", link_class("node", current_nodes(:node_with_name))
-    assert_equal "node building yes shop gift tourism museum", link_class("node", nodes(:node_with_name_current_version))
-    assert_equal "node deleted", link_class("node", nodes(:node_with_name_redacted_version))
-  end
+    node = create(:node, :with_history, :version => 2)
+    node_v1 = node.old_nodes.find_by(:version => 1)
+    node_v2 = node.old_nodes.find_by(:version => 2)
+    node_v1.redact!(create(:redaction))
 
-  def test_link_title
-    assert_equal "", link_title(current_nodes(:visible_node))
-    assert_equal "", link_title(current_nodes(:invisible_node))
-    assert_equal "", link_title(current_nodes(:redacted_node))
-    assert_equal "building=yes, shop=gift, and tourism=museum", link_title(current_nodes(:node_with_name))
-    assert_equal "building=yes, shop=gift, and tourism=museum", link_title(nodes(:node_with_name_current_version))
-    assert_equal "", link_title(nodes(:node_with_name_redacted_version))
-  end
+    add_tags_selection(node)
+    add_old_tags_selection(node_v2)
+    add_old_tags_selection(node_v1)
 
-  def test_format_key
-    html = format_key("highway")
-    assert_equal "<a href=\"http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en\" title=\"The wiki description page for the highway tag\">highway</a>", html
+    assert_equal "node", link_class("node", create(:node))
+    assert_equal "node deleted", link_class("node", create(:node, :deleted))
 
-    html = format_key("unknown")
-    assert_equal "unknown", html
+    assert_equal "node building yes shop gift tourism museum", link_class("node", node)
+    assert_equal "node building yes shop gift tourism museum", link_class("node", node_v2)
+    assert_equal "node deleted", link_class("node", node_v1)
   end
 
-  def test_format_value
-    html = format_value("highway", "primary")
-    assert_equal "<a href=\"http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en\" title=\"The wiki description page for the highway=primary tag\">primary</a>", html
+  def test_link_title
+    node = create(:node, :with_history, :version => 2)
+    node_v1 = node.old_nodes.find_by(:version => 1)
+    node_v2 = node.old_nodes.find_by(:version => 2)
+    node_v1.redact!(create(:redaction))
 
-    html = format_value("highway", "unknown")
-    assert_equal "unknown", html
+    add_tags_selection(node)
+    add_old_tags_selection(node_v2)
+    add_old_tags_selection(node_v1)
 
-    html = format_value("unknown", "unknown")
-    assert_equal "unknown", html
+    assert_equal "", link_title(create(:node))
+    assert_equal "", link_title(create(:node, :deleted))
 
-    html = format_value("phone", "+1234567890")
-    assert_equal "<a href=\"tel:+1234567890\" title=\"Call +1234567890\">+1234567890</a>", html
+    assert_equal "building=yes, shop=gift, and tourism=museum", link_title(node)
+    assert_equal "building=yes, shop=gift, and tourism=museum", link_title(node_v2)
+    assert_equal "", link_title(node_v1)
   end
 
   def test_icon_tags
-    tags = icon_tags(current_nodes(:node_with_name))
-    assert_equal 3, tags.count
-    assert tags.include?(["building", "yes"])
-    assert tags.include?(["tourism", "museum"])
-    assert tags.include?(["shop", "gift"])
+    node = create(:node, :with_history, :version => 2)
+    node_v1 = node.old_nodes.find_by(:version => 1)
+    node_v2 = node.old_nodes.find_by(:version => 2)
+    node_v1.redact!(create(:redaction))
 
-    tags = icon_tags(nodes(:node_with_name_current_version))
-    assert_equal 3, tags.count
-    assert tags.include?(["building", "yes"])
-    assert tags.include?(["tourism", "museum"])
-    assert tags.include?(["shop", "gift"])
+    add_tags_selection(node)
 
-    tags = icon_tags(nodes(:node_with_name_redacted_version))
+    tags = icon_tags(node)
     assert_equal 3, tags.count
-    assert tags.include?(["building", "yes"])
-    assert tags.include?(["tourism", "museum"])
-    assert tags.include?(["shop", "gift"])
-  end
-
-  def test_wiki_link
-    link = wiki_link("key", "highway")
-    assert_equal "http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en", link
-
-    link = wiki_link("tag", "highway=primary")
-    assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en", link
-
-    I18n.locale = "de"
-
-    link = wiki_link("key", "highway")
-    assert_equal "http://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link
+    assert_includes tags, %w[building yes]
+    assert_includes tags, %w[tourism museum]
+    assert_includes tags, %w[shop gift]
 
-    link = wiki_link("tag", "highway=primary")
-    assert_equal "http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link
+    add_old_tags_selection(node_v2)
+    add_old_tags_selection(node_v1)
 
-    I18n.locale = "tr"
-
-    link = wiki_link("key", "highway")
-    assert_equal "http://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link
+    tags = icon_tags(node_v2)
+    assert_equal 3, tags.count
+    assert_includes tags, %w[building yes]
+    assert_includes tags, %w[tourism museum]
+    assert_includes tags, %w[shop gift]
 
-    link = wiki_link("tag", "highway=primary")
-    assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link
+    tags = icon_tags(node_v1)
+    assert_equal 3, tags.count
+    assert_includes tags, %w[building yes]
+    assert_includes tags, %w[tourism museum]
+    assert_includes tags, %w[shop gift]
   end
 
-  def test_wikipedia_link
-    link = wikipedia_link("wikipedia", "http://en.wikipedia.org/wiki/Full%20URL")
-    assert_nil link
-
-    link = wikipedia_link("wikipedia", "https://en.wikipedia.org/wiki/Full%20URL")
-    assert_nil link
+  private
 
-    link = wikipedia_link("wikipedia", "Test")
-    assert_equal "http://en.wikipedia.org/wiki/Test?uselang=en", link[:url]
-    assert_equal "Test", link[:title]
-
-    link = wikipedia_link("wikipedia", "de:Test")
-    assert_equal "http://de.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
-    assert_equal "de:Test", link[:title]
-
-    link = wikipedia_link("wikipedia:fr", "de:Test")
-    assert_equal "http://fr.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
-    assert_equal "de:Test", link[:title]
-
-    I18n.locale = "pt-BR"
-
-    link = wikipedia_link("wikipedia", "zh-classical:Test#Section")
-    assert_equal "http://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url]
-    assert_equal "zh-classical:Test#Section", link[:title]
-
-    link = wikipedia_link("foo", "Test")
-    assert_nil link
+  def add_old_tags_selection(old_node)
+    { "building" => "yes",
+      "shop" => "gift",
+      "tourism" => "museum",
+      "name" => "Test Node",
+      "name:pt" => "Nó teste" }.each do |key, value|
+      create(:old_node_tag, :old_node => old_node, :k => key, :v => value)
+    end
   end
 
-  def test_telephone_link
-    link = telephone_link("foo", "Test")
-    assert_nil link
-
-    link = telephone_link("phone", "+123")
-    assert_nil link
-
-    link = telephone_link("phone", "123")
-    assert_nil link
-
-    link = telephone_link("phone", "123 abcdefg")
-    assert_nil link
-
-    link = telephone_link("phone", "+1234567890 abc")
-    assert_nil link
-
-    link = telephone_link("phone", "+1234567890; +22334455667788")
-    assert_nil link
-
-    link = telephone_link("phone", "1234567890")
-    assert_nil link
-
-    link = telephone_link("phone", "+1234567890")
-    assert_equal "tel:+1234567890", link
-
-    link = telephone_link("phone", "+1234-567-890")
-    assert_equal "tel:+1234-567-890", link
-
-    link = telephone_link("phone", "+1234/567/890")
-    assert_equal "tel:+1234/567/890", link
-
-    link = telephone_link("phone", "+1234.567.890")
-    assert_equal "tel:+1234.567.890", link
-
-    link = telephone_link("phone", "   +1234 567-890	")
-    assert_equal "tel:+1234567-890", link
-
-    link = telephone_link("phone", "+1 234-567-890")
-    assert_equal "tel:+1234-567-890", link
+  def add_tags_selection(node)
+    { "building" => "yes",
+      "shop" => "gift",
+      "tourism" => "museum",
+      "name" => "Test Node",
+      "name:pt" => "Nó teste" }.each do |key, value|
+      create(:node_tag, :node => node, :k => key, :v => value)
+    end
+  end
 
-    link = telephone_link("phone", "+1 (234) 567-890")
-    assert_equal "tel:+1(234)567-890", link
+  def preferred_languages
+    Locale.list(I18n.locale)
   end
 end