mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-25 04:25:01 +01:00
Code Issues Projects Releases Wiki Activity

Combine double subjects in admin/accounts controller spec (#28936)

Browse Source
This commit is contained in:
Matt Jankowski 2024-01-26 11:21:31 -05:00 committed by GitHub
parent 9cc1817bb4
commit 2f8656334d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spec/controllers/admin/accounts_controller_spec.rb
View File

@ -153,13 +153,9 @@ RSpec.describe Admin::AccountsController do
context 'when user is admin' do context 'when user is admin' do
let(:role) { UserRole.find_by(name: 'Admin') } 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(subject).to redirect_to admin_accounts_path(status: 'pending')
expect(user.reload).to be_approved expect(user.reload).to be_approved
end
it 'logs action' do
expect(subject).to have_http_status 302
expect(latest_admin_action_log) expect(latest_admin_action_log)
.to be_present .to be_present
@ -195,12 +191,8 @@ RSpec.describe Admin::AccountsController do
context 'when user is admin' do context 'when user is admin' do
let(:role) { UserRole.find_by(name: 'Admin') } 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') 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) expect(latest_admin_action_log)
.to be_present .to be_present
@ -286,12 +278,9 @@ RSpec.describe Admin::AccountsController do
context 'when user is admin' do context 'when user is admin' do
let(:role) { UserRole.find_by(name: 'Admin') } 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) 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) expect(response).to redirect_to admin_account_path(account.id)
end end
end end