From f11fd2b13e7edbc1190f60b6749f10a17c68a3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Thu, 30 Sep 2021 22:44:16 +0200
Subject: [PATCH] Remove duplication in comments votes component

We're also simplifying the code a bit by removing the
`participation-allowed` HTML class, which wasn't used in any other votes
component.
---
 app/assets/javascripts/votes.js               |  2 -
 .../comments/votes_component.html.erb         | 87 ++++++-------------
 spec/support/common_actions/votes.rb          |  2 -
 3 files changed, 25 insertions(+), 66 deletions(-)

diff --git a/app/assets/javascripts/votes.js b/app/assets/javascripts/votes.js
index 2e8583156..c782d428b 100644
--- a/app/assets/javascripts/votes.js
+++ b/app/assets/javascripts/votes.js
@@ -5,11 +5,9 @@
       $(document).on({
         "mouseenter focus": function() {
           $("div.participation-not-allowed", this).show();
-          $("div.participation-allowed", this).hide();
         },
         mouseleave: function() {
           $("div.participation-not-allowed", this).hide();
-          $("div.participation-allowed", this).show();
         }
       }, votes);
     },
diff --git a/app/components/comments/votes_component.html.erb b/app/components/comments/votes_component.html.erb
index cb428eb80..a3714a63f 100644
--- a/app/components/comments/votes_component.html.erb
+++ b/app/components/comments/votes_component.html.erb
@@ -1,77 +1,40 @@
 <div class="votes">
-  <% if current_user %>
-    <%= t("comments.comment.votes", count: comment.total_votes) %>
-    &nbsp;|&nbsp;
+  <%= t("comments.comment.votes", count: comment.total_votes) %>
+  &nbsp;|&nbsp;
 
-    <span class="in_favor">
-      <% if can?(:vote, comment) %>
-        <%= link_to vote_comment_path(comment, value: "yes"),
-            method: "post", remote: true, title: t("votes.agree") do %>
-            <span class="icon-like">
-              <span class="show-for-sr"><%= t("votes.agree") %></span>
-            </span>
-        <% end %>
-      <% else %>
-        <span class="icon-like">
-          <span class="show-for-sr"><%= t("votes.agree") %></span>
-        </span>
-      <% end %>
-      <%= comment.total_likes %>
-    </span>
-
-    <span class="against">
-      <% if can?(:vote, comment) %>
-        <%= link_to vote_comment_path(comment, value: "no"),
-            method: "post", remote: true, title: t("votes.disagree") do %>
-            <span class="icon-unlike">
-              <span class="show-for-sr"><%= t("votes.disagree") %></span>
-            </span>
-        <% end %>
-      <% else %>
-        <span class="icon-unlike">
-          <span class="show-for-sr"><%= t("votes.disagree") %></span>
-        </span>
-      <% end %>
-      <%= comment.total_dislikes %>
-    </span>
-  <% else %>
-    <div class="participation-allowed">
-      <%= t("comments.comment.votes", count: comment.total_votes) %>
-      &nbsp;|&nbsp;
-
-      <span class="in_favor">
-        <% if can?(:vote, comment) %>
-          <%= link_to vote_comment_path(comment, value: "yes"),
-              method: "post", remote: true, title: t("votes.agree") do %>
-              <span class="icon-like">
-                <span class="show-for-sr"><%= t("votes.agree") %></span>
-              </span>
-          <% end %>
-        <% else %>
+  <span class="in_favor">
+    <% if can?(:vote, comment) %>
+      <%= link_to vote_comment_path(comment, value: "yes"),
+          method: "post", remote: true, title: t("votes.agree") do %>
           <span class="icon-like">
             <span class="show-for-sr"><%= t("votes.agree") %></span>
           </span>
-        <% end %>
-        <%= comment.total_likes %>
+      <% end %>
+    <% else %>
+      <span class="icon-like">
+        <span class="show-for-sr"><%= t("votes.agree") %></span>
       </span>
+    <% end %>
+    <%= comment.total_likes %>
+  </span>
 
-      <span class="against">
-        <% if can?(:vote, comment) %>
-          <%= link_to vote_comment_path(comment, value: "no"),
-              method: "post", remote: true, title: t("votes.disagree") do %>
-              <span class="icon-unlike">
-                <span class="show-for-sr"><%= t("votes.disagree") %></span>
-              </span>
-          <% end %>
-        <% else %>
+  <span class="against">
+    <% if can?(:vote, comment) %>
+      <%= link_to vote_comment_path(comment, value: "no"),
+          method: "post", remote: true, title: t("votes.disagree") do %>
           <span class="icon-unlike">
             <span class="show-for-sr"><%= t("votes.disagree") %></span>
           </span>
-        <% end %>
-        <%= comment.total_dislikes %>
+      <% end %>
+    <% else %>
+      <span class="icon-unlike">
+        <span class="show-for-sr"><%= t("votes.disagree") %></span>
       </span>
-    </div>
+    <% end %>
+    <%= comment.total_dislikes %>
+  </span>
 
+  <% unless current_user %>
     <div tabindex="0">
       <div class="participation-not-allowed" style="display:none" aria-hidden="false">
         <%= sanitize(t("votes.comment_unauthenticated", signin: link_to_signin, signup: link_to_signup)) %>
diff --git a/spec/support/common_actions/votes.rb b/spec/support/common_actions/votes.rb
index 37a9eb485..378f7dc67 100644
--- a/spec/support/common_actions/votes.rb
+++ b/spec/support/common_actions/votes.rb
@@ -8,8 +8,6 @@ module Votes
     within(".participation-not-allowed") do
       expect(page).to have_content "You must sign in or sign up to vote"
     end
-
-    expect(page).not_to have_selector(".participation-allowed")
   end
 
   def expect_message_to_many_anonymous_votes