From 9a957a26ad110350c949039747667ae06c7f4176 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sun, 22 Sep 2024 20:01:46 +0200 Subject: [PATCH] Do not speculate about em-http-request version --- lib/webmock/http_lib_adapters/em_http_request_adapter.rb | 2 +- spec/acceptance/em_http_request/em_http_request_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b4f55dd1..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,6 +1,6 @@ # frozen_string_literal: true -return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0') && Gem.loaded_specs['em-http-request'].version <= Gem::Version.new('1.1.7') +return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0') begin require 'em-http-request' 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 c45af8dd..ff5571f8 100644 --- a/spec/acceptance/em_http_request/em_http_request_spec.rb +++ b/spec/acceptance/em_http_request/em_http_request_spec.rb @@ -10,7 +10,7 @@ before(:all) do skip 'em-http-request is not supported on JRuby' if RUBY_PLATFORM =~ /java/ - skip 'em-http-request <= 1.1.7 is not supported on Ruby >= 3.4' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0') && Gem.loaded_specs['em-http-request'].version <= Gem::Version.new('1.1.7') + 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