X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/25337c0b04903044530a88812fb80b19b1e1ad57..d593d3d2dd6986aa07f5d5268d3e0d7b808590db:/test/helpers/browse_helper_test.rb
diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index 5d5c038c2..8890a0de6 100644
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -1,13 +1,9 @@
-# -*- 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
@@ -17,62 +13,98 @@ class BrowseHelperTest < ActionView::TestCase
end
def test_printable_name
- assert_dom_equal "17", printable_name(current_nodes(:redacted_node))
- assert_dom_equal "Test Node (18)", printable_name(current_nodes(:node_with_name))
- assert_dom_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version))
- assert_dom_equal "18", printable_name(nodes(:node_with_name_redacted_version))
- assert_dom_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
- assert_dom_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 "Test Node (#{node.id})", printable_name(node)
+ assert_dom_equal "Test Node (#{node.id})", printable_name(node_v2)
+ assert_dom_equal node.id.to_s, printable_name(node_v1)
+ assert_dom_equal "Test Node (#{node.id}, v2)", printable_name(node_v2, true)
+ assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
+ assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name)
I18n.locale = "pt"
- assert_dom_equal "17", printable_name(current_nodes(:redacted_node))
- assert_dom_equal "Nó teste (18)", printable_name(current_nodes(:node_with_name))
- assert_dom_equal "Nó teste (18)", printable_name(nodes(:node_with_name_current_version))
- assert_dom_equal "18", printable_name(nodes(:node_with_name_redacted_version))
- assert_dom_equal "Nó teste (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
- assert_dom_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
+ assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
+ assert_dom_equal "Nó teste (#{node.id})", printable_name(node)
+ assert_dom_equal "Nó teste (#{node.id})", printable_name(node_v2)
+ assert_dom_equal node.id.to_s, printable_name(node_v1)
+ assert_dom_equal "Nó teste (#{node.id}, v2)", printable_name(node_v2, true)
+ assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
+ assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name)
I18n.locale = "pt-BR"
- assert_dom_equal "17", printable_name(current_nodes(:redacted_node))
- assert_dom_equal "Nó teste (18)", printable_name(current_nodes(:node_with_name))
- assert_dom_equal "Nó teste (18)", printable_name(nodes(:node_with_name_current_version))
- assert_dom_equal "18", printable_name(nodes(:node_with_name_redacted_version))
- assert_dom_equal "Nó teste (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
- assert_dom_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
+ assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
+ assert_dom_equal "Nó teste (#{node.id})", printable_name(node)
+ assert_dom_equal "Nó teste (#{node.id})", printable_name(node_v2)
+ assert_dom_equal node.id.to_s, printable_name(node_v1)
+ assert_dom_equal "Nó teste (#{node.id}, v2)", printable_name(node_v2, true)
+ assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
+ assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name)
I18n.locale = "de"
- assert_dom_equal "17", printable_name(current_nodes(:redacted_node))
- assert_dom_equal "Test Node (18)", printable_name(current_nodes(:node_with_name))
- assert_dom_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version))
- assert_dom_equal "18", printable_name(nodes(:node_with_name_redacted_version))
- assert_dom_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
- assert_dom_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
+ assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
+ assert_dom_equal "Test Node (#{node.id})", printable_name(node)
+ assert_dom_equal "Test Node (#{node.id})", printable_name(node_v2)
+ assert_dom_equal node.id.to_s, printable_name(node_v1)
+ assert_dom_equal "Test Node (#{node.id}, v2)", printable_name(node_v2, true)
+ assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
+ assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name)
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))
+ 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)
+
+ assert_equal "node", link_class("node", create(:node))
+ assert_equal "node deleted", link_class("node", create(:node, :deleted))
+
+ 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_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))
+ 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)
+
+ assert_equal "", link_title(create(:node))
+ assert_equal "", link_title(create(:node, :deleted))
+
+ 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_format_key
html = format_key("highway")
- assert_dom_equal "highway", html
+ assert_dom_equal "highway", html
html = format_key("unknown")
assert_dom_equal "unknown", html
@@ -80,7 +112,7 @@ class BrowseHelperTest < ActionView::TestCase
def test_format_value
html = format_value("highway", "primary")
- assert_dom_equal "primary", html
+ assert_dom_equal "primary", html
html = format_value("highway", "unknown")
assert_dom_equal "unknown", html
@@ -90,77 +122,145 @@ class BrowseHelperTest < ActionView::TestCase
html = format_value("phone", "+1234567890")
assert_dom_equal "+1234567890", html
+
+ html = format_value("wikipedia", "Test")
+ assert_dom_equal "Test", html
+
+ html = format_value("wikidata", "Q42")
+ assert_dom_equal "Q42", html
+
+ html = format_value("operator:wikidata", "Q12;Q98")
+ assert_dom_equal "Q12;Q98", html
+
+ html = format_value("name:etymology:wikidata", "Q123")
+ assert_dom_equal "Q123", html
end
def test_icon_tags
- tags = icon_tags(current_nodes(:node_with_name))
+ 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)
+
+ tags = icon_tags(node)
assert_equal 3, tags.count
- assert tags.include?(["building", "yes"])
- assert tags.include?(["tourism", "museum"])
- assert tags.include?(["shop", "gift"])
+ assert tags.include?(%w[building yes])
+ assert tags.include?(%w[tourism museum])
+ assert tags.include?(%w[shop gift])
- tags = icon_tags(nodes(:node_with_name_current_version))
+ add_old_tags_selection(node_v2)
+ add_old_tags_selection(node_v1)
+
+ tags = icon_tags(node_v2)
assert_equal 3, tags.count
- assert tags.include?(["building", "yes"])
- assert tags.include?(["tourism", "museum"])
- assert tags.include?(["shop", "gift"])
+ assert tags.include?(%w[building yes])
+ assert tags.include?(%w[tourism museum])
+ assert tags.include?(%w[shop gift])
- tags = icon_tags(nodes(:node_with_name_redacted_version))
+ tags = icon_tags(node_v1)
assert_equal 3, tags.count
- assert tags.include?(["building", "yes"])
- assert tags.include?(["tourism", "museum"])
- assert tags.include?(["shop", "gift"])
+ assert tags.include?(%w[building yes])
+ assert tags.include?(%w[tourism museum])
+ assert tags.include?(%w[shop gift])
end
def test_wiki_link
link = wiki_link("key", "highway")
- assert_equal "http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en", link
+ assert_equal "https://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
+ assert_equal "https://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_equal "https://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link
link = wiki_link("tag", "highway=primary")
- assert_equal "http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link
+ assert_equal "https://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link
I18n.locale = "tr"
link = wiki_link("key", "highway")
- assert_equal "http://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link
+ assert_equal "https://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link
link = wiki_link("tag", "highway=primary")
- assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link
+ assert_equal "https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link
end
- def test_wikidata_link
- link = wikidata_link("foo", "Test")
- assert_nil link
+ def test_wikidata_links
+ ### Non-prefixed wikidata-tag (only one value allowed)
- link = wikidata_link("wikidata", "http://www.wikidata.org/wiki/Q1")
- assert_nil link
+ # Non-wikidata tag
+ links = wikidata_links("foo", "Test")
+ assert_nil links
- link = wikidata_link("wikidata", "en:Q1")
- assert_nil link
+ # No URLs allowed
+ links = wikidata_links("wikidata", "http://www.wikidata.org/entity/Q1")
+ assert_nil links
- link = wikidata_link("wikidata", "1")
- assert_nil link
+ # No language-prefixes (as wikidata is multilanguage)
+ links = wikidata_links("wikidata", "en:Q1")
+ assert_nil links
- link = wikidata_link("wikidata", "Q0123")
- assert_nil link
+ # Needs a leading Q
+ links = wikidata_links("wikidata", "1")
+ assert_nil links
+
+ # No leading zeros allowed
+ links = wikidata_links("wikidata", "Q0123")
+ assert_nil links
- link = wikidata_link("wikidata", "Q42")
- assert_equal "//www.wikidata.org/wiki/Q42?uselang=en", link[:url]
- assert_equal "Q42", link[:title]
+ # A valid value
+ links = wikidata_links("wikidata", "Q42")
+ assert_equal 1, links.length
+ assert_equal "//www.wikidata.org/entity/Q42?uselang=en", links[0][:url]
+ assert_equal "Q42", links[0][:title]
+ # the language of the wikidata-page should match the current locale
I18n.locale = "zh-CN"
+ links = wikidata_links("wikidata", "Q1234")
+ assert_equal 1, links.length
+ assert_equal "//www.wikidata.org/entity/Q1234?uselang=zh-CN", links[0][:url]
+ assert_equal "Q1234", links[0][:title]
+ I18n.locale = "en"
- link = wikidata_link("wikidata", "Q1234")
- assert_equal "//www.wikidata.org/wiki/Q1234?uselang=zh-CN", link[:url]
- assert_equal "Q1234", link[:title]
+ ### Prefixed wikidata-tags
+
+ # Not anything is accepted as prefix (only limited set)
+ links = wikidata_links("anything:wikidata", "Q13")
+ assert_nil links
+
+ # This for example is an allowed key
+ links = wikidata_links("operator:wikidata", "Q24")
+ assert_equal "//www.wikidata.org/entity/Q24?uselang=en", links[0][:url]
+ assert_equal "Q24", links[0][:title]
+
+ # Another allowed key, this time with multiple values and I18n
+ I18n.locale = "dsb"
+ links = wikidata_links("brand:wikidata", "Q936;Q2013;Q1568346")
+ assert_equal 3, links.length
+ assert_equal "//www.wikidata.org/entity/Q936?uselang=dsb", links[0][:url]
+ assert_equal "Q936", links[0][:title]
+ assert_equal "//www.wikidata.org/entity/Q2013?uselang=dsb", links[1][:url]
+ assert_equal "Q2013", links[1][:title]
+ assert_equal "//www.wikidata.org/entity/Q1568346?uselang=dsb", links[2][:url]
+ assert_equal "Q1568346", links[2][:title]
+ I18n.locale = "en"
+
+ # and now with whitespaces...
+ links = wikidata_links("subject:wikidata", "Q6542248 ;\tQ180\n ;\rQ364\t\n\r ;\nQ4006")
+ assert_equal 4, links.length
+ assert_equal "//www.wikidata.org/entity/Q6542248?uselang=en", links[0][:url]
+ assert_equal "Q6542248 ", links[0][:title]
+ assert_equal "//www.wikidata.org/entity/Q180?uselang=en", links[1][:url]
+ assert_equal "\tQ180\n ", links[1][:title]
+ assert_equal "//www.wikidata.org/entity/Q364?uselang=en", links[2][:url]
+ assert_equal "\rQ364\t\n\r ", links[2][:title]
+ assert_equal "//www.wikidata.org/entity/Q4006?uselang=en", links[3][:url]
+ assert_equal "\nQ4006", links[3][:title]
end
def test_wikipedia_link
@@ -171,21 +271,33 @@ class BrowseHelperTest < ActionView::TestCase
assert_nil link
link = wikipedia_link("wikipedia", "Test")
- assert_equal "http://en.wikipedia.org/wiki/Test?uselang=en", link[:url]
+ assert_equal "https://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 "https://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 "https://fr.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
assert_equal "de:Test", link[:title]
+ link = wikipedia_link("wikipedia", "de:Englischer Garten (München)#Japanisches Teehaus")
+ assert_equal "https://de.wikipedia.org/wiki/de:Englischer Garten (München)?uselang=en#Japanisches_Teehaus", link[:url]
+ assert_equal "de:Englischer Garten (München)#Japanisches Teehaus", link[:title]
+
+ link = wikipedia_link("wikipedia", "de:Alte Brücke (Heidelberg)#Brückenaffe")
+ assert_equal "https://de.wikipedia.org/wiki/de:Alte Brücke (Heidelberg)?uselang=en#Br.C3.BCckenaffe", link[:url]
+ assert_equal "de:Alte Brücke (Heidelberg)#Brückenaffe", link[:title]
+
+ link = wikipedia_link("wikipedia", "de:Liste der Baudenkmäler in Eichstätt#BrückenstraÃe 1, Ehemaliges Bauernhaus")
+ assert_equal "https://de.wikipedia.org/wiki/de:Liste der Baudenkmäler in Eichstätt?uselang=en#Br.C3.BCckenstra.C3.9Fe_1.2C_Ehemaliges_Bauernhaus", link[:url]
+ assert_equal "de:Liste der Baudenkmäler in Eichstätt#BrückenstraÃe 1, Ehemaliges Bauernhaus", 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 "https://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")
@@ -235,4 +347,24 @@ class BrowseHelperTest < ActionView::TestCase
link = telephone_link("phone", "+1 (234) 567-890")
assert_equal "tel:+1(234)567-890", link
end
+
+ 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 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
end