monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2716 from ClearlyClaire/glitch-soc/merge-upstream 

Merge upstream changes up to cd0c547936
This commit is contained in:
Claire 2024-05-21 20:04:34 +02:00 committed by GitHub
parent 40a3a3f3d8 dc35563f65
commit 65db9dec2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/flavours/glitch/styles/components.scss
View File

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

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

@ -4372,7 +4372,7 @@ a.status-card {
color: $primary-text-color;
}
.icon {
.icon-sliders {
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;
}

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

@ -53,11 +53,32 @@ RSpec.describe Admin::AccountsController do
describe 'GET #show' do
let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
let(:account) { Fabricate(:account) }
it 'returns http success' do
get :show, params: { id: account.id }
expect(response).to have_http_status(200)
context 'with a remote account' do
let(:account) { Fabricate(:account, domain: 'example.com') }
it 'returns http success' do
get :show, params: { id: account.id }
expect(response).to have_http_status(200)
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