Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve net-http adapter deprecation Ruby 3.4 #1081

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions lib/webmock/http_lib_adapters/net_http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,25 @@ class NetHttpAdapter < HttpLibAdapter
adapter_for :net_http

OriginalNetHTTP = Net::HTTP unless const_defined?(:OriginalNetHTTP)
# This will be removed in Ruby 3.5. In Ruby 3.4, const_remove will warn.
HAS_LEGACY_CONSTANT = Net.const_defined?(:HTTPSession)

def self.enable!
Net.send(:remove_const, :HTTP)
Net.send(:remove_const, :HTTPSession)
Net.send(:const_set, :HTTP, @webMockNetHTTP)
Net.send(:const_set, :HTTPSession, @webMockNetHTTP)
if HAS_LEGACY_CONSTANT
remove_silently(Net, :HTTPSession)
Net.send(:const_set, :HTTPSession, @webMockNetHTTP)
end
end

def self.disable!
Net.send(:remove_const, :HTTP)
Net.send(:remove_const, :HTTPSession)
Net.send(:const_set, :HTTP, OriginalNetHTTP)
Net.send(:const_set, :HTTPSession, OriginalNetHTTP)
if HAS_LEGACY_CONSTANT
remove_silently(Net, :HTTPSession)
Net.send(:const_set, :HTTPSession, OriginalNetHTTP)
end

#copy all constants from @webMockNetHTTP to original Net::HTTP
#in case any constants were added to @webMockNetHTTP instead of Net::HTTP
Expand All @@ -37,6 +43,14 @@ def self.disable!
end
end

def self.remove_silently(mod, const) #:nodoc:
# Don't warn on removing the deprecated constant
verbose, $VERBOSE = $VERBOSE, nil
mod.send(:remove_const, const)
ensure
$VERBOSE = verbose
end

@webMockNetHTTP = Class.new(Net::HTTP) do
class << self
def socket_type
Expand Down
Loading