Merge pull request #1056 from IFTTT/master

Replace Async::IO::Socket usage with stdlib Socket…
bblimke · May 24, 2024 · 0092f5d · 0092f5d
2 parents fc6a2ab + 6cbfed0
commit 0092f5d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/lib/webmock/http_lib_adapters/async_http_client_adapter.rb b/lib/webmock/http_lib_adapters/async_http_client_adapter.rb
@@ -152,11 +152,15 @@ def inspect
 
         private
 
+        def socket_class
+          defined?(Async::IO::Socket) ? Async::IO::Socket : Socket
+        end
+
         def create_connected_sockets
           pair = begin
-            Async::IO::Socket.pair(Socket::AF_UNIX, Socket::SOCK_STREAM)
+            socket_class.pair(Socket::AF_UNIX, Socket::SOCK_STREAM)
           rescue Errno::EAFNOSUPPORT
-            Async::IO::Socket.pair(Socket::AF_INET, Socket::SOCK_STREAM)
+            socket_class.pair(Socket::AF_INET, Socket::SOCK_STREAM)
           end
           pair.tap do |sockets|
             sockets.each do |socket|

diff --git a/lib/webmock/version.rb b/lib/webmock/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WebMock
-  VERSION = '3.23.0' unless defined?(::WebMock::VERSION)
+  VERSION = '3.23.1' unless defined?(::WebMock::VERSION)
 end
diff --git a/spec/acceptance/async_http_client/async_http_client_spec_helper.rb b/spec/acceptance/async_http_client/async_http_client_spec_helper.rb
@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module AsyncHttpClientSpecHelper
   def http_request(method, url, options = {}, &block)
     endpoint = Async::HTTP::Endpoint.parse(url)