Merge remote-tracking branch 'upstream/pull/4260'

[rails.git] / 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 26c303cfa8fd24e8b48a82acb848fa33ffb452bc..287504cb46232239f80f0a00138e8997c259168b 100644 (file)
--- a/test/helpers/user_roles_helper_test.rb
+++ b/test/helpers/user_roles_helper_test.rb
@@ -12,7 +12,7 @@ class UserRolesHelperTest < ActionView::TestCase
     icon = role_icon(create(:moderator_user), "moderator")
     expected = <<~HTML.delete("\n")
       <picture>
     icon = role_icon(create(:moderator_user), "moderator")
     expected = <<~HTML.delete("\n")
       <picture>

-      <source srcset="/images/roles/moderator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/moderator.svg" type="image/svg+xml">

       <img srcset="/images/roles/moderator.svg" border="0" alt="This user is a moderator" title="This user is a moderator" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
     HTML
       <img srcset="/images/roles/moderator.svg" border="0" alt="This user is a moderator" title="This user is a moderator" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
     HTML


@@ -25,9 +25,9 @@ class UserRolesHelperTest < ActionView::TestCase
     user = create(:user)
     icon = role_icon(user, "moderator")
     expected = <<~HTML.delete("\n")
     user = create(:user)
     icon = role_icon(user, "moderator")
     expected = <<~HTML.delete("\n")

-      <a confirm="Are you sure you want to grant the role `moderator&#39; to the user `#{user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(user.display_name)}/role/moderator/grant">
+      <a data-confirm="Are you sure you want to grant the role `moderator&#39; to the user `#{user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(user.display_name)}/role/moderator/grant">

       <picture>
       <picture>

-      <source srcset="/images/roles/blank_moderator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/blank_moderator.svg" type="image/svg+xml">

       <img srcset="/images/roles/blank_moderator.svg" border="0" alt="Grant moderator access" title="Grant moderator access" src="/images/roles/blank_moderator.png" width="20" height="20" />
       </picture>
       </a>
       <img srcset="/images/roles/blank_moderator.svg" border="0" alt="Grant moderator access" title="Grant moderator access" src="/images/roles/blank_moderator.png" width="20" height="20" />
       </picture>
       </a>


@@ -37,9 +37,9 @@ class UserRolesHelperTest < ActionView::TestCase
     moderator_user = create(:moderator_user)
     icon = role_icon(moderator_user, "moderator")
     expected = <<~HTML.delete("\n")
     moderator_user = create(:moderator_user)
     icon = role_icon(moderator_user, "moderator")
     expected = <<~HTML.delete("\n")

-      <a confirm="Are you sure you want to revoke the role `moderator&#39; from the user `#{moderator_user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(moderator_user.display_name)}/role/moderator/revoke">
+      <a data-confirm="Are you sure you want to revoke the role `moderator&#39; from the user `#{moderator_user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(moderator_user.display_name)}/role/moderator/revoke">

       <picture>
       <picture>

-      <source srcset="/images/roles/moderator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/moderator.svg" type="image/svg+xml">

       <img srcset="/images/roles/moderator.svg" border="0" alt="Revoke moderator access" title="Revoke moderator access" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
       </a>
       <img srcset="/images/roles/moderator.svg" border="0" alt="Revoke moderator access" title="Revoke moderator access" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
       </a>


@@ -51,25 +51,25 @@ class UserRolesHelperTest < ActionView::TestCase
     self.current_user = create(:user)
 
     icons = role_icons(current_user)
     self.current_user = create(:user)
 
     icons = role_icons(current_user)

-    assert_dom_equal "  ", icons
+    assert_dom_equal "", icons

 
     icons = role_icons(create(:moderator_user))
 
     icons = role_icons(create(:moderator_user))

-    expected = "  " + <<~HTML.delete("\n")
+    expected = <<~HTML.delete("\n")

       <picture>
       <picture>

-      <source srcset="/images/roles/moderator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/moderator.svg" type="image/svg+xml">

       <img srcset="/images/roles/moderator.svg" border="0" alt="This user is a moderator" title="This user is a moderator" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
     HTML
     assert_dom_equal expected, icons
 
     icons = role_icons(create(:super_user))
       <img srcset="/images/roles/moderator.svg" border="0" alt="This user is a moderator" title="This user is a moderator" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
     HTML
     assert_dom_equal expected, icons
 
     icons = role_icons(create(:super_user))

-    expected = " " + <<~HTML.delete("\n")
+    expected = <<~HTML.delete("\n")

       <picture>
       <picture>

-      <source srcset="/images/roles/administrator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/administrator.svg" type="image/svg+xml">

       <img srcset="/images/roles/administrator.svg" border="0" alt="This user is an administrator" title="This user is an administrator" src="/images/roles/administrator.png" width="20" height="20" />
       </picture>
        <picture>
       <img srcset="/images/roles/administrator.svg" border="0" alt="This user is an administrator" title="This user is an administrator" src="/images/roles/administrator.png" width="20" height="20" />
       </picture>
        <picture>

-      <source srcset="/images/roles/moderator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/moderator.svg" type="image/svg+xml">

       <img srcset="/images/roles/moderator.svg" border="0" alt="This user is a moderator" title="This user is a moderator" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
     HTML
       <img srcset="/images/roles/moderator.svg" border="0" alt="This user is a moderator" title="This user is a moderator" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
     HTML


@@ -81,16 +81,16 @@ class UserRolesHelperTest < ActionView::TestCase
 
     user = create(:user)
     icons = role_icons(user)
 
     user = create(:user)
     icons = role_icons(user)

-    expected = " " + <<~HTML.delete("\n")
-      <a confirm="Are you sure you want to grant the role `administrator&#39; to the user `#{user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(user.display_name)}/role/administrator/grant">
+    expected = <<~HTML.delete("\n")
+      <a data-confirm="Are you sure you want to grant the role `administrator&#39; to the user `#{user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(user.display_name)}/role/administrator/grant">

       <picture>
       <picture>

-      <source srcset="/images/roles/blank_administrator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/blank_administrator.svg" type="image/svg+xml">

       <img srcset="/images/roles/blank_administrator.svg" border="0" alt="Grant administrator access" title="Grant administrator access" src="/images/roles/blank_administrator.png" width="20" height="20" />
       </picture>
       </a>
       <img srcset="/images/roles/blank_administrator.svg" border="0" alt="Grant administrator access" title="Grant administrator access" src="/images/roles/blank_administrator.png" width="20" height="20" />
       </picture>
       </a>

-       <a confirm="Are you sure you want to grant the role `moderator&#39; to the user `#{user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(user.display_name)}/role/moderator/grant">
+       <a data-confirm="Are you sure you want to grant the role `moderator&#39; to the user `#{user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(user.display_name)}/role/moderator/grant">

       <picture>
       <picture>

-      <source srcset="/images/roles/blank_moderator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/blank_moderator.svg" type="image/svg+xml">

       <img srcset="/images/roles/blank_moderator.svg" border="0" alt="Grant moderator access" title="Grant moderator access" src="/images/roles/blank_moderator.png" width="20" height="20" />
       </picture>
       </a>
       <img srcset="/images/roles/blank_moderator.svg" border="0" alt="Grant moderator access" title="Grant moderator access" src="/images/roles/blank_moderator.png" width="20" height="20" />
       </picture>
       </a>


@@ -99,16 +99,16 @@ class UserRolesHelperTest < ActionView::TestCase
 
     moderator_user = create(:moderator_user)
     icons = role_icons(moderator_user)
 
     moderator_user = create(:moderator_user)
     icons = role_icons(moderator_user)

-    expected = " " + <<~HTML.delete("\n")
-      <a confirm="Are you sure you want to grant the role `administrator&#39; to the user `#{moderator_user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(moderator_user.display_name)}/role/administrator/grant">
+    expected = <<~HTML.delete("\n")
+      <a data-confirm="Are you sure you want to grant the role `administrator&#39; to the user `#{moderator_user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(moderator_user.display_name)}/role/administrator/grant">

       <picture>
       <picture>

-      <source srcset="/images/roles/blank_administrator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/blank_administrator.svg" type="image/svg+xml">

       <img srcset="/images/roles/blank_administrator.svg" border="0" alt="Grant administrator access" title="Grant administrator access" src="/images/roles/blank_administrator.png" width="20" height="20" />
       </picture>
       </a>
       <img srcset="/images/roles/blank_administrator.svg" border="0" alt="Grant administrator access" title="Grant administrator access" src="/images/roles/blank_administrator.png" width="20" height="20" />
       </picture>
       </a>

-       <a confirm="Are you sure you want to revoke the role `moderator&#39; from the user `#{moderator_user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(moderator_user.display_name)}/role/moderator/revoke">
+       <a data-confirm="Are you sure you want to revoke the role `moderator&#39; from the user `#{moderator_user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(moderator_user.display_name)}/role/moderator/revoke">

       <picture>
       <picture>

-      <source srcset="/images/roles/moderator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/moderator.svg" type="image/svg+xml">

       <img srcset="/images/roles/moderator.svg" border="0" alt="Revoke moderator access" title="Revoke moderator access" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
       </a>
       <img srcset="/images/roles/moderator.svg" border="0" alt="Revoke moderator access" title="Revoke moderator access" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
       </a>


@@ -117,16 +117,16 @@ class UserRolesHelperTest < ActionView::TestCase
 
     super_user = create(:super_user)
     icons = role_icons(super_user)
 
     super_user = create(:super_user)
     icons = role_icons(super_user)

-    expected = " " + <<~HTML.delete("\n")
-      <a confirm="Are you sure you want to revoke the role `administrator&#39; from the user `#{super_user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(super_user.display_name)}/role/administrator/revoke">
+    expected = <<~HTML.delete("\n")
+      <a data-confirm="Are you sure you want to revoke the role `administrator&#39; from the user `#{super_user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(super_user.display_name)}/role/administrator/revoke">

       <picture>
       <picture>

-      <source srcset="/images/roles/administrator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/administrator.svg" type="image/svg+xml">

       <img srcset="/images/roles/administrator.svg" border="0" alt="Revoke administrator access" title="Revoke administrator access" src="/images/roles/administrator.png" width="20" height="20" />
       </picture>
       </a>
       <img srcset="/images/roles/administrator.svg" border="0" alt="Revoke administrator access" title="Revoke administrator access" src="/images/roles/administrator.png" width="20" height="20" />
       </picture>
       </a>

-       <a confirm="Are you sure you want to revoke the role `moderator&#39; from the user `#{super_user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(super_user.display_name)}/role/moderator/revoke">
+       <a data-confirm="Are you sure you want to revoke the role `moderator&#39; from the user `#{super_user.display_name}&#39;?" rel="nofollow" data-method="post" href="/user/#{ERB::Util.u(super_user.display_name)}/role/moderator/revoke">

       <picture>
       <picture>

-      <source srcset="/images/roles/moderator.svg" type="image/svg+xml" />
+      <source srcset="/images/roles/moderator.svg" type="image/svg+xml">

       <img srcset="/images/roles/moderator.svg" border="0" alt="Revoke moderator access" title="Revoke moderator access" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
       </a>
       <img srcset="/images/roles/moderator.svg" border="0" alt="Revoke moderator access" title="Revoke moderator access" src="/images/roles/moderator.png" width="20" height="20" />
       </picture>
       </a>