[DRE-commits] [ruby-mechanize] 01/06: fix FTBFS and Debci failure with ruby 2.3.5 (Closes: #882608)
Daisuke Higuchi
dai at moszumanska.debian.org
Mon Dec 4 14:34:22 UTC 2017
This is an automated email from the git hooks/post-receive script.
dai pushed a commit to branch master
in repository ruby-mechanize.
commit 9d9c52853f6b3f839c2408af2bdb279ef9db4426
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date: Mon Dec 4 23:13:29 2017 +0900
fix FTBFS and Debci failure with ruby 2.3.5 (Closes: #882608)
---
...lean_up_tests_for_minitest_5_deprecations.patch | 136 +++++++++++++++++++++
...fixes_the_current_test_failures_on_master.patch | 31 +++++
debian/patches/series | 2 +
3 files changed, 169 insertions(+)
diff --git a/debian/patches/clean_up_tests_for_minitest_5_deprecations.patch b/debian/patches/clean_up_tests_for_minitest_5_deprecations.patch
new file mode 100644
index 0000000..7359e11
--- /dev/null
+++ b/debian/patches/clean_up_tests_for_minitest_5_deprecations.patch
@@ -0,0 +1,136 @@
+Description: Clean up tests for minitest 5 deprecations.
+Author: Ryan Davis <ryand-ruby at zenspider.com>
+Origin: upstream, commit: f953eee6538793ada211011ec397e732f2d0c8a5
+Last-Update: 2017-11-16
+
+diff --git a/test/test_mechanize.rb b/test/test_mechanize.rb
+index ef1eb10..dfea721 100644
+--- a/test/test_mechanize.rb
++++ b/test/test_mechanize.rb
+@@ -943,7 +943,7 @@ but not <a href="/" rel="me nofollow">this</a>!
+ "Content-Disposition: form-data; name=\"userfile1\"; filename=\"#{name}\"",
+ page.body
+ )
+- assert_send [page.body.bytesize, :>, File.size(__FILE__)]
++ assert_operator page.body.bytesize, :>, File.size(__FILE__)
+ end
+
+ def test_post_file_upload_nonascii
+@@ -962,7 +962,7 @@ but not <a href="/" rel="me nofollow">this</a>!
+ page.body
+ )
+ assert_match("Content-Type: application/zip", page.body)
+- assert_send [page.body.bytesize, :>, File.size(__FILE__)]
++ assert_operator page.body.bytesize, :>, File.size(__FILE__)
+ end
+
+ def test_post_file_upload
+@@ -981,7 +981,7 @@ but not <a href="/" rel="me nofollow">this</a>!
+ page.body
+ )
+ assert_match("Content-Type: application/zip", page.body)
+- assert_send [page.body.bytesize, :>, File.size(__FILE__)]
++ assert_operator page.body.bytesize, :>, File.size(__FILE__)
+ end
+
+ def test_post_redirect
+diff --git a/test/test_mechanize_cookie.rb b/test/test_mechanize_cookie.rb
+index 2fdeb5f..49d0350 100644
+--- a/test/test_mechanize_cookie.rb
++++ b/test/test_mechanize_cookie.rb
+@@ -458,7 +458,7 @@ class TestMechanizeCookie < Mechanize::TestCase
+ cookie = Mechanize::Cookie.new('key', 'value')
+ assert_equal 'key', cookie.name
+ assert_equal 'value', cookie.value
+- assert_equal nil, cookie.expires
++ assert_nil cookie.expires
+
+ # Minimum unit for the expires attribute is second
+ expires = Time.at((Time.now + 3600).to_i)
+diff --git a/test/test_mechanize_file_response.rb b/test/test_mechanize_file_response.rb
+index 8c76d1b..05e08ea 100644
+--- a/test/test_mechanize_file_response.rb
++++ b/test/test_mechanize_file_response.rb
+@@ -5,7 +5,7 @@ class TestMechanizeFileResponse < Mechanize::TestCase
+ def test_content_type
+ Tempfile.open %w[pi .nothtml] do |tempfile|
+ res = Mechanize::FileResponse.new tempfile.path
+- assert_equal nil, res['content-type']
++ assert_nil res['content-type']
+ end
+
+ Tempfile.open %w[pi .xhtml] do |tempfile|
+diff --git a/test/test_mechanize_form_encoding.rb b/test/test_mechanize_form_encoding.rb
+index 9873082..b8cadc5 100644
+--- a/test/test_mechanize_form_encoding.rb
++++ b/test/test_mechanize_form_encoding.rb
+@@ -67,7 +67,7 @@ class TestMechanizeFormEncoding < Mechanize::TestCase
+ node['enctype'] = 'application/x-www-form-urlencoded'
+ form = Mechanize::Form.new(node)
+
+- assert_equal nil, form.encoding
++ assert_nil form.encoding
+ end
+
+ def test_post_form_with_form_encoding
+diff --git a/test/test_mechanize_page_image.rb b/test/test_mechanize_page_image.rb
+index ab5635a..71e439d 100644
+--- a/test/test_mechanize_page_image.rb
++++ b/test/test_mechanize_page_image.rb
+@@ -147,7 +147,7 @@ class TestMechanizePageImage < Mechanize::TestCase
+
+ assert_equal 'https', page.uri.scheme
+ assert_equal false, page.images.first.relative?
+- assert_equal nil, requests.first['Referer']
++ assert_nil requests.first['Referer']
+ end
+
+ def test_image_referer_http_page_abs_src
+diff --git a/test/test_mechanize_page_link.rb b/test/test_mechanize_page_link.rb
+index 9a1a961..32c63bb 100644
+--- a/test/test_mechanize_page_link.rb
++++ b/test/test_mechanize_page_link.rb
+@@ -72,7 +72,7 @@ class TestMechanizePageLink < Mechanize::TestCase
+ assert_equal(URI("http://localhost/canonical_uri"), page.canonical_uri)
+
+ page = @mech.get("http://localhost/file_upload.html")
+- assert_equal(nil, page.canonical_uri)
++ assert_nil page.canonical_uri
+ end
+
+ def test_canonical_uri_unescaped
+@@ -339,7 +339,7 @@ class TestMechanizePageLink < Mechanize::TestCase
+ def test_title_none
+ page = util_page '' # invalid HTML
+
+- assert_equal(nil, page.title)
++ assert_nil(page.title)
+ end
+
+ def test_page_decoded_with_charset
+diff --git a/test/test_mechanize_page_meta_refresh.rb b/test/test_mechanize_page_meta_refresh.rb
+index 5d13db3..f966df1 100644
+--- a/test/test_mechanize_page_meta_refresh.rb
++++ b/test/test_mechanize_page_meta_refresh.rb
+@@ -112,7 +112,7 @@ class TestMechanizePageMetaRefresh < Mechanize::TestCase
+ page = util_page 5, nil
+ link = util_meta_refresh page
+ assert_equal 5, link.delay
+- assert_equal nil, link.href
++ assert_nil link.href
+
+ page = util_page 5, @uri
+ link = util_meta_refresh page
+diff --git a/test/test_mechanize_util.rb b/test/test_mechanize_util.rb
+index 820de3d..06661b4 100644
+--- a/test/test_mechanize_util.rb
++++ b/test/test_mechanize_util.rb
+@@ -27,7 +27,7 @@ class TestMechanizeUtil < Mechanize::TestCase
+
+ def test_from_native_charset_returns_nil_when_no_string
+ @result = @MU.from_native_charset(nil, CONTENT_ENCODING)
+- assert_equal nil, @result
++ assert_nil @result
+ end
+
+ def test_from_native_charset_doesnot_convert_when_no_encoding
diff --git a/debian/patches/fixes_the_current_test_failures_on_master.patch b/debian/patches/fixes_the_current_test_failures_on_master.patch
new file mode 100644
index 0000000..31c4611
--- /dev/null
+++ b/debian/patches/fixes_the_current_test_failures_on_master.patch
@@ -0,0 +1,31 @@
+Description: Fixes the current test failures on master.
+Author: Ryan Davis <ryand-ruby at zenspider.com>
+Origin: upstream, commit: ad8603b2eeb7162eeadf4d23fd260ad55f0c390b
+Last-Update: 2017-11-16
+
+diff --git a/lib/mechanize/test_case/http_refresh_servlet.rb b/lib/mechanize/test_case/http_refresh_servlet.rb
+index 2ecf60f..485efc6 100644
+--- a/lib/mechanize/test_case/http_refresh_servlet.rb
++++ b/lib/mechanize/test_case/http_refresh_servlet.rb
+@@ -3,7 +3,7 @@ class HttpRefreshServlet < WEBrick::HTTPServlet::AbstractServlet
+ res['Content-Type'] = req.query['ct'] || "text/html"
+ refresh_time = req.query['refresh_time'] || 0
+ refresh_url = req.query['refresh_url'] || '/'
+- res['Refresh'] = " #{refresh_time};url=#{refresh_url}\r\n";
++ res['Refresh'] = " #{refresh_time};url=#{refresh_url}";
+ end
+ end
+
+diff --git a/lib/mechanize/test_case/infinite_refresh_servlet.rb b/lib/mechanize/test_case/infinite_refresh_servlet.rb
+index 5bdd929..738fa60 100644
+--- a/lib/mechanize/test_case/infinite_refresh_servlet.rb
++++ b/lib/mechanize/test_case/infinite_refresh_servlet.rb
+@@ -4,7 +4,7 @@ class InfiniteRefreshServlet < WEBrick::HTTPServlet::AbstractServlet
+ res['Content-Type'] = req.query['ct'] || "text/html"
+ res.status = req.query['code'] ? req.query['code'].to_i : '302'
+ number = req.query['q'] ? req.query['q'].to_i : 0
+- res['Refresh'] = "0;url=http://#{address}/infinite_refresh?q=#{number + 1}\r\n";
++ res['Refresh'] = "0;url=http://#{address}/infinite_refresh?q=#{number + 1}";
+ end
+ end
+
diff --git a/debian/patches/series b/debian/patches/series
index 59acd92..b88641a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
dont_require_rubygems
set_path_for_test
0003-Replace-dep-on-ntlm-http-by-rubyntlm.patch
+clean_up_tests_for_minitest_5_deprecations.patch
+fixes_the_current_test_failures_on_master.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mechanize.git
More information about the Pkg-ruby-extras-commits
mailing list