OTWO-7177 Return null object on Fisbot Api timeouts (#1765)

app/lib/fisbot/fisbot_api.rb

@@ -63,10 +63,9 @@ def find(id)
       uri = api_access.resource_uri(id)
       response = Net::HTTP.get_response(uri)
       handle_errors(response) { new(JSON.parse(response.body)) }
-    rescue Errno::ECONNREFUSED, Timeout::Error => e
+    rescue Errno::ECONNREFUSED, Timeout::Error, JSON::ParserError => e
       Airbrake.notify(e)
-    rescue JSON::ParserError
-      handle_errors(response) { nil }
+      null_object
     end
 
     def all(params)
@@ -98,6 +97,10 @@ def api_access
       ApiAccess.new(resource)
     end
 
+    def null_object
+      "Nil#{name}".constantize.new
+    end
+
     def build_objects(response)
       return [] if response.is_a?(Net::HTTPNoContent)
 

test/lib/fisbot_api_test.rb

@@ -21,4 +21,29 @@
       _(code_location).must_be :valid?
     end
   end
+
+  describe 'find' do
+    it 'must handle timeout errors' do
+      Net::HTTP.stubs(:get_response).raises(Timeout::Error)
+      code_location = CodeLocation.find(42)
+
+      _(code_location.scm_type).must_equal :git
+      _(code_location).must_be_kind_of NilCodeLocation
+    end
+
+    it 'must handle connection refused errors' do
+      Net::HTTP.stubs(:get_response).raises(Errno::ECONNREFUSED)
+      code_location = CodeLocation.find(42)
+
+      _(code_location.url).must_be :blank?
+      _(code_location).must_be_kind_of NilCodeLocation
+    end
+
+    it 'must handle JSON parser errors' do
+      Net::HTTP.stubs(:get_response).returns(stub(body: 'bad JSON response'))
+      code_location = CodeLocation.find(42)
+
+      _(code_location).must_be_kind_of NilCodeLocation
+    end
+  end
 end