mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-30 02:23:47 +00: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>
43 lines
1.4 KiB
Ruby
43 lines
1.4 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe Admin::ExportDomainAllowsController, type: :controller do
|
|
render_views
|
|
|
|
before do
|
|
sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
|
|
end
|
|
|
|
describe 'GET #export' do
|
|
it 'renders instances' do
|
|
Fabricate(:domain_allow, domain: 'good.domain')
|
|
Fabricate(:domain_allow, domain: 'better.domain')
|
|
|
|
get :export, params: { format: :csv }
|
|
expect(response).to have_http_status(200)
|
|
expect(response.body).to eq(IO.read(File.join(file_fixture_path, 'domain_allows.csv')))
|
|
end
|
|
end
|
|
|
|
describe 'POST #import' do
|
|
it 'allows imported domains' do
|
|
post :import, params: { admin_import: { data: fixture_file_upload('domain_allows.csv') } }
|
|
|
|
expect(response).to redirect_to(admin_instances_path)
|
|
|
|
# Header should not be imported
|
|
expect(DomainAllow.where(domain: '#domain').present?).to eq(false)
|
|
|
|
# Domains should now be added
|
|
get :export, params: { format: :csv }
|
|
expect(response).to have_http_status(200)
|
|
expect(response.body).to eq(IO.read(File.join(file_fixture_path, 'domain_allows.csv')))
|
|
end
|
|
|
|
it 'displays error on no file selected' do
|
|
post :import, params: { admin_import: {} }
|
|
expect(response).to redirect_to(admin_instances_path)
|
|
expect(flash[:error]).to eq(I18n.t('admin.export_domain_allows.no_file'))
|
|
end
|
|
end
|
|
end
|