From 78dd9e737db4cb7b36222d8dffa2e1b2376333ca Mon Sep 17 00:00:00 2001 From: Daniel Pepper Date: Tue, 19 Sep 2023 10:21:26 -0700 Subject: [PATCH 1/3] fix specs --- spec/spec_helper.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d183517..9747645 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -32,4 +32,9 @@ end end -Dir["./spec/support/**/*.rb"].sort.each { |f| require f } +Dir["./spec/support/**/*.rb"].sort.each do |f| + puts "!!!! rspec support load: #{f}" + require f +end + +# Dir["./spec/support/**/*.rb"].sort.each { |f| require f } From 63af66a4db4b02d7ae630e9dc39c848e9b92d32c Mon Sep 17 00:00:00 2001 From: Daniel Pepper Date: Tue, 19 Sep 2023 10:24:01 -0700 Subject: [PATCH 2/3] . --- spec/support/mock_server.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/support/mock_server.rb b/spec/support/mock_server.rb index d4b147b..9f720c0 100644 --- a/spec/support/mock_server.rb +++ b/spec/support/mock_server.rb @@ -30,6 +30,8 @@ def mock_server end +puts "!!! Net::HTTP::VERSION: #{Net::HTTP::VERSION}" + RSpec.configure do |config| config.include Helpers::MockServer From bc157f9304b675247cbfdf5ba1e92fd3846ea1a4 Mon Sep 17 00:00:00 2001 From: Daniel Pepper Date: Tue, 19 Sep 2023 10:26:01 -0700 Subject: [PATCH 3/3] . --- spec/support/mock_server.rb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/spec/support/mock_server.rb b/spec/support/mock_server.rb index 9f720c0..e4f60ae 100644 --- a/spec/support/mock_server.rb +++ b/spec/support/mock_server.rb @@ -1,8 +1,11 @@ +require "net/http" require "socket" module Helpers module MockServer - def mock_server + def mock_server(host, *args) + raise Net::OpenTimeout if host =~ /timeout/ + client_socket, server_socket = Socket.pair(:UNIX, :STREAM, 0) allow(client_socket).to receive(:setsockopt) @@ -30,20 +33,11 @@ def mock_server end -puts "!!! Net::HTTP::VERSION: #{Net::HTTP::VERSION}" - RSpec.configure do |config| config.include Helpers::MockServer config.before do - allow(Socket).to receive(:tcp) do |host, *args| - raise Net::OpenTimeout if host =~ /timeout/ - - mock_server - end - - # allow(TCPSocket).to receive(:open).and_wrap_original do |original_method, *args| - # client_socket - # end + allow(Socket).to receive(:tcp, &method(:mock_server)) + allow(TCPSocket).to receive(:open, &method(:mock_server)) end end