diff --git a/lib/webmock/http_lib_adapters/em_http_request_adapter.rb b/lib/webmock/http_lib_adapters/em_http_request_adapter.rb index ec0b89f5..8a4eecb9 100644 --- a/lib/webmock/http_lib_adapters/em_http_request_adapter.rb +++ b/lib/webmock/http_lib_adapters/em_http_request_adapter.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0') + begin require 'em-http-request' rescue LoadError diff --git a/spec/acceptance/em_http_request/em_http_request_spec.rb b/spec/acceptance/em_http_request/em_http_request_spec.rb index 04b4320a..e7218116 100644 --- a/spec/acceptance/em_http_request/em_http_request_spec.rb +++ b/spec/acceptance/em_http_request/em_http_request_spec.rb @@ -9,6 +9,10 @@ describe "EM::HttpRequest" do include EMHttpRequestSpecHelper + before(:all) do + skip 'em-http-request is not supported on Ruby >= 3.4' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0') + end + include_context "with WebMock", :no_status_message #functionality only supported for em-http-request 1.x diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9c7bc842..97ff95f2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,7 +3,6 @@ unless RUBY_PLATFORM =~ /java/ require 'curb' require 'patron' - require 'em-http' require 'typhoeus' end if RUBY_PLATFORM =~ /java/