From 8b74aa42176dabf77c3b4d02c80bcc47d9d70e8e Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 14 Apr 2017 05:10:28 -0400 Subject: 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 styles --- .../admin/reported_statuses_controller_spec.rb | 21 ++++++ spec/controllers/admin/reports_controller_spec.rb | 80 ++++++++++++++++++++-- spec/fabricators/report_fabricator.rb | 2 + spec/models/report_spec.rb | 10 ++- 4 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 spec/controllers/admin/reported_statuses_controller_spec.rb (limited to 'spec') diff --git a/spec/controllers/admin/reported_statuses_controller_spec.rb b/spec/controllers/admin/reported_statuses_controller_spec.rb new file mode 100644 index 000000000..4d6926e1a --- /dev/null +++ b/spec/controllers/admin/reported_statuses_controller_spec.rb @@ -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 diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb index 622ea87c1..ab93c6271 100644 --- a/spec/controllers/admin/reports_controller_spec.rb +++ b/spec/controllers/admin/reports_controller_spec.rb @@ -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 diff --git a/spec/fabricators/report_fabricator.rb b/spec/fabricators/report_fabricator.rb index b9fa360a7..5bd4a63f0 100644 --- a/spec/fabricators/report_fabricator.rb +++ b/spec/fabricators/report_fabricator.rb @@ -1,4 +1,6 @@ Fabricator(:report) do + account + target_account { Fabricate(:account) } comment "You nasty" action_taken false end diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb index ade53cffa..80b8cc55b 100644 --- a/spec/models/report_spec.rb +++ b/spec/models/report_spec.rb @@ -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 -- cgit