Fix 500 errors on searching invalid URLs (mastodon#3613)

koteitan · Jun 25, 2017 · 7154bba · 7154bba
1 parent 65eac01
commit 7154bba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/services/fetch_remote_resource_service.rb b/app/services/fetch_remote_resource_service.rb
@@ -5,7 +5,7 @@ class FetchRemoteResourceService < BaseService
 
   def call(url)
     @url = url
-    process_url unless atom_url.nil?
+    process_url unless fetched_atom_feed.nil?
   end
 
   private

diff --git a/spec/services/fetch_remote_resource_service_spec.rb b/spec/services/fetch_remote_resource_service_spec.rb
@@ -10,7 +10,7 @@
       url = 'http://example.com/missing-atom'
       service = double
       allow(FetchAtomService).to receive(:new).and_return service
-      allow(service).to receive(:call).with(url).and_return([nil, 'body'])
+      allow(service).to receive(:call).with(url).and_return(nil)
 
       result = subject.call(url)
       expect(result).to be_nil