Replacing User#warned with User#warned? (#15628)
A simply refactor to introduce more idiomatic method names. Related to #15624
This commit is contained in:
parent
172906271c
commit
e1bddb5bf8
6 changed files with 10 additions and 7 deletions
|
|
@ -349,10 +349,13 @@ class User < ApplicationRecord
|
|||
has_role?(:suspended)
|
||||
end
|
||||
|
||||
def warned
|
||||
def warned?
|
||||
has_role?(:warned)
|
||||
end
|
||||
|
||||
# Included as a courtesy but let's consider removing it.
|
||||
alias warned warned?
|
||||
|
||||
def admin?
|
||||
has_role?(:super_admin)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ module Moderator
|
|||
|
||||
def remove_negative_roles
|
||||
user.remove_role(:suspended) if user.suspended?
|
||||
user.remove_role(:warned) if user.warned
|
||||
user.remove_role(:warned) if user.warned?
|
||||
user.remove_role(:comment_suspended) if user.comment_suspended?
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ module Slack
|
|||
end
|
||||
|
||||
def call
|
||||
return unless user.warned
|
||||
return unless user.warned?
|
||||
|
||||
internal_user_url = URL.url(
|
||||
Rails.application.routes.url_helpers.admin_user_path(user),
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
User Status
|
||||
<% if @user.suspended? %>
|
||||
<span class="badge badge-danger">🚨 Member is Suspended 🚨</span>
|
||||
<% elsif @user.warned %>
|
||||
<% elsif @user.warned? %>
|
||||
<span class="badge badge-warning">Member is Warned</span>
|
||||
<% elsif @user.comment_suspended? %>
|
||||
<span class="badge badge-warning">Member is Comment Suspended</span>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ RSpec.describe Moderator::ManageActivityAndRoles, type: :service do
|
|||
user: user,
|
||||
user_params: { note_for_current_role: "warning user", user_status: "Warn" },
|
||||
)
|
||||
expect(user.warned).to be true
|
||||
expect(user.warned?).to be true
|
||||
expect(user.suspended?).to be false
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ RSpec.describe "Admin bans user", type: :system do
|
|||
add_tag_moderator_role
|
||||
warn_user
|
||||
|
||||
expect(user.warned).to eq(true)
|
||||
expect(user.warned?).to eq(true)
|
||||
expect(Note.last.reason).to eq "Warn"
|
||||
expect(user.has_role?(:tag_moderator)).to eq(false)
|
||||
end
|
||||
|
|
@ -62,7 +62,7 @@ RSpec.describe "Admin bans user", type: :system do
|
|||
|
||||
expect(user.suspended?).to eq(true)
|
||||
expect(user.trusted).to eq(false)
|
||||
expect(user.warned).to eq(false)
|
||||
expect(user.warned?).to eq(false)
|
||||
expect(user.has_role?(:tag_modertor)).to eq(false)
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue