X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/66d74a8c2c5713cc6c8e22d2a6db3b64de2ae875..d593d3d2dd6986aa07f5d5268d3e0d7b808590db:/test/helpers/browse_helper_test.rb
diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index 62aa73f94..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"
class BrowseHelperTest < ActionView::TestCase
include ERB::Util
include ApplicationHelper
- api_fixtures
-
def setup
I18n.locale = "en"
end
@@ -108,7 +104,7 @@ class BrowseHelperTest < ActionView::TestCase
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
@@ -116,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
@@ -128,13 +124,16 @@ class BrowseHelperTest < ActionView::TestCase
assert_dom_equal "+1234567890", html
html = format_value("wikipedia", "Test")
- assert_dom_equal "Test", html
+ assert_dom_equal "Test", html
html = format_value("wikidata", "Q42")
- assert_dom_equal "Q42", html
+ assert_dom_equal "Q42", html
html = format_value("operator:wikidata", "Q12;Q98")
- assert_dom_equal "Q12;Q98", html
+ assert_dom_equal "Q12;Q98", html
+
+ html = format_value("name:etymology:wikidata", "Q123")
+ assert_dom_equal "Q123", html
end
def test_icon_tags
@@ -147,48 +146,48 @@ 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 tags.include?(%w[building yes])
+ assert tags.include?(%w[tourism museum])
+ assert tags.include?(%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 tags.include?(%w[building yes])
+ assert tags.include?(%w[tourism museum])
+ assert tags.include?(%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))
+ 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_links
@@ -199,7 +198,7 @@ class BrowseHelperTest < ActionView::TestCase
assert_nil links
# No URLs allowed
- links = wikidata_links("wikidata", "http://www.wikidata.org/wiki/Q1")
+ links = wikidata_links("wikidata", "http://www.wikidata.org/entity/Q1")
assert_nil links
# No language-prefixes (as wikidata is multilanguage)
@@ -217,14 +216,14 @@ class BrowseHelperTest < ActionView::TestCase
# 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 "//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/wiki/Q1234?uselang=zh-CN", links[0][:url]
+ assert_equal "//www.wikidata.org/entity/Q1234?uselang=zh-CN", links[0][:url]
assert_equal "Q1234", links[0][:title]
I18n.locale = "en"
@@ -236,31 +235,31 @@ class BrowseHelperTest < ActionView::TestCase
# 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 "//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/wiki/Q936?uselang=dsb", links[0][:url]
+ assert_equal "//www.wikidata.org/entity/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 "//www.wikidata.org/entity/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 "//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/wiki/Q6542248?uselang=en", links[0][:url]
+ assert_equal "//www.wikidata.org/entity/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 "//www.wikidata.org/entity/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 "//www.wikidata.org/entity/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 "//www.wikidata.org/entity/Q4006?uselang=en", links[3][:url]
assert_equal "\nQ4006", links[3][:title]
end
@@ -272,33 +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 "http://de.wikipedia.org/wiki/de:Englischer Garten (München)?uselang=en#Japanisches_Teehaus", link[:url]
+ 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 "http://de.wikipedia.org/wiki/de:Alte Brücke (Heidelberg)?uselang=en#Br.C3.BCckenaffe", link[:url]
+ 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 "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 "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")