Bugfix parse body (#359)

* remove lonely operator * raise error if body is nil
intercom · Oct 16, 2017 · 3cea877 · 3cea877
1 parent 0830714
commit 3cea877
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/intercom/request.rb b/lib/intercom/request.rb
@@ -100,7 +100,8 @@ def parse_body(decoded_body, response)
       rescue JSON::ParserError => _
         raise_errors_on_failure(response)
       end
-      raise_application_errors_on_failure(parsed_body, response.code.to_i) if parsed_body&['type'] == 'error.list'
+      raise_errors_on_failure(response) if parsed_body.nil?
+      raise_application_errors_on_failure(parsed_body, response.code.to_i) if parsed_body['type'] == 'error.list'
       parsed_body
     end
 

diff --git a/spec/unit/intercom/request_spec.rb b/spec/unit/intercom/request_spec.rb
@@ -16,6 +16,12 @@
     proc {req.parse_body('<html>somethjing</html>', response)}.must_raise(Intercom::RateLimitExceeded)
   end
 
+  it 'parse_body raises an error if the decoded_body is "null"' do
+    response = OpenStruct.new(:code => 500)
+    req = Intercom::Request.new('path/', 'GET')
+    proc { req.parse_body('null', response)}.must_raise(Intercom::ServerError)
+  end
+
   describe 'Intercom::Client' do
     let (:client) { Intercom::Client.new(token: 'foo', handle_rate_limit: true) }
     let (:uri) {"https://api.intercom.io/users"}
@@ -62,10 +68,4 @@
     req = Intercom::Request.new('path/', 'GET')
     assert_nil(req.parse_body(nil, response))
   end
-
-  it 'parse_body returns nil if the decoded_body is "null"' do
-    response = OpenStruct.new(:code => 500)
-    req = Intercom::Request.new('path/', 'GET')
-    req.parse_body('null', response).must_equal(nil)
-  end
 end