Merge remote-tracking branch 'upstream/pull/4530'

[rails.git] / test / helpers / browse_helper_test.rb

diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index 27e0e77095487854e6ff28c7bb296374f0750dc2..4cf0ab69ad3aab53863c4c2872ffda8a45a03073 100644 (file)
--- 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
 
   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)
     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)
 
 
     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, true)
-    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
-    assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
+    assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node)
+    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node)
+    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node_v2)
+    assert_dom_equal node.id.to_s, printable_element_name(node_v1)
+    assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", 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 "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node_v2)
+      assert_dom_equal node.id.to_s, printable_element_name(node_v1)
+      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", 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 "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node_v2)
+      assert_dom_equal node.id.to_s, printable_element_name(node_v1)
+      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_element_name(node_with_ref_without_name)
+    end

 
 

-    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, true)
-    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, 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 "de" do
+      assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node)
+      assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node)
+      assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node_v2)
+      assert_dom_equal node.id.to_s, printable_element_name(node_v1)
+      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", 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 "<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, true)
-    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
-    assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", 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 "<s>test</s>", redacted_output

 
 

-    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, true)
-    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
-    assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
+    deleted_output = element_strikethrough(create(:node, :deleted)) { "test" }
+    assert_equal "<s>test</s>", deleted_output

   end
 
   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)
     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)
 
     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
 
   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)
     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,49 +94,12 @@ class BrowseHelperTest < ActionView::TestCase
     add_old_tags_selection(node_v2)
     add_old_tags_selection(node_v1)
 
     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 "<a href=\"https://wiki.openstreetmap.org/wiki/Key:highway?uselang=en\" title=\"The wiki description page for the highway tag\">highway</a>", 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 "<a href=\"https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en\" title=\"The wiki description page for the highway=primary tag\">primary</a>", 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 "<a href=\"tel:+1234567890\" title=\"Call +1234567890\">+1234567890</a>", html
-
-    html = format_value("wikipedia", "Test")
-    assert_dom_equal "<a title=\"The Test article on Wikipedia\" href=\"https://en.wikipedia.org/wiki/Test?uselang=en\">Test</a>", html
-
-    html = format_value("wikidata", "Q42")
-    assert_dom_equal "<a title=\"The Q42 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q42?uselang=en\">Q42</a>", html
-
-    html = format_value("operator:wikidata", "Q12;Q98")
-    assert_dom_equal "<a title=\"The Q12 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q12?uselang=en\">Q12</a>;<a title=\"The Q98 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q98?uselang=en\">Q98</a>", html
-
-    html = format_value("name:etymology:wikidata", "Q123")
-    assert_dom_equal "<a title=\"The Q123 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q123?uselang=en\">Q123</a>", html
-
-    html = format_value("colour", "#f00")
-    assert_dom_equal %( <div class="colour-preview-box" style="background-color:#f00" title="Colour #f00 preview"></div>#f00 ), 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
   end
 
   def test_icon_tags


@@ -149,294 +112,27 @@ class BrowseHelperTest < ActionView::TestCase
 
     tags = icon_tags(node)
     assert_equal 3, tags.count
 
     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
 
     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
 
     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 "https://wiki.openstreetmap.org/wiki/Key:highway?uselang=en", link
-
-    link = wiki_link("tag", "highway=primary")
-    assert_equal "https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en", link
-
-    I18n.locale = "de"
-
-    link = wiki_link("key", "highway")
-    assert_equal "https://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link
-
-    link = wiki_link("tag", "highway=primary")
-    assert_equal "https://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link
-
-    I18n.locale = "tr"
-
-    link = wiki_link("key", "highway")
-    assert_equal "https://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link
-
-    link = wiki_link("tag", "highway=primary")
-    assert_equal "https://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
 
   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 "https://en.wikipedia.org/wiki/Test?uselang=en", link[:url]
-    assert_equal "Test", link[:title]
-
-    link = wikipedia_link("wikipedia", "de:Test")
-    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 "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 "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")
-    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
-
-  def test_colour_preview
-    # basic positive tests
-    colour = colour_preview("colour", "red")
-    assert_equal "red", colour
-
-    colour = colour_preview("colour", "Red")
-    assert_equal "Red", colour
-
-    colour = colour_preview("colour", "darkRed")
-    assert_equal "darkRed", colour
-
-    colour = colour_preview("colour", "#f00")
-    assert_equal "#f00", colour
-
-    colour = colour_preview("colour", "#fF0000")
-    assert_equal "#fF0000", colour
-
-    # other tag variants:
-    colour = colour_preview("building:colour", "#f00")
-    assert_equal "#f00", colour
-
-    colour = colour_preview("ref:colour", "#f00")
-    assert_equal "#f00", colour
-
-    colour = colour_preview("roof:colour", "#f00")
-    assert_equal "#f00", colour
-
-    # negative tests:
-    colour = colour_preview("color", "")
-    assert_nil colour
-
-    colour = colour_preview("color", "   ")
-    assert_nil colour
-
-    colour = colour_preview("color", nil)
-    assert_nil colour
-
-    # ignore US spelling variant
-    colour = colour_preview("color", "red")
-    assert_nil colour
-
-    # irrelevant tag names
-    colour = colour_preview("building", "red")
-    assert_nil colour
-
-    # invalid hex codes
-    colour = colour_preview("colour", "#")
-    assert_nil colour
-
-    colour = colour_preview("colour", "#ff")
-    assert_nil colour
-
-    colour = colour_preview("colour", "#ffff")
-    assert_nil colour
-
-    colour = colour_preview("colour", "#fffffff")
-    assert_nil colour
-
-    colour = colour_preview("colour", "#ggg")
-    assert_nil colour
-
-    colour = colour_preview("colour", "#ff 00 00")
-    assert_nil colour
-
-    # invalid w3c color names:
-    colour = colour_preview("colour", "r")
-    assert_nil colour
-
-    colour = colour_preview("colour", "ffffff")
-    assert_nil colour
-
-    colour = colour_preview("colour", "f00")
-    assert_nil colour
-
-    colour = colour_preview("colour", "xxxred")
-    assert_nil colour
-
-    colour = colour_preview("colour", "dark red")
-    assert_nil colour
-
-    colour = colour_preview("colour", "dark_red")
-    assert_nil colour
-
-    colour = colour_preview("colour", "ADarkDummyLongColourNameWithAPurpleUndertone")
-    assert_nil colour
-  end
+  private

 
   def add_old_tags_selection(old_node)
     { "building" => "yes",
 
   def add_old_tags_selection(old_node)
     { "building" => "yes",


@@ -457,4 +153,8 @@ class BrowseHelperTest < ActionView::TestCase
       create(:node_tag, :node => node, :k => key, :v => value)
     end
   end
       create(:node_tag, :node => node, :k => key, :v => value)
     end
   end

+
+  def preferred_languages
+    Locale.list(I18n.locale)
+  end

 end
 end