Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Put ActivityPub alternate link into Atom, prefer it when processing Atom (#4623)

Browse source
This commit is contained in:
Eugen Rochko 2017-08-18 01:03:18 +02:00 • committed by GitHub
parent efec02f153
commit 40c45f5dd9
6 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spec/lib/ostatus/atom_serializer_spec.rb
View file

@ -196,7 +196,7 @@ RSpec.describe OStatus::AtomSerializer do
author = OStatus::AtomSerializer.new.author(account)
link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' && node[:type] == 'text/html' }
expect(link[:type]).to eq 'text/html'
expect(link[:rel]).to eq 'alternate'
expect(link[:href]).to eq 'https://cb6e6126.ngrok.io/@username'
@ -407,6 +407,7 @@ RSpec.describe OStatus::AtomSerializer do
remote_status.stream_entry.update!(created_at: '2000-01-01T00:00:00Z')
entry = OStatus::AtomSerializer.new.entry(remote_status.stream_entry, true)
entry.nodes.delete_if { |node| node[:type] == 'application/activity+json' } # Remove ActivityPub link to simplify test
xml = OStatus::AtomSerializer.render(entry).gsub('cb6e6126.ngrok.io', 'remote')
remote_status.destroy!
@ -415,7 +416,7 @@ RSpec.describe OStatus::AtomSerializer do
account = Account.create!(
domain: 'remote',
username: 'username',
last_webfingered_at: Time.now.utc,
last_webfingered_at: Time.now.utc
)
ProcessFeedService.new.call(xml, account)
@ -529,7 +530,7 @@ RSpec.describe OStatus::AtomSerializer do
entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' && node[:type] == 'text/html' }
expect(link[:type]).to eq 'text/html'
expect(link[:href]).to eq "https://cb6e6126.ngrok.io/users/username/updates/#{status.stream_entry.id}"
end
@ -642,7 +643,7 @@ RSpec.describe OStatus::AtomSerializer do
feed = OStatus::AtomSerializer.new.feed(account, [])
link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' && node[:type] == 'text/html' }
expect(link[:type]).to eq 'text/html'
expect(link[:href]).to eq 'https://cb6e6126.ngrok.io/@username'
end
@ -1509,7 +1510,7 @@ RSpec.describe OStatus::AtomSerializer do
entry = OStatus::AtomSerializer.new.object(status)
link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' && node[:type] == 'text/html' }
expect(link[:type]).to eq 'text/html'
expect(link[:href]).to eq "https://cb6e6126.ngrok.io/@username/#{status.id}"
end