Skip to content

Commit cd84c06

Browse files
authored
Merge pull request #1070 from c960657/em-http-ruby-head
Exclude em-http-request on Ruby 3.4
2 parents f4bfa73 + 4fd657a commit cd84c06

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

lib/webmock/http_lib_adapters/em_http_request_adapter.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# frozen_string_literal: true
22

3+
return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0')
4+
35
begin
46
require 'em-http-request'
57
rescue LoadError

spec/acceptance/em_http_request/em_http_request_spec.rb

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
describe "EM::HttpRequest" do
1010
include EMHttpRequestSpecHelper
1111

12+
before(:all) do
13+
skip 'em-http-request is not supported on Ruby >= 3.4' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0')
14+
end
15+
1216
include_context "with WebMock", :no_status_message
1317

1418
#functionality only supported for em-http-request 1.x

spec/spec_helper.rb

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
unless RUBY_PLATFORM =~ /java/
44
require 'curb'
55
require 'patron'
6-
require 'em-http'
76
require 'typhoeus'
87
end
98
if RUBY_PLATFORM =~ /java/

0 commit comments

Comments
 (0)