From f5678d3445fb19c7e86f9037ba425d866b154206 Mon Sep 17 00:00:00 2001
From: Sarken <sarken@gmail.com>
Date: Thu, 16 Nov 2023 00:03:21 -0500
Subject: [PATCH] AO3-6572 Show admins when blocks and mutes were created

---
 .../blocked/users/_blocked_user_blurb.html.erb   |  2 +-
 app/views/muted/users/_muted_user_blurb.html.erb |  2 +-
 app/views/pseuds/_pseud_module.html.erb          |  4 ++++
 features/step_definitions/block_steps.rb         | 16 ++++++++++++++++
 features/step_definitions/mute_steps.rb          | 16 ++++++++++++++++
 features/users/blocking.feature                  |  2 ++
 features/users/muting.feature                    |  2 ++
 7 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/app/views/blocked/users/_blocked_user_blurb.html.erb b/app/views/blocked/users/_blocked_user_blurb.html.erb
index b8e497bb560..be7910952d7 100644
--- a/app/views/blocked/users/_blocked_user_blurb.html.erb
+++ b/app/views/blocked/users/_blocked_user_blurb.html.erb
@@ -1,6 +1,6 @@
 <% pseud = block.blocked.default_pseud %>
 <li class="user pseud picture blurb group" role="article">
-  <%= render "pseuds/pseud_module", pseud: pseud %>
+  <%= render "pseuds/pseud_module", pseud: pseud, date: block.created_at %>
 
   <h6 class="landmark heading">User Actions</h6>
   <ul class="actions" role="navigation">
diff --git a/app/views/muted/users/_muted_user_blurb.html.erb b/app/views/muted/users/_muted_user_blurb.html.erb
index 8aefdeaab71..b62bd1c6872 100644
--- a/app/views/muted/users/_muted_user_blurb.html.erb
+++ b/app/views/muted/users/_muted_user_blurb.html.erb
@@ -1,6 +1,6 @@
 <% pseud = mute.muted.default_pseud %>
 <li class="user pseud picture blurb group" role="article">
-  <%= render "pseuds/pseud_module", pseud: pseud %>
+  <%= render "pseuds/pseud_module", pseud: pseud, date: mute.created_at %>
 
   <h6 class="landmark heading">User Actions</h6>
   <ul class="actions" role="navigation">
diff --git a/app/views/pseuds/_pseud_module.html.erb b/app/views/pseuds/_pseud_module.html.erb
index 5f87e38e4d7..3c727397998 100644
--- a/app/views/pseuds/_pseud_module.html.erb
+++ b/app/views/pseuds/_pseud_module.html.erb
@@ -10,6 +10,10 @@
   <div class="icon">
     <%= icon_display(pseud.user, pseud) %>
   </div>
+  <%# created_at date to display to admins for mutes and blocks %>
+  <% if local_assigns[:date] && logged_in_as_admin? %>
+    <p class="datetime"><%= date %></p>
+  <% end %>
 </div>
 <% unless pseud.description.blank? %>
   <blockquote class="userstuff">
diff --git a/features/step_definitions/block_steps.rb b/features/step_definitions/block_steps.rb
index 255ac87f3f6..2dba821be77 100644
--- a/features/step_definitions/block_steps.rb
+++ b/features/step_definitions/block_steps.rb
@@ -23,3 +23,19 @@
   blocked = User.find_by(login: blocked)
   expect(Block.find_by(blocker: blocker, blocked: blocked)).to be_blank
 end
+
+Then "the blurb should say when {string} blocked {string}" do |blocker, blocked|
+  blocker = User.find_by(login: blocker)
+  blocked = User.find_by(login: blocked)
+  block = Block.where(blocker: blocker, blocked: blocked).first
+  # Find the blurb for the specified block using the h4 with the blocked user's name, navigate back up to div, and then down to the datetime p
+  expect(page).to have_xpath("//li/div/h4/a[text()[contains(., '#{blocked.login}')]]/parent::h4/parent::div/p[text()[contains(., '#{block.created_at}')]]")
+end
+
+Then "the blurb should not say when {string} blocked {string}" do |blocker, blocked|
+  blocker = User.find_by(login: blocker)
+  blocked = User.find_by(login: blocked)
+  block = Block.where(blocker: blocker, blocked: blocked).first
+  # Find the blurb for the specified block using the h4 with the blocked user's name, navigate back up to div, and then down to where the datetime p would be
+  expect(page).not_to have_xpath("//li/div/h4/a[text()[contains(., '#{blocked.login}')]]/parent::h4/parent::div/p[text()[contains(., '#{block.created_at}')]]")
+end
diff --git a/features/step_definitions/mute_steps.rb b/features/step_definitions/mute_steps.rb
index 25adfe55684..154738b410b 100644
--- a/features/step_definitions/mute_steps.rb
+++ b/features/step_definitions/mute_steps.rb
@@ -23,3 +23,19 @@
   muted = User.find_by(login: muted)
   expect(Mute.find_by(muter: muter, muted: muted)).to be_blank
 end
+
+Then "the blurb should say when {string} muted {string}" do |muter, muted|
+  muter = User.find_by(login: muter)
+  muted = User.find_by(login: muted)
+  mute = Mute.where(muter: muter, muted: muted).first
+  # Find the blurb for the specified mute using the h4 with the muted user's name, navigate back up to div, and then down to the datetime p
+  expect(page).to have_xpath("//li/div/h4/a[text()[contains(., '#{muted.login}')]]/parent::h4/parent::div/p[text()[contains(., '#{mute.created_at}')]]")
+end
+
+Then "the blurb should not say when {string} muted {string}" do |muter, muted|
+  muter = User.find_by(login: muter)
+  muted = User.find_by(login: muted)
+  mute = Mute.where(muter: muter, muted: muted).first
+  # Find the blurb for the specified mute using the h4 with the muted user's name, navigate back up to div, and then down to where the datetime p would be
+  expect(page).not_to have_xpath("//li/div/h4/a[text()[contains(., '#{muted.login}')]]/parent::h4/parent::div/p[text()[contains(., '#{mute.created_at}')]]")
+end
diff --git a/features/users/blocking.feature b/features/users/blocking.feature
index 4d33b27fd45..d136e427c9a 100644
--- a/features/users/blocking.feature
+++ b/features/users/blocking.feature
@@ -17,6 +17,7 @@ Feature: Blocking
       And I press "Yes, Block User"
     Then I should see "You have blocked the user pest."
       And the user "blocker" should have a block for "pest"
+      And the blurb should not say when "blocker" blocked "pest"
 
     Examples:
       | page                                                 |
@@ -109,6 +110,7 @@ Feature: Blocking
     When I am logged in as a "<role>" admin
       And I go to the blocked users page for "blocker"
     Then I should see "pest"
+      And the blurb should say when "blocker" blocked "pest"
       And I should see a link "Unblock"
     When I follow "Unblock"
     Then I should see "Sorry, you don't have permission to access the page you were trying to reach."
diff --git a/features/users/muting.feature b/features/users/muting.feature
index e798650b6a7..562365931a8 100644
--- a/features/users/muting.feature
+++ b/features/users/muting.feature
@@ -8,6 +8,7 @@ Feature: Muting
       And I press "Yes, Mute User"
     Then I should see "You have muted the user pest."
       And the user "muter" should have a mute for "pest"
+      And the blurb should not say when "muter" muted "pest"
 
   Scenario Outline: Users can mute from various user-related pages
     Given the user "pest" exists and is activated
@@ -88,6 +89,7 @@ Feature: Muting
     When I am logged in as a "<role>" admin
       And I go to the muted users page for "muter"
     Then I should see "pest"
+      And the blurb should say when "muter" muted "pest"
       And I should see a link "Unmute"
     When I follow "Unmute"
     Then I should see "Sorry, you don't have permission to access the page you were trying to reach."