mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-30 23:33:42 +01:00
c373148b3d
* Allow import/export of instance-level domain blocks/allows (#1754) * Allow import/export of instance-level domain blocks/allows. Fixes #15095 * Pacify circleci * Address simple code review feedback * Add headers to exported CSV * Extract common import/export functionality to AdminExportControllerConcern * Add additional fields to instance-blocked domain export * Address review feedback * Split instance domain block/allow import/export into separate pages/controllers * Address code review feedback * Pacify DeepSource * Work around Paperclip::HasAttachmentFile for Rails 6 * Fix deprecated API warning in export tests * Remove after_commit workaround (cherry picked from commit94e98864e3) * Add confirmation page when importing blocked domains (#1773) * Move glitch-soc-specific strings to glitch-soc-specific locale files * Add confirmation page when importing blocked domains (cherry picked from commitb91196f4b7) * Fix authorization check in domain blocks controller (cherry picked from commit7527937758) * Fix error strings for domain blocks and email-domain blocks Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's" * Ran i18n-tasks normalize to address test failure * Removed unused admin.export_domain_blocks.not_permitted string Removing unused string as indicated by Check i18n * Fix tests (cherry picked from commit9094c2f52c) * Fix domain block export not exporting blocks with only media rejection (cherry picked from commit26ff48ee48) * Fix various issues with domain block import - stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded (cherry picked from commit cad824d8f501b95377e4f0a957e5a00d517a1902) Co-authored-by: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>
85 lines
3.1 KiB
Ruby
85 lines
3.1 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe Admin::DomainBlocksController, type: :controller do
|
|
render_views
|
|
|
|
before do
|
|
sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), 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 'POST #batch' do
|
|
it 'blocks the domains when succeeded to save' do
|
|
allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
|
|
|
|
post :batch, params: {
|
|
save: '',
|
|
form_domain_block_batch: {
|
|
domain_blocks_attributes: {
|
|
'0' => { enabled: '1', domain: 'example.com', severity: 'silence' },
|
|
'1' => { enabled: '0', domain: 'mastodon.social', severity: 'suspend' },
|
|
'2' => { enabled: '1', domain: 'mastodon.online', severity: 'suspend' }
|
|
}
|
|
}
|
|
}
|
|
|
|
expect(DomainBlockWorker).to have_received(:perform_async).exactly(2).times
|
|
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 '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
|