X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/63221710a4b9ce4c282aab751b35581908e45852..d4aa257524575b3baa454d69733a614f22485746:/test/helpers/browse_helper_test.rb
diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index 076975b09..fff9cc325 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)
@@ -35,38 +27,38 @@ class BrowseHelperTest < ActionView::TestCase
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"
-
- 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)
-
- 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, :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.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, :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.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
+ 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)
@@ -76,12 +68,12 @@ class BrowseHelperTest < ActionView::TestCase
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 deleted", 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 deleted", element_class("node", node_v1)
end
def test_link_title