X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ba2c75641d3de82fc4cda78dc864dc690b860b6d..84ff3ed43acb29f332b2811b887007981a055e35:/test/helpers/browse_helper_test.rb diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb index 06d5f3d53..4162223d1 100644 --- a/test/helpers/browse_helper_test.rb +++ b/test/helpers/browse_helper_test.rb @@ -4,7 +4,7 @@ class BrowseHelperTest < ActionView::TestCase include ERB::Util include ApplicationHelper - 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) @@ -19,42 +19,34 @@ 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, :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) + 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_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) + 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_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) + 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_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) + 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 @@ -74,7 +66,7 @@ class BrowseHelperTest < ActionView::TestCase assert_equal "test", deleted_output end - def test_element_class + def test_element_icon 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) @@ -84,60 +76,35 @@ class BrowseHelperTest < ActionView::TestCase add_old_tags_selection(node_v2) add_old_tags_selection(node_v1) - 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", 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_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) - node_v1.redact!(create(:redaction)) - - add_tags_selection(node) - add_old_tags_selection(node_v2) - add_old_tags_selection(node_v1) - - assert_equal "", element_title(create(:node)) - assert_equal "", element_title(create(:node, :deleted)) - - 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 - 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)) + icon = element_icon("node", create(:node)) + icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon) + assert_dom icon_dom, "img:root", :count => 1 do + assert_dom "> @title", 0 + end - add_tags_selection(node) + icon = element_icon("node", create(:node, :deleted)) + icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon) + assert_dom icon_dom, "img:root", :count => 1 do + assert_dom "> @title", 0 + end - tags = icon_tags(node) - assert_equal 3, tags.count - assert_includes tags, %w[building yes] - assert_includes tags, %w[tourism museum] - assert_includes tags, %w[shop gift] + icon = element_icon("node", node) + icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon) + assert_dom icon_dom, "img:root", :count => 1 do + assert_dom "> @title", "building=yes, shop=gift, and tourism=museum" + end - add_old_tags_selection(node_v2) - add_old_tags_selection(node_v1) + icon = element_icon("node", node_v2) + icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon) + assert_dom icon_dom, "img:root", :count => 1 do + assert_dom "> @title", "building=yes, shop=gift, and tourism=museum" + end - tags = icon_tags(node_v2) - assert_equal 3, tags.count - 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_includes tags, %w[building yes] - assert_includes tags, %w[tourism museum] - assert_includes tags, %w[shop gift] + icon = element_icon("node", node_v1) + icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon) + assert_dom icon_dom, "img:root", :count => 1 do + assert_dom "> @title", 0 + end end private