X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a790c47923ae5722743ba168eb79f3beabe8a71e..159ef16601b7b7157ce9d766db97c4189d145e42:/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 9c666c0b8..a20e1703d 100644
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -4,14 +4,6 @@ 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
node = create(:node, :with_history, :version => 2)
node_v1 = node.old_nodes.find_by(:version => 1)
@@ -31,39 +23,39 @@ 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 "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name)
-
- I18n.locale = "pt"
-
- 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 "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-BR"
-
- 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 "pt" do
+ 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, :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
- I18n.locale = "de"
+ I18n.with_locale "pt-BR" do
+ 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, :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
- 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)
+ I18n.with_locale "de" do
+ 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, :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
end
def test_link_class
@@ -112,26 +104,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 +145,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