X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..f1ca64ff84ee66de0fde80ed437e837a79a6e4d8:/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 13f65c976..4cf0ab69a 100644 --- a/test/helpers/browse_helper_test.rb +++ b/test/helpers/browse_helper_test.rb @@ -4,15 +4,7 @@ class BrowseHelperTest < ActionView::TestCase include ERB::Util include ApplicationHelper - def setup - I18n.locale = "en" - end - - def teardown - I18n.locale = "en" - end - - def test_printable_name + def test_printable_element_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) @@ -27,46 +19,54 @@ class BrowseHelperTest < ActionView::TestCase 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) + assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node) + assert_dom_equal "Test Node (#{node.id})", printable_element_name(node) + assert_dom_equal "Test Node (#{node.id})", printable_element_name(node_v2) + assert_dom_equal node.id.to_s, printable_element_name(node_v1) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_element_name(node_with_ref_without_name) + + I18n.with_locale "pt" do + assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node) + assert_dom_equal "Nó teste (#{node.id})", printable_element_name(node) + assert_dom_equal "Nó teste (#{node.id})", printable_element_name(node_v2) + assert_dom_equal node.id.to_s, printable_element_name(node_v1) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_element_name(node_with_ref_without_name) + end - I18n.locale = "pt" + I18n.with_locale "pt-BR" do + assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node) + assert_dom_equal "Nó teste (#{node.id})", printable_element_name(node) + assert_dom_equal "Nó teste (#{node.id})", printable_element_name(node_v2) + assert_dom_equal node.id.to_s, printable_element_name(node_v1) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_element_name(node_with_ref_without_name) + end - 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.with_locale "de" do + assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node) + assert_dom_equal "Test Node (#{node.id})", printable_element_name(node) + assert_dom_equal "Test Node (#{node.id})", printable_element_name(node_v2) + assert_dom_equal node.id.to_s, printable_element_name(node_v1) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_element_name(node_with_ref_without_name) + end + end - I18n.locale = "pt-BR" + def test_element_strikethrough + 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)) - 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) + normal_output = element_strikethrough(node_v2) { "test" } + assert_equal "test", normal_output - I18n.locale = "de" + redacted_output = element_strikethrough(node_v1) { "test" } + assert_equal "test", redacted_output - 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) + deleted_output = element_strikethrough(create(:node, :deleted)) { "test" } + assert_equal "test", deleted_output end - def test_link_class + def test_element_class 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) @@ -76,15 +76,15 @@ class BrowseHelperTest < ActionView::TestCase 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", element_class("node", create(:node)) + assert_equal "node", element_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) + assert_equal "node building yes shop gift tourism museum", element_class("node", node) + assert_equal "node building yes shop gift tourism museum", element_class("node", node_v2) + assert_equal "node", element_class("node", node_v1) end - def test_link_title + def test_element_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) @@ -94,43 +94,12 @@ class BrowseHelperTest < ActionView::TestCase 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_equal "", element_title(create(:node)) + assert_equal "", element_title(create(:node, :deleted)) - html = format_key("unknown") - assert_dom_equal "unknown", html - end - - def test_format_value - html = format_value("highway", "primary") - assert_dom_equal "primary", html - - html = format_value("highway", "unknown") - assert_dom_equal "unknown", html - - html = format_value("unknown", "unknown") - assert_dom_equal "unknown", html - - 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 + assert_equal "building=yes, shop=gift, and tourism=museum", element_title(node) + assert_equal "building=yes, shop=gift, and tourism=museum", element_title(node_v2) + assert_equal "", element_title(node_v1) end def test_icon_tags @@ -143,207 +112,27 @@ class BrowseHelperTest < ActionView::TestCase 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_includes tags, %w[building yes] + assert_includes tags, %w[tourism museum] + assert_includes tags, %w[shop gift] 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_includes tags, %w[building yes] + assert_includes tags, %w[tourism museum] + assert_includes tags, %w[shop gift] 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]) - 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 - - link = wiki_link("tag", "highway=primary") - assert_equal "http://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 - - link = wiki_link("tag", "highway=primary") - assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link - end - - def test_wikidata_links - ### Non-prefixed wikidata-tag (only one value allowed) - - # Non-wikidata tag - links = wikidata_links("foo", "Test") - assert_nil links - - # No URLs allowed - links = wikidata_links("wikidata", "http://www.wikidata.org/wiki/Q1") - assert_nil links - - # No language-prefixes (as wikidata is multilanguage) - links = wikidata_links("wikidata", "en:Q1") - assert_nil links - - # Needs a leading Q - links = wikidata_links("wikidata", "1") - assert_nil links - - # No leading zeros allowed - links = wikidata_links("wikidata", "Q0123") - assert_nil links - - # 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" - - # 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] + 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 - - 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] - - link = wikipedia_link("wikipedia", "de:Englischer Garten (München)#Japanisches Teehaus") - assert_equal "http://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 "http://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 "http://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 "zh-classical:Test#Section", link[:title] - - link = wikipedia_link("foo", "Test") - assert_nil link - 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 - - link = telephone_link("phone", "+1 (234) 567-890") - assert_equal "tel:+1(234)567-890", link - end + private def add_old_tags_selection(old_node) { "building" => "yes", @@ -364,4 +153,8 @@ class BrowseHelperTest < ActionView::TestCase create(:node_tag, :node => node, :k => key, :v => value) end end + + def preferred_languages + Locale.list(I18n.locale) + end end