Catch Faraday::ConnectionFailed, too

Author: suhlig

service_broker/github_service_helper.rb

@@ -28,7 +28,7 @@ def create_github_repo(name)
         # error due to unknown reason, pass the original error message upstream
         raise GithubServiceHelper::GithubError.new("GitHub returned an error - #{e.message}")
       end
-    rescue Faraday::Error::TimeoutError
+    rescue Faraday::Error::TimeoutError, Faraday::ConnectionFailed
       raise GithubServiceHelper::GithubUnreachableError
     end
 
@@ -40,7 +40,7 @@ def delete_github_repo(name)
       octokit_client.delete_repository(full_repo_name(name))
     rescue Octokit::Error => e
       raise GithubServiceHelper::GithubError.new("GitHub returned an error - #{e.message}")
-    rescue Faraday::Error::TimeoutError
+    rescue Faraday::Error::TimeoutError, Faraday::ConnectionFailed
       raise GithubServiceHelper::GithubUnreachableError
     end
   end
@@ -88,7 +88,7 @@ def get_deploy_keys(full_repo_name)
       raise GithubServiceHelper::GithubResourceNotFoundError
     rescue Octokit::Error => e
       raise GithubServiceHelper::GithubError.new("GitHub returned an error - #{e.message}")
-    rescue Faraday::Error::TimeoutError
+    rescue Faraday::Error::TimeoutError, Faraday::ConnectionFailed
       raise GithubServiceHelper::GithubUnreachableError
     end
   end
@@ -98,7 +98,7 @@ def add_deploy_key(deploy_key_title, full_repo_name, public_key)
       octokit_client.add_deploy_key(full_repo_name, deploy_key_title, public_key)
     rescue Octokit::Error => e
       raise GithubServiceHelper::GithubError.new("GitHub returned an error - #{e.message}")
-    rescue Faraday::Error::TimeoutError
+    rescue Faraday::Error::TimeoutError, Faraday::ConnectionFailed
       raise GithubServiceHelper::GithubUnreachableError
     end
   end
@@ -108,7 +108,7 @@ def remove_deploy_key(full_repo_name, deploy_key_id)
       octokit_client.remove_deploy_key(full_repo_name, deploy_key_id)
     rescue Octokit::Error => e
       raise GithubServiceHelper::GithubError.new("GitHub returned an error - #{e.message}")
-    rescue Faraday::Error::TimeoutError
+    rescue Faraday::Error::TimeoutError, Faraday::ConnectionFailed
       raise GithubServiceHelper::GithubUnreachableError
     end
   end
@@ -129,4 +129,3 @@ def octokit_client
     ::Octokit::Client.new(access_token: @access_token)
   end
 end
-

service_broker/test/test_helper.rb

@@ -1,17 +1,13 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
 ENV['RACK_ENV'] = 'test'
+
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'rack/test'
 require 'mocha/setup'
 require 'webmock/minitest'
 require 'pry'
 
-WebMock.disable_net_connect!(allow: 'codeclimate.com')
-
 SETTINGS_FILENAME = "test/config/settings.yml"
 
 require File.expand_path '../../service_broker_app.rb', __FILE__
-require File.expand_path '../../github_service_helper.rb', __FILE__
+require File.expand_path '../../github_service_helper.rb', __FILE__