X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d6f518f6279ddd8e07d8f78577b1414567fc6a5c..e2839ae0988c8493e0f4f626695a0f4a7abd39d8:/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 8e46f6ff3..4cf0ab69a 100644 --- a/test/helpers/browse_helper_test.rb +++ b/test/helpers/browse_helper_test.rb @@ -4,15 +4,7 @@ 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 + def test_printable_element_name 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) @@ -27,46 +19,54 @@ class BrowseHelperTest < ActionView::TestCase deleted_node = create(:node, :deleted) - 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.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 "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.locale = "de" - - 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) + assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node) + assert_dom_equal "Test Node (#{node.id})", printable_element_name(node) + assert_dom_equal "Test Node (#{node.id})", printable_element_name(node_v2) + assert_dom_equal node.id.to_s, printable_element_name(node_v1) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_element_name(node_with_ref_without_name) + + I18n.with_locale "pt" do + assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node) + assert_dom_equal "Nó teste (#{node.id})", printable_element_name(node) + assert_dom_equal "Nó teste (#{node.id})", printable_element_name(node_v2) + assert_dom_equal node.id.to_s, printable_element_name(node_v1) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_element_name(node_with_ref_without_name) + end + + I18n.with_locale "pt-BR" do + assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node) + assert_dom_equal "Nó teste (#{node.id})", printable_element_name(node) + assert_dom_equal "Nó teste (#{node.id})", printable_element_name(node_v2) + assert_dom_equal node.id.to_s, printable_element_name(node_v1) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_element_name(node_with_ref_without_name) + end + + I18n.with_locale "de" do + assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node) + assert_dom_equal "Test Node (#{node.id})", printable_element_name(node) + assert_dom_equal "Test Node (#{node.id})", printable_element_name(node_v2) + assert_dom_equal node.id.to_s, printable_element_name(node_v1) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_element_name(node_with_ref_without_name) + end + end + + def test_element_strikethrough + 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) + node_v1.redact!(create(:redaction)) + + normal_output = element_strikethrough(node_v2) { "test" } + assert_equal "test", normal_output + + redacted_output = element_strikethrough(node_v1) { "test" } + assert_equal "test", redacted_output + + deleted_output = element_strikethrough(create(:node, :deleted)) { "test" } + assert_equal "test", deleted_output 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,15 +76,15 @@ 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", 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", element_class("node", node_v1) end - def test_link_title + def test_element_title 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) @@ -94,12 +94,12 @@ class BrowseHelperTest < ActionView::TestCase add_old_tags_selection(node_v2) add_old_tags_selection(node_v1) - assert_equal "", link_title(create(:node)) - assert_equal "", link_title(create(:node, :deleted)) + assert_equal "", element_title(create(:node)) + assert_equal "", element_title(create(:node, :deleted)) - assert_equal "building=yes, shop=gift, and tourism=museum", link_title(node) - assert_equal "building=yes, shop=gift, and tourism=museum", link_title(node_v2) - assert_equal "", link_title(node_v1) + assert_equal "building=yes, shop=gift, and tourism=museum", element_title(node) + assert_equal "building=yes, shop=gift, and tourism=museum", element_title(node_v2) + assert_equal "", element_title(node_v1) end def test_icon_tags @@ -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,8 +154,6 @@ class BrowseHelperTest < ActionView::TestCase end end - private - def preferred_languages Locale.list(I18n.locale) end