Skip to content

A platform for community discussion. Free, open, simple.

FIX: Restore enabled checkboxes for similar users in penalty modals (#41801)

Arpit Jalan8db91a42d8f0
diff --git a/app/serializers/similar_admin_user_serializer.rb b/app/serializers/similar_admin_user_serializer.rb
index 542d4885c28..1af94e141b7 100644
--- a/app/serializers/similar_admin_user_serializer.rb
+++ b/app/serializers/similar_admin_user_serializer.rb
@@ -7,6 +7,10 @@ class SimilarAdminUserSerializer < AdminUserListSerializer
scope.can_suspend?(object)
end
+ def include_can_be_suspended?
+ true
+ end
+
def can_be_silenced
scope.can_silence_user?(object)
end
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 232eae34ef6..152af2f19cd 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -326,6 +326,17 @@ RSpec.describe Admin::UsersController do
expect(response.status).to eq(200)
expect(response.parsed_body["users"].map { |u| u["id"] }).to contain_exactly(similar_user.id)
end
+
+ it "includes penalizability of each similar user" do
+ Fabricate(:user, ip_address: user.ip_address)
+
+ get "/admin/users/#{user.id}/similar-users.json"
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["users"]).to all(
+ include("can_be_suspended" => true, "can_be_silenced" => true),
+ )
+ end
end
describe "#approve" do
diff --git a/spec/system/admin_user_spec.rb b/spec/system/admin_user_spec.rb
index 51cd15d62a8..913b2374f04 100644
--- a/spec/system/admin_user_spec.rb
+++ b/spec/system/admin_user_spec.rb
@@ -230,14 +230,16 @@ describe "Admin User Page" do
)
end
- it "suspends and unsuspends the user" do
+ it "suspends the user along with selected similar users and unsuspends the user" do
admin_user_page.click_suspend_button
+ suspend_user_modal.select_similar_user(similar_user.username)
suspend_user_modal.fill_in_suspend_reason("spamming")
suspend_user_modal.set_future_date("tomorrow")
suspend_user_modal.perform
expect(suspend_user_modal).to be_closed
expect(page).to have_css(".suspension-info")
+ expect(similar_user.reload).to be_suspended
admin_user_page.click_unsuspend_button
expect(page).not_to have_css(".suspension-info")
diff --git a/spec/system/page_objects/modals/penalize_user.rb b/spec/system/page_objects/modals/penalize_user.rb
index e727af62ded..791a70a6a95 100644
--- a/spec/system/page_objects/modals/penalize_user.rb
+++ b/spec/system/page_objects/modals/penalize_user.rb
@@ -11,6 +11,10 @@ module PageObjects
modal.all("table tbody tr td:nth-child(2)").map(&:text)
end
+ def select_similar_user(username)
+ modal.find("table tbody tr", text: username).check
+ end
+
def modal
find(".d-modal.#{@penalty_type}-user-modal")
end