X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..033c3b28b3b2708634f3015449d0c2ed222e26d6:/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 9c666c0b8..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
@@ -112,26 +112,28 @@ 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])
+ assert_includes tags, %w[building yes]
+ assert_includes tags, %w[tourism museum]
+ assert_includes tags, %w[shop gift]
end
+ private
+
def add_old_tags_selection(old_node)
{ "building" => "yes",
"shop" => "gift",
@@ -151,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