From 7ecd77c78016a154d692cf6e03939a6be0b0d0b5 Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Thu, 6 Feb 2025 11:34:41 +0900 Subject: [PATCH] Revert "Fix included modules on Ruby 3.4" This reverts commit c228536883c67514a62af03ddfd437d1e0a5d5d8 in #1091. Since the CI is failing, the changes must ensure that the CI passes. --- lib/webmock/http_lib_adapters/httpclient_adapter.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/webmock/http_lib_adapters/httpclient_adapter.rb b/lib/webmock/http_lib_adapters/httpclient_adapter.rb index 47679952..809698ed 100644 --- a/lib/webmock/http_lib_adapters/httpclient_adapter.rb +++ b/lib/webmock/http_lib_adapters/httpclient_adapter.rb @@ -230,18 +230,18 @@ def clear_thread_variables end class WebMockHTTPClient < HTTPClient - include WebMockHTTPClients - alias_method :do_get_block_without_webmock, :do_get_block alias_method :do_get_stream_without_webmock, :do_get_stream + + include WebMockHTTPClients end if defined? ::JSONClient class WebMockJSONClient < JSONClient - include WebMockHTTPClients - alias_method :do_get_block_without_webmock, :do_get_block alias_method :do_get_stream_without_webmock, :do_get_stream + + include WebMockHTTPClients end end