Add support for importing lists (#25203)
This commit is contained in:
parent
d91607feee
commit
8884d1ece0
9 changed files with 132 additions and 9 deletions
3
spec/fixtures/files/lists.csv
vendored
Normal file
3
spec/fixtures/files/lists.csv
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
Mastodon project,gargron@example.com
|
||||
Mastodon project,mastodon@example.com
|
||||
test,foo@example.com
|
|
|
@ -86,6 +86,7 @@ RSpec.describe Form::Import do
|
|||
it_behaves_like 'too many CSV rows', 'muting', 'imports.txt', 1
|
||||
it_behaves_like 'too many CSV rows', 'domain_blocking', 'domain_blocks.csv', 2
|
||||
it_behaves_like 'too many CSV rows', 'bookmarks', 'bookmark-imports.txt', 3
|
||||
it_behaves_like 'too many CSV rows', 'lists', 'lists.csv', 2
|
||||
|
||||
# Importing list of addresses with no headers into various types
|
||||
it_behaves_like 'valid import', 'following', 'imports.txt'
|
||||
|
@ -98,6 +99,9 @@ RSpec.describe Form::Import do
|
|||
# Importing bookmarks list with no headers into expected type
|
||||
it_behaves_like 'valid import', 'bookmarks', 'bookmark-imports.txt'
|
||||
|
||||
# Importing lists with no headers into expected type
|
||||
it_behaves_like 'valid import', 'lists', 'lists.csv'
|
||||
|
||||
# Importing followed accounts with headers into various compatible types
|
||||
it_behaves_like 'valid import', 'following', 'following_accounts.csv'
|
||||
it_behaves_like 'valid import', 'blocking', 'following_accounts.csv'
|
||||
|
@ -273,6 +277,12 @@ RSpec.describe Form::Import do
|
|||
{ 'acct' => 'user@test.com', 'hide_notifications' => false },
|
||||
]
|
||||
|
||||
it_behaves_like 'on successful import', 'lists', 'merge', 'lists.csv', [
|
||||
{ 'acct' => 'gargron@example.com', 'list_name' => 'Mastodon project' },
|
||||
{ 'acct' => 'mastodon@example.com', 'list_name' => 'Mastodon project' },
|
||||
{ 'acct' => 'foo@example.com', 'list_name' => 'test' },
|
||||
]
|
||||
|
||||
# Based on the bug report 20571 where UTF-8 encoded domains were rejecting import of their users
|
||||
#
|
||||
# https://github.com/mastodon/mastodon/issues/20571
|
||||
|
|
|
@ -91,5 +91,77 @@ RSpec.describe BulkImportRowService do
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when importing a list row' do
|
||||
let(:import_type) { 'lists' }
|
||||
let(:target_account) { Fabricate(:account) }
|
||||
let(:data) do
|
||||
{ 'acct' => target_account.acct, 'list_name' => 'my list' }
|
||||
end
|
||||
|
||||
shared_examples 'common behavior' do
|
||||
context 'when the target account is already followed' do
|
||||
before do
|
||||
account.follow!(target_account)
|
||||
end
|
||||
|
||||
it 'returns true' do
|
||||
expect(subject.call(import_row)).to be true
|
||||
end
|
||||
|
||||
it 'adds the target account to the list' do
|
||||
expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the user already requested to follow the target account' do
|
||||
before do
|
||||
account.request_follow!(target_account)
|
||||
end
|
||||
|
||||
it 'returns true' do
|
||||
expect(subject.call(import_row)).to be true
|
||||
end
|
||||
|
||||
it 'adds the target account to the list' do
|
||||
expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the target account is neither followed nor requested' do
|
||||
it 'returns true' do
|
||||
expect(subject.call(import_row)).to be true
|
||||
end
|
||||
|
||||
it 'adds the target account to the list' do
|
||||
expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the target account is the user themself' do
|
||||
let(:target_account) { account }
|
||||
|
||||
it 'returns true' do
|
||||
expect(subject.call(import_row)).to be true
|
||||
end
|
||||
|
||||
it 'adds the target account to the list' do
|
||||
expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the list does not exist yet' do
|
||||
include_examples 'common behavior'
|
||||
end
|
||||
|
||||
context 'when the list exists' do
|
||||
before do
|
||||
Fabricate(:list, account: account, title: 'my list')
|
||||
end
|
||||
|
||||
include_examples 'common behavior'
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue