mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-22 13:03:05 +08:00
This change centralises how user actions are defined. ### How It Works `ReviewableActionBuilder::build_user_actions_bundle` defines all of the user actions that a reviewable should need. `ReviewableActionBuilder` also now includes matching `perform_*` methods, to go with the actions defined in `build_user_actions_bundle`. There's also an overridable `target_user` method. It defaults to `target_created_by`, since that's the most common case, but it will allow different reviewable types to define a different user to target: for example, `ReviewableUser` would want to have it return `target`. ### Supporting Changes `Reviewable::build_actions` is temporarily overridden in `ReviewableActionBuilder`. Because we need `build_actions` to define both the old and new actions, I've chosen to split these into separate methods (`build_legacy_combined_actions` and `build_new_separated_actions`) that reviewables will temporarily need to define. This allows minimal code churn of the old logic, while we can build the new logic within its own method. `Reviewable::build_actions` will ultimately be moved to `ReviewableActionBuilder`. `Reviewable::create_result` has been copied to `ReviewableActionBuilder`, and expanded to include the flag-handling functionality of `ReviewablePost::successful_transition`.
221 lines
7.2 KiB
Ruby
Vendored
221 lines
7.2 KiB
Ruby
Vendored
# frozen_string_literal: true
|
|
|
|
RSpec.describe ReviewablePost do
|
|
fab!(:admin)
|
|
|
|
describe "#build_actions" do
|
|
# TODO (reviewable-refresh): Remove the tests below when the legacy combined actions are removed
|
|
let(:post) { Fabricate.build(:post) }
|
|
let(:reviewable) { ReviewablePost.new(target: post) }
|
|
let(:guardian) { Guardian.new }
|
|
|
|
it "Does not return available actions when the reviewable is no longer pending" do
|
|
available_actions =
|
|
(Reviewable.statuses.keys - ["pending"]).reduce([]) do |actions, status|
|
|
reviewable.status = status
|
|
|
|
actions.concat reviewable_actions(guardian).to_a
|
|
end
|
|
|
|
expect(available_actions).to be_empty
|
|
end
|
|
|
|
it "only shows the approve post action if users cannot delete the post" do
|
|
expect(reviewable_actions(guardian).has?(:approve)).to eq(true)
|
|
expect(reviewable_actions(guardian).has?(:reject_and_delete)).to eq(false)
|
|
end
|
|
|
|
it "includes the reject and delete action if the user is allowed" do
|
|
expect(reviewable_actions(Guardian.new(admin)).has?(:reject_and_delete)).to eq(true)
|
|
end
|
|
|
|
it "includes the approve post and unhide action if the post is hidden" do
|
|
post.hidden = true
|
|
|
|
actions = reviewable_actions(guardian)
|
|
|
|
expect(actions.has?(:approve_and_unhide)).to eq(true)
|
|
end
|
|
|
|
it "includes the reject post and keep deleted action is the post is deleted" do
|
|
post.deleted_at = 1.day.ago
|
|
|
|
actions = reviewable_actions(guardian)
|
|
|
|
expect(actions.has?(:approve_and_restore)).to eq(false)
|
|
expect(actions.has?(:reject_and_keep_deleted)).to eq(true)
|
|
end
|
|
|
|
it "includes an option to approve and restore the post if the user is allowed" do
|
|
post.deleted_at = 1.day.ago
|
|
|
|
actions = reviewable_actions(Guardian.new(admin))
|
|
|
|
expect(actions.has?(:approve_and_restore)).to eq(false)
|
|
end
|
|
|
|
def reviewable_actions(guardian)
|
|
actions = Reviewable::Actions.new(reviewable, guardian, {})
|
|
reviewable.build_actions(actions, guardian, {})
|
|
|
|
actions
|
|
end
|
|
# TODO (reviewable-refresh): Remove the tests above when the legacy combined actions are removed
|
|
|
|
context "with new UI (separated post and user actions)" do
|
|
let(:post) { Fabricate.build(:post) }
|
|
let(:reviewable) { ReviewablePost.new(target: post, target_created_by: post.user) }
|
|
let(:guardian) { Guardian.new }
|
|
let(:admin_guardian) { Guardian.new(admin) }
|
|
|
|
before do
|
|
allow_any_instance_of(Guardian).to receive(:can_see_reviewable_ui_refresh?).and_return(true)
|
|
end
|
|
|
|
it "Does not return available actions when the reviewable is no longer pending" do
|
|
available_actions =
|
|
(Reviewable.statuses.keys - ["pending"]).reduce([]) do |actions, status|
|
|
reviewable.status = status
|
|
actions.concat reviewable_actions(guardian).to_a
|
|
end
|
|
|
|
expect(available_actions).to be_empty
|
|
end
|
|
|
|
it "includes user actions when target_created_by is present" do
|
|
actions = reviewable_actions(guardian)
|
|
|
|
expect(actions.has?(:no_action_user)).to eq(true)
|
|
end
|
|
|
|
it "includes suspend and silence actions for admins" do
|
|
actions = reviewable_actions(admin_guardian)
|
|
|
|
expect(actions.has?(:suspend_user)).to eq(true)
|
|
expect(actions.has?(:silence_user)).to eq(true)
|
|
end
|
|
|
|
it "includes delete user actions for admins" do
|
|
actions = reviewable_actions(admin_guardian)
|
|
|
|
expect(actions.has?(:delete_user)).to eq(true)
|
|
expect(actions.has?(:delete_and_block_user)).to eq(true)
|
|
end
|
|
|
|
it "includes a minimal user actions bundle when no target_created_by" do
|
|
reviewable.target_created_by = nil
|
|
actions = reviewable_actions(guardian)
|
|
|
|
expect(actions.has?(:no_action_user)).to eq(true)
|
|
expect(actions.has?(:silence_user)).to eq(false)
|
|
expect(actions.has?(:suspend_user)).to eq(false)
|
|
expect(actions.has?(:delete_user)).to eq(false)
|
|
expect(actions.has?(:delete_and_block_user)).to eq(false)
|
|
end
|
|
|
|
def reviewable_actions(guardian)
|
|
actions = Reviewable::Actions.new(reviewable, guardian, {})
|
|
reviewable.build_actions(actions, guardian, {})
|
|
|
|
actions
|
|
end
|
|
end
|
|
end
|
|
|
|
describe "Performing actions" do
|
|
let(:post) { Fabricate(:post) }
|
|
let(:reviewable) { ReviewablePost.needs_review!(target: post, created_by: admin) }
|
|
|
|
before { reviewable.created_new! }
|
|
|
|
# TODO (reviewable-refresh): Remove the tests below when the legacy combined actions are removed
|
|
describe "#perform_approve" do
|
|
it "transitions to the approved state" do
|
|
result = reviewable.perform admin, :approve
|
|
|
|
expect(result.transition_to).to eq :approved
|
|
end
|
|
end
|
|
|
|
describe "#perform_reject_and_suspend" do
|
|
it "transitions to the rejected state" do
|
|
result = reviewable.perform admin, :reject_and_suspend
|
|
|
|
expect(result.transition_to).to eq :rejected
|
|
end
|
|
end
|
|
|
|
describe "#perform_reject_and_keep_deleted" do
|
|
it "transitions to the rejected state and keep the post deleted" do
|
|
post.trash!
|
|
|
|
result = reviewable.perform admin, :reject_and_keep_deleted
|
|
|
|
expect(result.transition_to).to eq :rejected
|
|
expect(Post.where(id: post.id).exists?).to eq(false)
|
|
end
|
|
end
|
|
|
|
describe "#perform_approve_and_restore" do
|
|
it "transitions to the approved state and restores the post" do
|
|
post.trash!
|
|
|
|
result = reviewable.reload.perform admin, :approve_and_restore
|
|
|
|
expect(result.transition_to).to eq :approved
|
|
expect(Post.where(id: post.id).exists?).to eq(true)
|
|
end
|
|
end
|
|
|
|
describe "#perform_approve_and_unhide" do
|
|
it "transitions to the approved state and unhides the post" do
|
|
post.update!(hidden: true)
|
|
|
|
result = reviewable.reload.perform admin, :approve_and_unhide
|
|
|
|
expect(result.transition_to).to eq :approved
|
|
expect(post.reload.hidden).to eq(false)
|
|
end
|
|
end
|
|
|
|
describe "#perform_reject_and_delete" do
|
|
it "transitions to the rejected state and deletes the post" do
|
|
result = reviewable.perform admin, :reject_and_delete
|
|
|
|
expect(result.transition_to).to eq :rejected
|
|
expect(Post.where(id: post.id).exists?).to eq(false)
|
|
end
|
|
end
|
|
# TODO (reviewable-refresh): Remove the tests above when the legacy combined actions are removed
|
|
|
|
context "with new separated actions" do
|
|
before do
|
|
allow_any_instance_of(Guardian).to receive(:can_see_reviewable_ui_refresh?).and_return(true)
|
|
end
|
|
|
|
describe "#perform_silence_user" do
|
|
it "transitions to rejected" do
|
|
result = reviewable.perform admin, :silence_user
|
|
|
|
expect(result.transition_to).to eq :rejected
|
|
end
|
|
end
|
|
|
|
describe "#perform_suspend_user" do
|
|
it "transitions to rejected" do
|
|
result = reviewable.perform admin, :suspend_user
|
|
|
|
expect(result.transition_to).to eq :rejected
|
|
end
|
|
end
|
|
|
|
describe "#perform_no_action_user" do
|
|
it "transitions to approved" do
|
|
result = reviewable.perform admin, :no_action_user
|
|
|
|
expect(result.transition_to).to eq :approved
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|