fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-22 06:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix /admin/accounts/:account_id/statuses/:id for edited posts with media attachments (#30819)

Browse source
This commit is contained in:
Claire 2024-06-24 15:11:10 +02:00
parent 2ee88a99d9
commit 8e924e4338
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/status_edit.rb
View file

@ -41,7 +41,7 @@ class StatusEdit < ApplicationRecord
default_scope { order(id: :asc) }
delegate :local?, :application, :edited?, :edited_at,
:discarded?, :visibility, to: :status
:discarded?, :visibility, :language, to: :status
def emojis
return @emojis if defined?(@emojis)

15
spec/controllers/admin/statuses_controller_spec.rb
View file

@ -39,6 +39,21 @@ describe Admin::StatusesController do
end
end
describe 'GET #show' do
before do
status.media_attachments << Fabricate(:media_attachment, type: :image, account: status.account)
status.save!
status.snapshot!(at_time: status.created_at, rate_limit: false)
status.update!(text: 'Hello, this is an edited post')
status.snapshot!(rate_limit: false)
get :show, params: { account_id: account.id, id: status.id }
end
it 'returns http success' do
expect(response).to have_http_status(200)
end
end
describe 'POST #batch' do
subject { post :batch, params: { :account_id => account.id, action => '', :admin_status_batch_action => { status_ids: status_ids } } }