From c42a354eda2f6bfe8dc7c1176e085dda6867f4d0 Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Thu, 3 Mar 2016 17:42:30 -0300 Subject: [PATCH] Fix tests for ruby 2.3 (new connect_nonblock call) Applies on top of the changes for 2.2 (#53). --- test/test_helper.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index e9a36af..8ce492d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -119,7 +119,11 @@ def setup_expectations_for_real_request(options = {}) OpenSSL::SSL::SSLSocket.expects(:===).with(socket).returns(true).at_least_once OpenSSL::SSL::SSLSocket.expects(:new).with(socket, instance_of(OpenSSL::SSL::SSLContext)).returns(socket).at_least_once socket.stubs(:sync_close=).returns(true) - socket.expects(:connect).with().at_least_once + if RUBY_VERSION >= "2.3.0" + socket.expects(:connect_nonblock).with(:exception => false).at_least_once + else + socket.expects(:connect).with().at_least_once + end if RUBY_VERSION >= "2.0.0" && RUBY_PLATFORM != "java" socket.expects(:session).with().at_least_once end