Merge pull request #1091 from sailor/master

Fix included modules on Ruby 3.4
bblimke · Feb 6, 2025 · e8c5129 · e8c5129
2 parents 07eeb75 + c228536
commit e8c5129
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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