X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca5de5b4e01297b07ce3a9db45e908f15f7cda11..21683db838d66d5b14da08dd5fd467fae09515d4:/test/helpers/browse_helper_test.rb?ds=inline diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb index e34af0930..13f65c976 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" class BrowseHelperTest < ActionView::TestCase include ERB::Util include ApplicationHelper - api_fixtures - def setup I18n.locale = "en" end @@ -17,61 +13,93 @@ 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) - assert_dom_equal "3.1415926 (19)", printable_name(current_nodes(:node_with_ref_without_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) + 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 "3.1415926 (19)", printable_name(current_nodes(:node_with_ref_without_name)) + 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 "3.1415926 (19)", printable_name(current_nodes(:node_with_ref_without_name)) + 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 "3.1415926 (19)", printable_name(current_nodes(:node_with_ref_without_name)) + 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 @@ -100,26 +128,39 @@ class BrowseHelperTest < ActionView::TestCase html = format_value("wikidata", "Q42") assert_dom_equal "Q42", html + + html = format_value("operator:wikidata", "Q12;Q98") + assert_dom_equal "Q12;Q98", 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?(%w(building yes)) - assert tags.include?(%w(tourism museum)) - assert tags.include?(%w(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?(%w(building yes)) - assert tags.include?(%w(tourism museum)) - assert tags.include?(%w(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?(%w(building yes)) - assert tags.include?(%w(tourism museum)) - assert tags.include?(%w(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 @@ -146,31 +187,77 @@ class BrowseHelperTest < ActionView::TestCase assert_equal "http://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/wiki/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/wiki/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/wiki/Q1234?uselang=zh-CN", links[0][:url] + assert_equal "Q1234", links[0][:title] + I18n.locale = "en" + + ### 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/wiki/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/wiki/Q936?uselang=dsb", links[0][:url] + assert_equal "Q936", links[0][:title] + assert_equal "//www.wikidata.org/wiki/Q2013?uselang=dsb", links[1][:url] + assert_equal "Q2013", links[1][:title] + assert_equal "//www.wikidata.org/wiki/Q1568346?uselang=dsb", links[2][:url] + assert_equal "Q1568346", links[2][: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] + # 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/wiki/Q6542248?uselang=en", links[0][:url] + assert_equal "Q6542248 ", links[0][:title] + assert_equal "//www.wikidata.org/wiki/Q180?uselang=en", links[1][:url] + assert_equal "\tQ180\n ", links[1][:title] + assert_equal "//www.wikidata.org/wiki/Q364?uselang=en", links[2][:url] + assert_equal "\rQ364\t\n\r ", links[2][:title] + assert_equal "//www.wikidata.org/wiki/Q4006?uselang=en", links[3][:url] + assert_equal "\nQ4006", links[3][:title] end def test_wikipedia_link @@ -257,4 +344,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