Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
This commit is contained in:
Claire
2024-09-12 20:05:08 +02:00
parent 2d31cdbc28 24ef8255b3
commit 3465d39494
126 changed files with 991 additions and 2169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spec/helpers/media_component_helper_spec.rb
View File

@@ -32,28 +32,6 @@ RSpec.describe MediaComponentHelper do
end
end
describe 'render_card_component' do
let(:status) { Fabricate(:status) }
let(:result) { helper.render_card_component(status) }
before do
PreviewCardsStatus.create(status: status, preview_card: Fabricate(:preview_card))
end
it 'returns the correct react component markup' do
expect(parsed_html.div['data-component']).to eq('Card')
end
end
describe 'render_poll_component' do
let(:status) { Fabricate(:status, poll: Fabricate(:poll)) }
let(:result) { helper.render_poll_component(status) }
it 'returns the correct react component markup' do
expect(parsed_html.div['data-component']).to eq('Poll')
end
end
private
def parsed_html