mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Combine double subjects in admin/accounts
controller spec (#28936)
This commit is contained in:
parent
9cc1817bb4
commit
2f8656334d
1 changed files with 3 additions and 14 deletions
|
@ -153,13 +153,9 @@ RSpec.describe Admin::AccountsController do
|
|||
context 'when user is admin' do
|
||||
let(:role) { UserRole.find_by(name: 'Admin') }
|
||||
|
||||
it 'succeeds in approving account' do
|
||||
it 'succeeds in approving account and logs action' do
|
||||
expect(subject).to redirect_to admin_accounts_path(status: 'pending')
|
||||
expect(user.reload).to be_approved
|
||||
end
|
||||
|
||||
it 'logs action' do
|
||||
expect(subject).to have_http_status 302
|
||||
|
||||
expect(latest_admin_action_log)
|
||||
.to be_present
|
||||
|
@ -195,12 +191,8 @@ RSpec.describe Admin::AccountsController do
|
|||
context 'when user is admin' do
|
||||
let(:role) { UserRole.find_by(name: 'Admin') }
|
||||
|
||||
it 'succeeds in rejecting account' do
|
||||
it 'succeeds in rejecting account and logs action' do
|
||||
expect(subject).to redirect_to admin_accounts_path(status: 'pending')
|
||||
end
|
||||
|
||||
it 'logs action' do
|
||||
expect(subject).to have_http_status 302
|
||||
|
||||
expect(latest_admin_action_log)
|
||||
.to be_present
|
||||
|
@ -286,12 +278,9 @@ RSpec.describe Admin::AccountsController do
|
|||
context 'when user is admin' do
|
||||
let(:role) { UserRole.find_by(name: 'Admin') }
|
||||
|
||||
it 'succeeds in removing email blocks' do
|
||||
it 'succeeds in removing email blocks and redirects to admin account path' do
|
||||
expect { subject }.to change { CanonicalEmailBlock.where(reference_account: account).count }.from(1).to(0)
|
||||
end
|
||||
|
||||
it 'redirects to admin account path' do
|
||||
subject
|
||||
expect(response).to redirect_to admin_account_path(account.id)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue