Commit 478de6be authored by Cédric Boutillier's avatar Cédric Boutillier

Drop patches ruby22.patch ruby23.patch minitest5.patch

parent 87dcbecd
This diff is collapsed.
From 1647ca210691429a75eb159814f42e68c3c1ce4c Mon Sep 17 00:00:00 2001
From: Josef Stribny <jstribny@redhat.com>
Date: Thu, 19 Mar 2015 09:32:50 +0100
Subject: [PATCH] Fix tests by expecting TypeError for Ruby 2.2
Bug: https://patch-diff.githubusercontent.com/raw/chrisk/fakeweb/pull/53.patch
---
test/test_fake_web.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/test_fake_web.rb b/test/test_fake_web.rb
index f344612..682c43d 100644
--- a/test/test_fake_web.rb
+++ b/test/test_fake_web.rb
@@ -35,7 +35,9 @@ def test_response_for_with_wrong_number_of_arguments
end
def test_register_uri_without_domain_name
- assert_raises URI::InvalidURIError do
+ # Ruby 2.1 and lower raises URI::InvalidURIError
+ # Ruby 2.2 and higher raises TypeError
+ assert_raises URI::InvalidURIError, TypeError do
FakeWeb.register_uri(:get, 'test_example2.txt', fixture_path("test_example.txt"))
end
end
From c42a354eda2f6bfe8dc7c1176e085dda6867f4d0 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <christian@hofstaedtler.name>
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
minitest5.patch
ruby22.patch
no_bundler_simplecov.patch
fix_print_file_string_options_deprecation_warning.patch
deactivate_google_tests.patch
ruby23.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment