From e85cffb2362f914c0f2f7ced4112430b30bc7997 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 2 Apr 2018 22:04:14 +0200
Subject: Feature: Report improvements (#6967) (#7000)
* Implement Assignment of Reports (#6967)
* Change translation of admin.report.comment.label to "Report Comment" for clarity
As we'll soon add the ability for reports to have comments on them, this clarification makes sense.
* Implement notes for Reports
This enables moderators to leave comments about a report whilst they work on it
* Fix display of report moderation notes
* Allow reports to be reopened / marked as unresolved
* Redirect to reports listing upon resolution of report
* Implement "resolve with note" functionality
* Add inverse relationship for report notes
* Remove additional database querying when loading report notes
* Fix tests for reports
* Fix localisations for report notes / reports
---
spec/controllers/admin/reports_controller_spec.rb | 40 +++++++++++++++++++++--
1 file changed, 37 insertions(+), 3 deletions(-)
(limited to 'spec/controllers')
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 71a185147..9be298df6 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -61,7 +61,7 @@ describe Admin::ReportsController do
report = Fabricate(:report)
put :update, params: { id: report, outcome: 'resolve' }
- expect(response).to redirect_to(admin_report_path(report))
+ expect(response).to redirect_to(admin_reports_path)
report.reload
expect(report.action_taken_by_account).to eq user.account
expect(report.action_taken).to eq true
@@ -74,7 +74,7 @@ describe Admin::ReportsController do
allow(Admin::SuspensionWorker).to receive(:perform_async)
put :update, params: { id: report, outcome: 'suspend' }
- expect(response).to redirect_to(admin_report_path(report))
+ expect(response).to redirect_to(admin_reports_path)
report.reload
expect(report.action_taken_by_account).to eq user.account
expect(report.action_taken).to eq true
@@ -88,12 +88,46 @@ describe Admin::ReportsController do
report = Fabricate(:report)
put :update, params: { id: report, outcome: 'silence' }
- expect(response).to redirect_to(admin_report_path(report))
+ expect(response).to redirect_to(admin_reports_path)
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
+
+ describe 'with an outsome of `reopen`' do
+ it 'reopens the report' do
+ report = Fabricate(:report)
+
+ put :update, params: { id: report, outcome: 'reopen' }
+ expect(response).to redirect_to(admin_report_path(report))
+ report.reload
+ expect(report.action_taken_by_account).to eq nil
+ expect(report.action_taken).to eq false
+ end
+ end
+
+ describe 'with an outsome of `assign_to_self`' do
+ it 'reopens the report' do
+ report = Fabricate(:report)
+
+ put :update, params: { id: report, outcome: 'assign_to_self' }
+ expect(response).to redirect_to(admin_report_path(report))
+ report.reload
+ expect(report.assigned_account).to eq user.account
+ end
+ end
+
+ describe 'with an outsome of `unassign`' do
+ it 'reopens the report' do
+ report = Fabricate(:report)
+
+ put :update, params: { id: report, outcome: 'unassign' }
+ expect(response).to redirect_to(admin_report_path(report))
+ report.reload
+ expect(report.assigned_account).to eq nil
+ end
+ end
end
end
--
cgit