mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-26 06:43:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream

Browse source
This commit is contained in:
Claire 2024-05-21 17:45:21 +02:00
commit 5ab111554e
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/styles/mastodon/components.scss
View file

@ -4372,7 +4372,7 @@ a.status-card {
color: $primary-text-color; color: $primary-text-color;
} }
.icon { .icon-sliders {
transform: rotate(60deg); transform: rotate(60deg);
} }
} }
@ -4383,7 +4383,7 @@ a.status-card {
} }
} }
.no-reduce-motion .column-header__button .icon { .no-reduce-motion .column-header__button .icon-sliders {
transition: transform 150ms ease-in-out; transition: transform 150ms ease-in-out;
} }

23
spec/controllers/admin/accounts_controller_spec.rb
View file

@ -53,7 +53,9 @@ RSpec.describe Admin::AccountsController do
describe 'GET #show' do describe 'GET #show' do
let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) } let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
let(:account) { Fabricate(:account) }
context 'with a remote account' do
let(:account) { Fabricate(:account, domain: 'example.com') }
it 'returns http success' do it 'returns http success' do
get :show, params: { id: account.id } get :show, params: { id: account.id }
@ -61,6 +63,25 @@ RSpec.describe Admin::AccountsController do
end end
end end
context 'with a local account' do
let(:account) { Fabricate(:account, domain: nil) }
it 'returns http success' do
get :show, params: { id: account.id }
expect(response).to have_http_status(200)
end
end
context 'with a local deleted account' do
let(:account) { Fabricate(:account, domain: nil, user: nil) }
it 'returns http success' do
get :show, params: { id: account.id }
expect(response).to have_http_status(200)
end
end
end
describe 'POST #memorialize' do describe 'POST #memorialize' do
subject { post :memorialize, params: { id: account.id } } subject { post :memorialize, params: { id: account.id } }