X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/53817fa9e8d955df0891d156f21b7269b4ed08fc..f1ca64ff84ee66de0fde80ed437e837a79a6e4d8:/test/helpers/user_roles_helper_test.rb
diff --git a/test/helpers/user_roles_helper_test.rb b/test/helpers/user_roles_helper_test.rb
index ba51dd14f..41366199c 100644
--- a/test/helpers/user_roles_helper_test.rb
+++ b/test/helpers/user_roles_helper_test.rb
@@ -13,74 +13,74 @@ class UserRolesHelperTest < ActionView::TestCase
assert_dom_equal "", icon
icon = role_icon(create(:moderator_user), "moderator")
- expected = <<~HTML.delete("\n")
- 
- HTML
- assert_dom_equal expected, icon
+ icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+ assert_dom icon_dom, "svg:root", :count => 1 do
+ assert_dom "> title", :text => "This user is a moderator"
+ end
icon = role_icon(create(:importer_user), "importer")
- expected = <<~HTML.delete("\n")
- 
- HTML
- assert_dom_equal expected, icon
+ icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+ assert_dom icon_dom, "svg:root", :count => 1 do
+ assert_dom "> title", :text => "This user is a importer"
+ end
end
def test_role_icon_administrator
self.current_user = create(:administrator_user)
- user = create(:user)
-
- icon = role_icon(user, "moderator")
- expected = <<~HTML.delete("\n")
-
- 
-
- HTML
- assert_dom_equal expected, icon
-
- icon = role_icon(user, "importer")
- expected = <<~HTML.delete("\n")
-
- 
-
- HTML
- assert_dom_equal expected, icon
-
- moderator_user = create(:moderator_user)
-
- icon = role_icon(moderator_user, "moderator")
- expected = <<~HTML.delete("\n")
-
-
-
- HTML
- assert_dom_equal expected, icon
-
- icon = role_icon(user, "importer")
- expected = <<~HTML.delete("\n")
-
-
-
- HTML
- assert_dom_equal expected, icon
-
- importer_user = create(:importer_user)
-
- icon = role_icon(user, "moderator")
- expected = <<~HTML.delete("\n")
-
-
-
- HTML
- assert_dom_equal expected, icon
-
- icon = role_icon(importer_user, "importer")
- expected = <<~HTML.delete("\n")
-
-
-
- HTML
- assert_dom_equal expected, icon
+ create(:user) do |user|
+ icon = role_icon(user, "moderator")
+ icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+ assert_dom icon_dom, "a:root[href='#{grant_role_path(user, 'moderator')}']", :count => 1 do
+ assert_dom "> svg", :count => 1 do
+ assert_dom "> title", :text => "Grant moderator access"
+ end
+ end
+
+ icon = role_icon(user, "importer")
+ icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+ assert_dom icon_dom, "a:root[href='#{grant_role_path(user, 'importer')}']", :count => 1 do
+ assert_dom "> svg", :count => 1 do
+ assert_dom "> title", :text => "Grant importer access"
+ end
+ end
+ end
+
+ create(:moderator_user) do |user|
+ icon = role_icon(user, "moderator")
+ icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+ assert_dom icon_dom, "a:root[href='#{revoke_role_path(user, 'moderator')}']", :count => 1 do
+ assert_dom "> svg", :count => 1 do
+ assert_dom "> title", :text => "Revoke moderator access"
+ end
+ end
+
+ icon = role_icon(user, "importer")
+ icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+ assert_dom icon_dom, "a:root[href='#{grant_role_path(user, 'importer')}']", :count => 1 do
+ assert_dom "> svg", :count => 1 do
+ assert_dom "> title", :text => "Grant importer access"
+ end
+ end
+ end
+
+ create(:importer_user) do |user|
+ icon = role_icon(user, "moderator")
+ icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+ assert_dom icon_dom, "a:root[href='#{grant_role_path(user, 'moderator')}']", :count => 1 do
+ assert_dom "> svg", :count => 1 do
+ assert_dom "> title", :text => "Grant moderator access"
+ end
+ end
+
+ icon = role_icon(user, "importer")
+ icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+ assert_dom icon_dom, "a:root[href='#{revoke_role_path(user, 'importer')}']", :count => 1 do
+ assert_dom "> svg", :count => 1 do
+ assert_dom "> title", :text => "Revoke importer access"
+ end
+ end
+ end
end
def test_role_icons_normal
@@ -90,87 +90,83 @@ class UserRolesHelperTest < ActionView::TestCase
assert_dom_equal "", icons
icons = role_icons(create(:moderator_user))
- expected = <<~HTML.delete("\n")
-
- HTML
- assert_dom_equal expected, icons
+ icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
+ assert_dom icons_dom, "svg:root > title", :text => "This user is a moderator"
icons = role_icons(create(:importer_user))
- expected = <<~HTML.delete("\n")
-
- HTML
- assert_dom_equal expected, icons
+ icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
+ assert_dom icons_dom, "svg:root > title", :text => "This user is a importer"
icons = role_icons(create(:super_user))
- expected = <<~HTML.delete("\n")
- 
-
-
- HTML
- assert_dom_equal expected, icons
+ icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
+ assert_dom icons_dom, "svg:root", :count => 3 do
+ assert_dom "> title", :text => "This user is an administrator"
+ assert_dom "> title", :text => "This user is a moderator"
+ assert_dom "> title", :text => "This user is a importer"
+ end
end
def test_role_icons_administrator
self.current_user = create(:administrator_user)
- user = create(:user)
- icons = role_icons(user)
- expected = <<~HTML.delete("\n")
-
- 
-
-
-
-
-
-
-
- HTML
- assert_dom_equal expected, icons
-
- moderator_user = create(:moderator_user)
- icons = role_icons(moderator_user)
- expected = <<~HTML.delete("\n")
-
-
-
-
-
-
-
-
-
- HTML
- assert_dom_equal expected, icons
-
- importer_user = create(:importer_user)
- icons = role_icons(importer_user)
- expected = <<~HTML.delete("\n")
-
-
-
-
-
-
-
-
-
- HTML
- assert_dom_equal expected, icons
-
- super_user = create(:super_user)
- icons = role_icons(super_user)
- expected = <<~HTML.delete("\n")
-
-
-
-
-
-
-
-
-
- HTML
- assert_dom_equal expected, icons
+ create(:user) do |user|
+ icons = role_icons(user)
+ icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
+ assert_dom icons_dom, "a:root", :count => 3
+ assert_dom icons_dom, "a:root[href='#{grant_role_path(user, 'administrator')}']" do
+ assert_dom "> svg > title", :text => "Grant administrator access"
+ end
+ assert_dom icons_dom, "a:root[href='#{grant_role_path(user, 'moderator')}']" do
+ assert_dom "> svg > title", :text => "Grant moderator access"
+ end
+ assert_dom icons_dom, "a:root[href='#{grant_role_path(user, 'importer')}']" do
+ assert_dom "> svg > title", :text => "Grant importer access"
+ end
+ end
+
+ create(:moderator_user) do |user|
+ icons = role_icons(user)
+ icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
+ assert_dom icons_dom, "a:root", :count => 3
+ assert_dom icons_dom, "a:root[href='#{grant_role_path(user, 'administrator')}']" do
+ assert_dom "> svg > title", :text => "Grant administrator access"
+ end
+ assert_dom icons_dom, "a:root[href='#{revoke_role_path(user, 'moderator')}']" do
+ assert_dom "> svg > title", :text => "Revoke moderator access"
+ end
+ assert_dom icons_dom, "a:root[href='#{grant_role_path(user, 'importer')}']" do
+ assert_dom "> svg > title", :text => "Grant importer access"
+ end
+ end
+
+ create(:importer_user) do |user|
+ icons = role_icons(user)
+ icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
+ assert_dom icons_dom, "a:root", :count => 3
+ assert_dom icons_dom, "a:root[href='#{grant_role_path(user, 'administrator')}']" do
+ assert_dom "> svg > title", :text => "Grant administrator access"
+ end
+ assert_dom icons_dom, "a:root[href='#{grant_role_path(user, 'moderator')}']" do
+ assert_dom "> svg > title", :text => "Grant moderator access"
+ end
+ assert_dom icons_dom, "a:root[href='#{revoke_role_path(user, 'importer')}']" do
+ assert_dom "> svg > title", :text => "Revoke importer access"
+ end
+ end
+
+ create(:super_user) do |user|
+ icons = role_icons(user)
+ icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
+ assert_dom icons_dom, "a:root", :count => 3
+ assert_dom icons_dom, "a:root[href='#{revoke_role_path(user, 'administrator')}']" do
+ assert_dom "> svg > title", :text => "Revoke administrator access"
+ end
+ assert_dom icons_dom, "a:root[href='#{revoke_role_path(user, 'moderator')}']" do
+ assert_dom "> svg > title", :text => "Revoke moderator access"
+ end
+ assert_dom icons_dom, "a:root[href='#{revoke_role_path(user, 'importer')}']" do
+ assert_dom "> svg > title", :text => "Revoke importer access"
+ end
+ end
end
end