X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4347d9d3b00a8fffe78daa93eac5b490905f9ac8..d29807d715d3d493f8af631c9631feeb702912e1:/test/helpers/browse_helper_test.rb diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb index 076975b09..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) @@ -35,35 +27,35 @@ 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