tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2018-08-22 20:56:32 +02:00
parent 628fca50e2 56f882aed6
commit e70fc059a9
103 changed files with 757 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spec/controllers/admin/reports_controller_spec.rb
View File

@ -68,21 +68,6 @@ describe Admin::ReportsController do
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_reports_path)
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)

2
spec/controllers/admin/suspensions_controller_spec.rb
View File

@ -12,7 +12,7 @@ describe Admin::SuspensionsController do
account = Fabricate(:account, suspended: false)
expect(Admin::SuspensionWorker).to receive(:perform_async).with(account.id)
post :create, params: { account_id: account.id }
post :create, params: { account_id: account.id, form_admin_suspension_confirmation: { acct: account.acct } }
expect(response).to redirect_to(admin_accounts_path)
end