treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix regression in FetchRemoteResourceService (#5217) 

* Fix regression in FetchRemoteResourceService

* Update specs to match interface changes made in #5114
lolsob-rspec
ThibG 2017-10-05 00:21:44 +02:00 committed by Eugen Rochko
parent 4e822d41b9
commit a89d69a269
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/fetch_atom_service.rb
View File

@ -45,7 +45,7 @@ class FetchAtomService < BaseService
elsif ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(@response.mime_type)
json = body_to_json(@response.to_s)
if supported_context?(json) && json['type'] == 'Person' && json['inbox'].present?
[json['id'], { id: true }, :activitypub]
[json['id'], { prefetched_body: @response.to_s, id: true }, :activitypub]
else
@unsupported_activity = true
nil

2
app/services/fetch_remote_resource_service.rb
View File

@ -33,7 +33,7 @@ class FetchRemoteResourceService < BaseService
end
def body
fetched_atom_feed.second
fetched_atom_feed.second[:prefetched_body]
end
def protocol

4
spec/services/fetch_remote_resource_service_spec.rb
View File

@ -22,7 +22,7 @@ describe FetchRemoteResourceService do
allow(FetchAtomService).to receive(:new).and_return service
feed_url = 'http://feed-url'
feed_content = '<feed>contents</feed>'
allow(service).to receive(:call).with(url).and_return([feed_url, feed_content])
allow(service).to receive(:call).with(url).and_return([feed_url, { prefetched_body: feed_content }])
account_service = double
allow(FetchRemoteAccountService).to receive(:new).and_return(account_service)
@ -39,7 +39,7 @@ describe FetchRemoteResourceService do
allow(FetchAtomService).to receive(:new).and_return service
feed_url = 'http://feed-url'
feed_content = '<entry>contents</entry>'
allow(service).to receive(:call).with(url).and_return([feed_url, feed_content])
allow(service).to receive(:call).with(url).and_return([feed_url, { prefetched_body: feed_content }])
account_service = double
allow(FetchRemoteStatusService).to receive(:new).and_return(account_service)