We can now assume that Net::OpenTimeout is defined

bblimke · Aug 7, 2022 · 7011493 · 7011493
1 parent 30795ee
commit 7011493
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/lib/webmock/http_lib_adapters/net_http.rb b/lib/webmock/http_lib_adapters/net_http.rb
@@ -165,7 +165,7 @@ def build_net_http_response(webmock_response, &block)
           response.extend Net::WebMockHTTPResponse
 
           if webmock_response.should_timeout
-            raise timeout_exception, "execution expired"
+            raise Net::OpenTimeout, "execution expired"
           end
 
           webmock_response.raise_error_if_any
@@ -175,16 +175,6 @@ def build_net_http_response(webmock_response, &block)
           response
         end
 
-        def timeout_exception
-          if defined?(Net::OpenTimeout)
-            # Ruby 2.x
-            Net::OpenTimeout
-          else
-            # Fallback, if things change
-            Timeout::Error
-          end
-        end
-
         def build_webmock_response(net_http_response)
           webmock_response = WebMock::Response.new
           webmock_response.status = [