mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 23:24:55 +01:00
14f6ce2885
* Record account suspend/silence time and keep track of domain blocks
* Also unblock users who were suspended/silenced before dates were recorded
* Add tests
* Keep track of suspending date for users suspended through the CLI
* Show accurate number of accounts that would be affected by unsuspending an instance
* Change migration to set silenced_at and suspended_at
* Revert "Also unblock users who were suspended/silenced before dates were recorded"
This reverts commit a015c65d2d.
* Switch from using suspended and silenced to suspended_at and silenced_at
* Add post-deployment migration script to remove `suspended` and `silenced` columns
* Use Account#silence! and Account#suspend! instead of updating the underlying property
* Add silenced_at and suspended_at migration to post-migration
* Change account fabricator to translate suspended and silenced attributes
* Minor fixes
* Make unblocking domains always retroactive
74 lines
2.5 KiB
Ruby
74 lines
2.5 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe Admin::DomainBlocksController, type: :controller do
|
|
render_views
|
|
|
|
before do
|
|
sign_in Fabricate(:user, admin: true), scope: :user
|
|
end
|
|
|
|
describe 'GET #new' do
|
|
it 'assigns a new domain block' do
|
|
get :new
|
|
|
|
expect(assigns(:domain_block)).to be_instance_of(DomainBlock)
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
end
|
|
|
|
describe 'GET #show' do
|
|
it 'returns http success' do
|
|
domain_block = Fabricate(:domain_block)
|
|
get :show, params: { id: domain_block.id }
|
|
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
end
|
|
|
|
describe 'POST #create' do
|
|
it 'blocks the domain when succeeded to save' do
|
|
allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
|
|
|
|
post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
|
|
|
|
expect(DomainBlockWorker).to have_received(:perform_async)
|
|
expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
|
|
expect(response).to redirect_to(admin_instances_path(limited: '1'))
|
|
end
|
|
|
|
it 'renders new when failed to save' do
|
|
Fabricate(:domain_block, domain: 'example.com', severity: 'suspend')
|
|
allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
|
|
|
|
post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
|
|
|
|
expect(DomainBlockWorker).not_to have_received(:perform_async)
|
|
expect(response).to render_template :new
|
|
end
|
|
|
|
it 'allows upgrading a block' do
|
|
Fabricate(:domain_block, domain: 'example.com', severity: 'silence')
|
|
allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
|
|
|
|
post :create, params: { domain_block: { domain: 'example.com', severity: 'silence', reject_media: true, reject_reports: true } }
|
|
|
|
expect(DomainBlockWorker).to have_received(:perform_async)
|
|
expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
|
|
expect(response).to redirect_to(admin_instances_path(limited: '1'))
|
|
end
|
|
end
|
|
|
|
describe 'DELETE #destroy' do
|
|
it 'unblocks the domain' do
|
|
service = double(call: true)
|
|
allow(UnblockDomainService).to receive(:new).and_return(service)
|
|
domain_block = Fabricate(:domain_block)
|
|
delete :destroy, params: { id: domain_block.id }
|
|
|
|
expect(service).to have_received(:call).with(domain_block)
|
|
expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.destroyed_msg')
|
|
expect(response).to redirect_to(admin_instances_path(limited: '1'))
|
|
end
|
|
end
|
|
end
|