Add batch suspend for accounts in admin UI (#17009)
This commit is contained in:
parent
2e2ea6bb6b
commit
0fb9536d38
26 changed files with 312 additions and 278 deletions
|
@ -21,12 +21,9 @@ RSpec.describe Admin::AccountsController, type: :controller do
|
|||
expect(AccountFilter).to receive(:new) do |params|
|
||||
h = params.to_h
|
||||
|
||||
expect(h[:local]).to eq '1'
|
||||
expect(h[:remote]).to eq '1'
|
||||
expect(h[:origin]).to eq 'local'
|
||||
expect(h[:by_domain]).to eq 'domain'
|
||||
expect(h[:active]).to eq '1'
|
||||
expect(h[:silenced]).to eq '1'
|
||||
expect(h[:suspended]).to eq '1'
|
||||
expect(h[:status]).to eq 'active'
|
||||
expect(h[:username]).to eq 'username'
|
||||
expect(h[:display_name]).to eq 'display name'
|
||||
expect(h[:email]).to eq 'local-part@domain'
|
||||
|
@ -36,12 +33,9 @@ RSpec.describe Admin::AccountsController, type: :controller do
|
|||
end
|
||||
|
||||
get :index, params: {
|
||||
local: '1',
|
||||
remote: '1',
|
||||
origin: 'local',
|
||||
by_domain: 'domain',
|
||||
active: '1',
|
||||
silenced: '1',
|
||||
suspended: '1',
|
||||
status: 'active',
|
||||
username: 'username',
|
||||
display_name: 'display name',
|
||||
email: 'local-part@domain',
|
||||
|
|
|
@ -2,10 +2,10 @@ require 'rails_helper'
|
|||
|
||||
describe AccountFilter do
|
||||
describe 'with empty params' do
|
||||
it 'defaults to recent local not-suspended account list' do
|
||||
it 'excludes instance actor by default' do
|
||||
filter = described_class.new({})
|
||||
|
||||
expect(filter.results).to eq Account.local.without_instance_actor.recent.without_suspended
|
||||
expect(filter.results).to eq Account.without_instance_actor
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -16,42 +16,4 @@ describe AccountFilter do
|
|||
expect { filter.results }.to raise_error(/wrong/)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'with valid params' do
|
||||
it 'combines filters on Account' do
|
||||
filter = described_class.new(
|
||||
by_domain: 'test.com',
|
||||
silenced: true,
|
||||
username: 'test',
|
||||
display_name: 'name',
|
||||
email: 'user@example.com',
|
||||
)
|
||||
|
||||
allow(Account).to receive(:where).and_return(Account.none)
|
||||
allow(Account).to receive(:silenced).and_return(Account.none)
|
||||
allow(Account).to receive(:matches_display_name).and_return(Account.none)
|
||||
allow(Account).to receive(:matches_username).and_return(Account.none)
|
||||
allow(User).to receive(:matches_email).and_return(User.none)
|
||||
|
||||
filter.results
|
||||
|
||||
expect(Account).to have_received(:where).with(domain: 'test.com')
|
||||
expect(Account).to have_received(:silenced)
|
||||
expect(Account).to have_received(:matches_username).with('test')
|
||||
expect(Account).to have_received(:matches_display_name).with('name')
|
||||
expect(User).to have_received(:matches_email).with('user@example.com')
|
||||
end
|
||||
|
||||
describe 'that call account methods' do
|
||||
%i(local remote silenced suspended).each do |option|
|
||||
it "delegates the #{option} option" do
|
||||
allow(Account).to receive(option).and_return(Account.none)
|
||||
filter = described_class.new({ option => true })
|
||||
filter.results
|
||||
|
||||
expect(Account).to have_received(option).at_least(1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue