Admin reports controller improvements (#1714)
* Simplify admin/reports controller filtering for index * Rename parameter to resolved * Fix issue where reports view could not access filter_link_to * Add coverage for admin/reports controller * DRY up resolution of related reports for target account * Clean up admin/reports routes * Add Report#statuses method * DRY up current account action taken params * Rubocop stylesmaster
parent
a6807201d2
commit
8b74aa4217
@ -0,0 +1,18 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
module Admin |
||||
class ReportedStatusesController < BaseController |
||||
def destroy |
||||
status = Status.find params[:id] |
||||
|
||||
RemovalWorker.perform_async(status.id) |
||||
redirect_to admin_report_path(report) |
||||
end |
||||
|
||||
private |
||||
|
||||
def report |
||||
Report.find(params[:report_id]) |
||||
end |
||||
end |
||||
end |
@ -0,0 +1,21 @@ |
||||
require 'rails_helper' |
||||
|
||||
describe Admin::ReportedStatusesController do |
||||
let(:user) { Fabricate(:user, admin: true) } |
||||
before do |
||||
sign_in user, scope: :user |
||||
end |
||||
|
||||
describe 'DELETE #destroy' do |
||||
it 'removes a status' do |
||||
report = Fabricate(:report) |
||||
status = Fabricate(:status) |
||||
allow(RemovalWorker).to receive(:perform_async) |
||||
|
||||
delete :destroy, params: { report_id: report, id: status } |
||||
expect(response).to redirect_to(admin_report_path(report)) |
||||
expect(RemovalWorker). |
||||
to have_received(:perform_async).with(status.id) |
||||
end |
||||
end |
||||
end |
@ -1,14 +1,86 @@ |
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe Admin::ReportsController, type: :controller do |
||||
describe Admin::ReportsController do |
||||
let(:user) { Fabricate(:user, admin: true) } |
||||
before do |
||||
sign_in user, scope: :user |
||||
end |
||||
|
||||
describe 'GET #index' do |
||||
before do |
||||
sign_in Fabricate(:user, admin: true), scope: :user |
||||
it 'returns http success with no filters' do |
||||
allow(Report).to receive(:unresolved).and_return(Report.all) |
||||
get :index |
||||
|
||||
expect(response).to have_http_status(:success) |
||||
expect(Report).to have_received(:unresolved) |
||||
end |
||||
|
||||
it 'returns http success with resolved filter' do |
||||
allow(Report).to receive(:resolved).and_return(Report.all) |
||||
get :index, params: { resolved: 1 } |
||||
|
||||
expect(response).to have_http_status(:success) |
||||
expect(Report).to have_received(:resolved) |
||||
end |
||||
end |
||||
|
||||
describe 'GET #show' do |
||||
it 'returns http success' do |
||||
get :index |
||||
report = Fabricate(:report) |
||||
|
||||
get :show, params: { id: report } |
||||
expect(response).to have_http_status(:success) |
||||
end |
||||
end |
||||
|
||||
describe 'PUT #update' do |
||||
describe 'with an unknown outcome' do |
||||
it 'rejects the change' do |
||||
report = Fabricate(:report) |
||||
put :update, params: { id: report, outcome: 'unknown' } |
||||
|
||||
expect(response).to have_http_status(:missing) |
||||
end |
||||
end |
||||
|
||||
describe 'with an outcome of `resolve`' do |
||||
it 'resolves the report' do |
||||
report = Fabricate(:report) |
||||
|
||||
put :update, params: { id: report, outcome: 'resolve' } |
||||
expect(response).to redirect_to(admin_report_path(report)) |
||||
report.reload |
||||
expect(report.action_taken_by_account).to eq user.account |
||||
expect(report.action_taken).to eq true |
||||
end |
||||
end |
||||
|
||||
describe 'with an outcome of `suspend`' do |
||||
it 'suspends the reported account' do |
||||
report = Fabricate(:report) |
||||
allow(Admin::SuspensionWorker).to receive(:perform_async) |
||||
|
||||
put :update, params: { id: report, outcome: 'suspend' } |
||||
expect(response).to redirect_to(admin_report_path(report)) |
||||
report.reload |
||||
expect(report.action_taken_by_account).to eq user.account |
||||
expect(report.action_taken).to eq true |
||||
expect(Admin::SuspensionWorker). |
||||
to have_received(:perform_async).with(report.target_account_id) |
||||
end |
||||
end |
||||
|
||||
describe 'with an outsome of `silence`' do |
||||
it 'silences the reported account' do |
||||
report = Fabricate(:report) |
||||
|
||||
put :update, params: { id: report, outcome: 'silence' } |
||||
expect(response).to redirect_to(admin_report_path(report)) |
||||
report.reload |
||||
expect(report.action_taken_by_account).to eq user.account |
||||
expect(report.action_taken).to eq true |
||||
expect(report.target_account).to be_silenced |
||||
end |
||||
end |
||||
end |
||||
end |
||||
|
@ -1,4 +1,6 @@ |
||||
Fabricator(:report) do |
||||
account |
||||
target_account { Fabricate(:account) } |
||||
comment "You nasty" |
||||
action_taken false |
||||
end |
||||
|
@ -1,5 +1,13 @@ |
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe Report, type: :model do |
||||
describe Report do |
||||
describe 'statuses' do |
||||
it 'returns the statuses for the report' do |
||||
status = Fabricate(:status) |
||||
_other = Fabricate(:status) |
||||
report = Fabricate(:report, status_ids: [status.id]) |
||||
|
||||
expect(report.statuses).to eq [status] |
||||
end |
||||
end |
||||
end |
||||
|
Loading…
Reference in new issue