X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/293fe68eff1923a00992e0a195ba025ab7bd9efa..88ba316abeecffccd1cb51c63ce5594c95023624:/test/helpers/browse_helper_test.rb
diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index 7141cda60..076975b09 100644
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -31,8 +31,8 @@ class BrowseHelperTest < ActionView::TestCase
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 "Test Node (#{node.id}, v2)", printable_name(node_v2, :version => true)
+ assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name)
I18n.locale = "pt"
@@ -41,8 +41,8 @@ class BrowseHelperTest < ActionView::TestCase
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 "Nó teste (#{node.id}, v2)", printable_name(node_v2, :version => true)
+ assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name)
I18n.locale = "pt-BR"
@@ -51,8 +51,8 @@ class BrowseHelperTest < ActionView::TestCase
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 "Nó teste (#{node.id}, v2)", printable_name(node_v2, :version => true)
+ assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name)
I18n.locale = "de"
@@ -61,8 +61,8 @@ class BrowseHelperTest < ActionView::TestCase
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 "Test Node (#{node.id}, v2)", printable_name(node_v2, :version => true)
+ assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name)
end
@@ -132,6 +132,8 @@ class BrowseHelperTest < ActionView::TestCase
assert_includes tags, %w[shop gift]
end
+ private
+
def add_old_tags_selection(old_node)
{ "building" => "yes",
"shop" => "gift",
@@ -152,9 +154,7 @@ class BrowseHelperTest < ActionView::TestCase
end
end
- private
-
- def current_user
- nil
+ def preferred_languages
+ Locale.list(I18n.locale)
end
end