mechanize 2.1.1 → 2.2

data/test/htdocs/tc_links.html

@@ -14,6 +14,8 @@
     <!-- End escaped bug -->
     <a href="unusual&&%3F%3F%23%23.html">unusual characters</a>
 
+    <a href="">empty href</a>
+
     <a href="javascript:new_page('1')">javascript link</a>
   </body>
 </html>

data/test/test_mechanize.rb

@@ -275,16 +275,45 @@ but not <a href="/" rel="me nofollow">this</a>!
     assert_equal 'GET', page.header['X-Request-Method']
   end
 
-  #def test_download
-  #  Dir.mktmpdir do |dir|
-  #    file = "#{dir}/download"
-  #    open file, 'w' do |io|
-  #      @mech.download 'http://example', io
-  #    end
+  def test_download
+    page = nil
+
+    in_tmpdir do
+      open 'download', 'w' do |io|
+        page = @mech.download 'http://example', io
+
+        refute io.closed?
+      end
+
+      assert_operator 1, :<=, File.stat('download').size
+    end
+
+    assert_empty @mech.history
+    assert_kind_of Mechanize::Page, page
+  end
+
+  def test_download_filename
+    page = nil
 
-  #    assert_equal 1, File.stat(file).size
-  #  end
-  #end
+    in_tmpdir do
+      page = @mech.download 'http://example', 'download'
+
+      assert_operator 1, :<=, File.stat('download').size
+    end
+
+    assert_empty @mech.history
+    assert_kind_of Mechanize::Page, page
+  end
+
+  def test_download_filename_error
+    in_tmpdir do
+      assert_raises Mechanize::UnauthorizedError do
+        @mech.download 'http://example/digest_auth', 'download'
+      end
+
+      refute File.exist? 'download'
+    end
+  end
 
   def test_get
     uri = URI 'http://localhost'
@@ -957,7 +986,7 @@ but not <a href="/" rel="me nofollow">this</a>!
     assert_equal 'user',      @mech.proxy_user
     assert_equal 'pass',      @mech.proxy_pass
 
-    refute_same http, @mech.agent.http
+    assert_equal URI('http://user:pass@localhost:8080'), http.proxy_uri
   end
 
   def test_submit_bad_form_method

data/test/test_mechanize_directory_saver.rb

@@ -0,0 +1,49 @@
+require 'mechanize/test_case'
+
+class TestMechanizeDirectorySaver < Mechanize::TestCase
+
+  def setup
+    super
+
+    @uri = URI 'http://example/relative/tc_relative_links.html'
+    @io = StringIO.new 'hello world'
+  end
+
+  def test_self_save_to
+    in_tmpdir do
+      saver = Mechanize::DirectorySaver.save_to 'dir'
+
+      saver.new @uri, nil, @io, 200
+
+      assert File.exist? 'dir/tc_relative_links.html'
+      refute File.exist? 'dir/relative'
+    end
+  end
+
+  def test_self_save_to_cd
+    in_tmpdir do
+      saver = Mechanize::DirectorySaver.save_to 'dir'
+
+      FileUtils.mkdir 'other'
+
+      Dir.chdir 'other' do
+        saver.new @uri, nil, @io, 200
+      end
+
+      assert File.exist? 'dir/tc_relative_links.html'
+      refute File.exist? 'dir/relative'
+    end
+  end
+
+  def test_initialize_no_save_dir
+    in_tmpdir do
+      e = assert_raises Mechanize::Error do
+        Mechanize::DirectorySaver.new @uri, nil, @io, 200
+      end
+
+      assert_match %r%no save directory specified%, e.message
+    end
+  end
+
+end
+

data/test/test_mechanize_file_request.rb

@@ -2,17 +2,23 @@ require 'mechanize/test_case'
 
 class TestMechanizeFileRequest < Mechanize::TestCase
 
-  def test_initialize
-    uri = URI.parse 'http://example/'
+  def setup
+    @uri = URI.parse 'file:///nonexistent'
 
-    r = Mechanize::FileRequest.new uri
+    @r = Mechanize::FileRequest.new @uri
+  end
 
-    assert_equal uri, r.uri
-    assert_equal '/', r.path
+  def test_initialize
+    assert_equal @uri, @r.uri
+    assert_equal '/nonexistent', @r.path
+
+    assert_respond_to @r, :[]=
+    assert_respond_to @r, :add_field
+    assert_respond_to @r, :each_header
+  end
 
-    assert_respond_to r, :[]=
-    assert_respond_to r, :add_field
-    assert_respond_to r, :each_header
+  def test_response_body_permitted_eh
+    assert @r.response_body_permitted?
   end
 
 end

data/test/test_mechanize_http_agent.rb

@@ -31,6 +31,25 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     realm
   end
 
+  def test_certificate_equals
+    cert_path = File.expand_path '../data/server.crt', __FILE__
+    cert = OpenSSL::X509::Certificate.new File.read cert_path
+
+    @agent.certificate = cert
+
+    assert_equal cert.to_pem, @agent.certificate.to_pem
+  end
+
+  def test_certificate_equals_file
+    cert_path = File.expand_path '../data/server.crt', __FILE__
+
+    cert = OpenSSL::X509::Certificate.new File.read cert_path
+
+    @agent.certificate = cert_path
+
+    assert_equal cert.to_pem, @agent.certificate.to_pem
+  end
+
   def test_connection_for_file
     uri = URI.parse 'file:///nonexistent'
     conn = @agent.connection_for uri
@@ -72,20 +91,18 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'identity', @req['accept-encoding']
   end
 
-  def test_fetch_hooks
-    @agent.pre_connect_hooks << proc do |agent, request|
-      assert_equal '/index.html', request.path
-      assert_equal @agent, agent
-    end
+  def test_fetch_file_nonexistent
+    in_tmpdir do
+      nonexistent = File.join Dir.pwd, 'nonexistent'
 
-    @agent.post_connect_hooks << proc do |agent, uri, response, body|
-      assert_equal @agent, agent
-      assert_equal URI('http://example/index.html'), uri
-      assert_equal '200', response.code
-      assert_kind_of String, body
-    end
+      uri = URI.parse "file://#{nonexistent}"
 
-    @agent.fetch URI 'http://example/index.html'
+      e = assert_raises Mechanize::ResponseCodeError do
+        @agent.fetch uri
+      end
+
+      assert_equal '404 => Net::HTTPNotFound', e.message
+    end
   end
 
   def test_fetch_file_plus
@@ -114,18 +131,28 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_kind_of Mechanize::Page, page
   end
 
-  def test_fetch_file_nonexistent
-    in_tmpdir do
-      nonexistent = File.join Dir.pwd, 'nonexistent'
+  def test_fetch_head_gzip
+    uri = @uri + '/gzip?file=index.html'
 
-      uri = URI.parse "file://#{nonexistent}"
+    page = @agent.fetch uri, :head
 
-      e = assert_raises Mechanize::ResponseCodeError do
-        @agent.fetch uri
-      end
+    assert_kind_of Mechanize::Page, page
+  end
 
-      assert_equal '404 => Net::HTTPNotFound', e.message
+  def test_fetch_hooks
+    @agent.pre_connect_hooks << proc do |agent, request|
+      assert_equal '/index.html', request.path
+      assert_equal @agent, agent
+    end
+
+    @agent.post_connect_hooks << proc do |agent, uri, response, body|
+      assert_equal @agent, agent
+      assert_equal URI('http://example/index.html'), uri
+      assert_equal '200', response.code
+      assert_kind_of String, body
     end
+
+    @agent.fetch URI 'http://example/index.html'
   end
 
   def test_fetch_post_connect_hook
@@ -145,6 +172,88 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal '500', e.response_code
   end
 
+  def test_get_meta_refresh_header_follow_self
+    @agent.follow_meta_refresh = true
+    @agent.follow_meta_refresh_self = true
+
+    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, '',
+                               200, @mech)
+    @res.instance_variable_set :@header, 'refresh' => ['0']
+
+    refresh = @agent.get_meta_refresh @res, @uri, page
+
+    assert_equal [0.0, URI('http://example/')], refresh
+  end
+
+  def test_get_meta_refresh_header_no_follow
+    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, '',
+                               200, @mech)
+    @res.instance_variable_set :@header, 'refresh' => ['0']
+
+    refresh = @agent.get_meta_refresh @res, @uri, page
+
+    assert_nil refresh
+  end
+
+  def test_get_meta_refresh_header_no_follow_self
+    @agent.follow_meta_refresh = true
+
+    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, '',
+                               200, @mech)
+    @res.instance_variable_set :@header, 'refresh' => ['0']
+
+    refresh = @agent.get_meta_refresh @res, @uri, page
+
+    assert_nil refresh
+  end
+
+  def test_get_meta_refresh_meta_follow_self
+    @agent.follow_meta_refresh = true
+    @agent.follow_meta_refresh_self = true
+
+    body = <<-BODY
+<title></title>
+<meta http-equiv="refresh" content="0">
+    BODY
+
+    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, body,
+                               200, @mech)
+
+    refresh = @agent.get_meta_refresh @res, @uri, page
+
+    assert_equal [0, nil], refresh
+  end
+
+  def test_get_meta_refresh_meta_no_follow
+    body = <<-BODY
+<title></title>
+<meta http-equiv="refresh" content="0">
+    BODY
+
+    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, body,
+                               200, @mech)
+
+    refresh = @agent.get_meta_refresh @res, @uri, page
+
+    assert_nil refresh
+  end
+
+  def test_get_meta_refresh_meta_no_follow_self
+    @agent.follow_meta_refresh = true
+
+    body = <<-BODY
+<title></title>
+<meta http-equiv="refresh" content="0">
+    BODY
+
+    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, body,
+                               200, @mech)
+
+    refresh = @agent.get_meta_refresh @res, @uri, page
+
+    assert_nil refresh
+  end
+
   def test_get_robots
     robotstxt = @agent.get_robots 'http://localhost/robots.txt'
     refute_equal '', robotstxt
@@ -153,6 +262,17 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal '', robotstxt
   end
 
+  def test_hook_content_encoding_response
+    @mech.content_encoding_hooks << lambda{|agent, uri, response, response_body_io|
+      response['content-encoding'] = 'gzip' if response['content-encoding'] == 'agzip'}
+
+    @res.instance_variable_set :@header, 'content-encoding' => %w[agzip]
+    body_io = StringIO.new 'part'
+    @agent.hook_content_encoding @res, @uri, body_io
+
+    assert_equal 'gzip', @res['content-encoding']
+  end
+
   def test_http_request_file
     uri = URI.parse 'file:///nonexistent'
     request = @agent.http_request uri, :get
@@ -176,7 +296,6 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
   end
 
   def test_idle_timeout_equals
-    @agent.set_http
     @agent.idle_timeout = 1
 
     assert_equal 1, @agent.http.idle_timeout
@@ -211,69 +330,6 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     end
   end
 
-  def test_request_cookies
-    uri = URI.parse 'http://host.example.com'
-    Mechanize::Cookie.parse uri, 'hello=world domain=.example.com' do |cookie|
-      @agent.cookie_jar.add uri, cookie
-    end
-
-    @agent.request_cookies @req, uri
-
-    assert_equal 'hello=world domain=.example.com', @req['Cookie']
-  end
-
-  def test_request_cookies_none
-    @agent.request_cookies @req, @uri
-
-    assert_nil @req['Cookie']
-  end
-
-  def test_request_cookies_many
-    uri = URI.parse 'http://host.example.com'
-    cookie_str = 'a=b domain=.example.com, c=d domain=.example.com'
-    Mechanize::Cookie.parse uri, cookie_str do |cookie|
-      @agent.cookie_jar.add uri, cookie
-    end
-
-    @agent.request_cookies @req, uri
-
-    expected = cookie_str.sub ', ', '; '
-
-    assert_equal expected, @req['Cookie']
-  end
-
-  def test_request_cookies_wrong_domain
-    uri = URI.parse 'http://host.example.com'
-    Mechanize::Cookie.parse uri, 'hello=world domain=.example.com' do |cookie|
-      @agent.cookie_jar.add uri, cookie
-    end
-
-    @agent.request_cookies @req, @uri
-
-    assert_nil @req['Cookie']
-  end
-
-  def test_request_host
-    @agent.request_host @req, @uri
-
-    assert_equal 'example', @req['host']
-  end
-
-  def test_request_host_nonstandard
-    @uri.port = 81
-
-    @agent.request_host @req, @uri
-
-    assert_equal 'example:81', @req['host']
-  end
-
-  def test_request_language_charset
-    @agent.request_language_charset @req
-
-    assert_equal 'en-us,en;q=0.5', @req['accept-language']
-    assert_equal 'ISO-8859-1,utf-8;q=0.7,*;q=0.7', @req['accept-charset']
-  end
-
   def test_request_add_headers
     @agent.request_add_headers @req, 'Content-Length' => 300
 
@@ -314,12 +370,6 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'unknown header symbol content_length', e.message
   end
 
-  def test_request_auth_none
-    @agent.request_auth @req, @uri
-
-    assert_nil @req['Authorization']
-  end
-
   def test_request_auth_basic
     @agent.user = 'user'
     @agent.password = 'password'
@@ -357,38 +407,107 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_match %r%qop=auth%, @req['Authorization']
   end
 
-  def test_request_referer
-    referer = URI.parse 'http://old.example'
-
-    @agent.request_referer @req, @uri, referer
+  def test_request_auth_none
+    @agent.request_auth @req, @uri
 
-    assert_equal 'http://old.example', @req['referer']
+    assert_nil @req['Authorization']
   end
 
-  def test_request_referer_https
-    uri = URI.parse 'https://example'
-    referer = URI.parse 'https://old.example'
+  def test_request_cookies
+    uri = URI.parse 'http://host.example.com'
+    Mechanize::Cookie.parse uri, 'hello=world domain=.example.com' do |cookie|
+      @agent.cookie_jar.add uri, cookie
+    end
 
-    @agent.request_referer @req, uri, referer
+    @agent.request_cookies @req, uri
 
-    assert_equal 'https://old.example', @req['referer']
+    assert_equal 'hello=world domain=.example.com', @req['Cookie']
   end
 
-  def test_request_referer_https_downgrade
-    referer = URI.parse 'https://old.example'
-
-    @agent.request_referer @req, @uri, referer
-
-    assert_nil @req['referer']
-  end
+  def test_request_cookies_many
+    uri = URI.parse 'http://host.example.com'
+    cookie_str = 'a=b domain=.example.com, c=d domain=.example.com'
+    Mechanize::Cookie.parse uri, cookie_str do |cookie|
+      @agent.cookie_jar.add uri, cookie
+    end
 
-  def test_request_referer_https_downgrade_case
-    uri = URI.parse 'http://example'
-    referer = URI.parse 'httpS://old.example'
+    @agent.request_cookies @req, uri
 
-    @agent.request_referer @req, uri, referer
+    expected = cookie_str.sub ', ', '; '
 
-    assert_nil @req['referer']
+    assert_equal expected, @req['Cookie']
+  end
+
+  def test_request_cookies_none
+    @agent.request_cookies @req, @uri
+
+    assert_nil @req['Cookie']
+  end
+
+  def test_request_cookies_wrong_domain
+    uri = URI.parse 'http://host.example.com'
+    Mechanize::Cookie.parse uri, 'hello=world domain=.example.com' do |cookie|
+      @agent.cookie_jar.add uri, cookie
+    end
+
+    @agent.request_cookies @req, @uri
+
+    assert_nil @req['Cookie']
+  end
+
+  def test_request_host
+    @agent.request_host @req, @uri
+
+    assert_equal 'example', @req['host']
+  end
+
+  def test_request_host_nonstandard
+    @uri.port = 81
+
+    @agent.request_host @req, @uri
+
+    assert_equal 'example:81', @req['host']
+  end
+
+  def test_request_language_charset
+    @agent.request_language_charset @req
+
+    assert_equal 'en-us,en;q=0.5', @req['accept-language']
+    assert_equal 'ISO-8859-1,utf-8;q=0.7,*;q=0.7', @req['accept-charset']
+  end
+
+  def test_request_referer
+    referer = URI.parse 'http://old.example'
+
+    @agent.request_referer @req, @uri, referer
+
+    assert_equal 'http://old.example', @req['referer']
+  end
+
+  def test_request_referer_https
+    uri = URI.parse 'https://example'
+    referer = URI.parse 'https://old.example'
+
+    @agent.request_referer @req, uri, referer
+
+    assert_equal 'https://old.example', @req['referer']
+  end
+
+  def test_request_referer_https_downgrade
+    referer = URI.parse 'https://old.example'
+
+    @agent.request_referer @req, @uri, referer
+
+    assert_nil @req['referer']
+  end
+
+  def test_request_referer_https_downgrade_case
+    uri = URI.parse 'http://example'
+    referer = URI.parse 'httpS://old.example'
+
+    @agent.request_referer @req, uri, referer
+
+    assert_nil @req['referer']
   end
 
   def test_request_referer_https_upgrade
@@ -761,16 +880,6 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     body_io.close! unless body_io.closed?
   end
 
-  def test_response_content_encoding_x_gzip
-    @res.instance_variable_set :@header, 'content-encoding' => %w[x-gzip]
-    body_io = StringIO.new \
-      "\037\213\b\0002\002\225M\000\003+H,*\001\000\306p\017I\004\000\000\000"
-
-    body = @agent.response_content_encoding @res, body_io
-
-    assert_equal 'part', body.read
-  end
-
   def test_response_content_encoding_unknown
     @res.instance_variable_set :@header, 'content-encoding' => %w[unknown]
     body = StringIO.new 'part'
@@ -782,97 +891,14 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'unsupported content-encoding: unknown', e.message
   end
 
-  def test_get_meta_refresh_header_follow_self
-    @agent.follow_meta_refresh = true
-    @agent.follow_meta_refresh_self = true
-
-    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, '',
-                               200, @mech)
-    @res.instance_variable_set :@header, 'refresh' => ['0']
-
-    refresh = @agent.get_meta_refresh @res, @uri, page
-
-    assert_equal [0.0, URI('http://example/')], refresh
-  end
-
-  def test_get_meta_refresh_header_no_follow
-    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, '',
-                               200, @mech)
-    @res.instance_variable_set :@header, 'refresh' => ['0']
-
-    refresh = @agent.get_meta_refresh @res, @uri, page
-
-    assert_nil refresh
-  end
-
-  def test_get_meta_refresh_header_no_follow_self
-    @agent.follow_meta_refresh = true
-
-    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, '',
-                               200, @mech)
-    @res.instance_variable_set :@header, 'refresh' => ['0']
-
-    refresh = @agent.get_meta_refresh @res, @uri, page
-
-    assert_nil refresh
-  end
-
-  def test_get_meta_refresh_meta_follow_self
-    @agent.follow_meta_refresh = true
-    @agent.follow_meta_refresh_self = true
-
-    body = <<-BODY
-<title></title>
-<meta http-equiv="refresh" content="0">
-    BODY
-
-    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, body,
-                               200, @mech)
-
-    refresh = @agent.get_meta_refresh @res, @uri, page
-
-    assert_equal [0, 'http://example/'], refresh
-  end
-
-  def test_get_meta_refresh_meta_no_follow
-    body = <<-BODY
-<title></title>
-<meta http-equiv="refresh" content="0">
-    BODY
-
-    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, body,
-                               200, @mech)
-
-    refresh = @agent.get_meta_refresh @res, @uri, page
-
-    assert_nil refresh
-  end
-
-  def test_get_meta_refresh_meta_no_follow_self
-    @agent.follow_meta_refresh = true
-
-    body = <<-BODY
-<title></title>
-<meta http-equiv="refresh" content="0">
-    BODY
-
-    page = Mechanize::Page.new(@uri, {'content-type' => 'text/html'}, body,
-                               200, @mech)
-
-    refresh = @agent.get_meta_refresh @res, @uri, page
-
-    assert_nil refresh
-  end
-
-  def test_hook_content_encoding_response
-    @mech.content_encoding_hooks << lambda{|agent, uri, response, response_body_io|
-      response['content-encoding'] = 'gzip' if response['content-encoding'] == 'agzip'}
+  def test_response_content_encoding_x_gzip
+    @res.instance_variable_set :@header, 'content-encoding' => %w[x-gzip]
+    body_io = StringIO.new \
+      "\037\213\b\0002\002\225M\000\003+H,*\001\000\306p\017I\004\000\000\000"
 
-    @res.instance_variable_set :@header, 'content-encoding' => %w[agzip]
-    body_io = StringIO.new 'part'
-    @agent.hook_content_encoding @res, @uri, body_io
+    body = @agent.response_content_encoding @res, body_io
 
-    assert_equal 'gzip', @res['content-encoding']
+    assert_equal 'part', body.read
   end
 
   def test_response_cookies
@@ -963,38 +989,102 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     end
   end
 
-  def test_response_read
-    def @res.read_body() yield 'part' end
-    def @res.content_length() 4 end
+  def test_response_parse
+    body = '<title>hi</title>'
+    @res.instance_variable_set :@header, 'content-type' => %w[text/html]
 
-    io = @agent.response_read @res, @req, @uri
+    page = @agent.response_parse @res, body, @uri
 
-    body = io.read
+    assert_instance_of Mechanize::Page, page
+    assert_equal @mech, page.mech
+  end
 
-    assert_equal 'part', body
-    assert_equal Encoding::BINARY, body.encoding if body.respond_to? :encoding
+  def test_response_parse_content_type_case
+    body = '<title>hi</title>'
+    @res.instance_variable_set(:@header, 'content-type' => %w[text/HTML])
+
+    page = @agent.response_parse @res, body, @uri
+
+    assert_instance_of Mechanize::Page, page
+
+    assert_equal 'text/HTML', page.content_type
   end
 
-  def test_response_read_large
-    def @res.read_body() yield 'a' * 10241 end
-    def @res.content_length() 10241 end
+  def test_response_parse_content_type_encoding
+    body = '<title>hi</title>'
+    @res.instance_variable_set(:@header,
+                               'content-type' =>
+                                 %w[text/html;charset=ISO-8859-1])
 
-    io = @agent.response_read @res, @req, @uri
+    page = @agent.response_parse @res, body, @uri
 
-    assert_kind_of Tempfile, io
-    assert_equal 10241, io.stat.size
+    assert_instance_of Mechanize::Page, page
+    assert_equal @mech, page.mech
+
+    assert_equal 'ISO-8859-1', page.encoding
+    assert_equal 'ISO-8859-1', page.parser.encoding
   end
 
-  def test_response_read_large_chunked
-    def @res.read_body
-      11.times do yield 'a' * 1024 end
-    end
-    def @res.content_length() end
+  def test_response_parse_content_type_encoding_broken_iso_8859_1
+    body = '<title>hi</title>'
+    @res.instance_variable_set(:@header,
+                               'content-type' =>
+                                 %w[text/html; charset=ISO_8859-1])
+
+    page = @agent.response_parse @res, body, @uri
+
+    assert_instance_of Mechanize::Page, page
+    assert_equal 'ISO_8859-1', page.encoding
+  end
+
+  def test_response_parse_content_type_encoding_broken_utf_8
+    body = '<title>hi</title>'
+    @res.instance_variable_set(:@header,
+                               'content-type' =>
+                                 %w[text/html; charset=UTF8])
+
+    page = @agent.response_parse @res, body, @uri
+
+    assert_instance_of Mechanize::Page, page
+    assert_equal 'UTF8', page.encoding
+    assert_equal 'UTF8', page.parser.encoding
+  end
+
+  def test_response_parse_content_type_encoding_garbage
+    body = '<title>hi</title>'
+    @res.instance_variable_set(:@header,
+                               'content-type' =>
+                                 %w[text/html; charset=garbage_charset])
+
+    page = @agent.response_parse @res, body, @uri
+
+    assert_instance_of Mechanize::Page, page
+    assert_equal @mech, page.mech
+  end
+
+  def test_response_parse_content_type_encoding_semicolon
+    body = '<title>hi</title>'
+    @res.instance_variable_set(:@header,
+                               'content-type' =>
+                                 %w[text/html;charset=UTF-8;])
+
+    page = @agent.response_parse @res, body, @uri
+
+    assert_instance_of Mechanize::Page, page
+
+    assert_equal 'UTF-8', page.encoding
+  end
+
+  def test_response_read
+    def @res.read_body() yield 'part' end
+    def @res.content_length() 4 end
 
     io = @agent.response_read @res, @req, @uri
 
-    assert_kind_of Tempfile, io
-    assert_equal 11264, io.stat.size
+    body = io.read
+
+    assert_equal 'part', body
+    assert_equal Encoding::BINARY, body.encoding if body.respond_to? :encoding
   end
 
   def test_response_read_content_length_head
@@ -1068,6 +1158,28 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     end
   end
 
+  def test_response_read_large
+    def @res.read_body() yield 'a' * 10241 end
+    def @res.content_length() 10241 end
+
+    io = @agent.response_read @res, @req, @uri
+
+    assert_kind_of Tempfile, io
+    assert_equal 10241, io.stat.size
+  end
+
+  def test_response_read_large_chunked
+    def @res.read_body
+      11.times do yield 'a' * 1024 end
+    end
+    def @res.content_length() end
+
+    io = @agent.response_read @res, @req, @uri
+
+    assert_kind_of Tempfile, io
+    assert_equal 11264, io.stat.size
+  end
+
   def test_response_read_no_body
     req = Net::HTTP::Options.new '/'
 
@@ -1105,6 +1217,19 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'http://example/referer', requests.first['Referer']
   end
 
+  def test_response_redirect_malformed
+    @agent.redirect_ok = true
+    referer = page 'http://example/referer'
+
+    page = fake_page
+    page = @agent.response_redirect({ 'Location' => '/index.html?q=あ' }, :get,
+                                    page, 0, referer)
+
+    assert_equal URI('http://fake.example/index.html?q=%E3%81%82'), page.uri
+
+    assert_equal 'http://example/referer', requests.first['Referer']
+  end
+
   def test_response_redirect_limit
     @agent.redirect_ok = true
     referer = page 'http://example/referer'
@@ -1149,90 +1274,12 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal URI('http://fake.example/'), page.uri
   end
 
-  def test_response_parse
-    body = '<title>hi</title>'
-    @res.instance_variable_set :@header, 'content-type' => %w[text/html]
-
-    page = @agent.response_parse @res, body, @uri
-
-    assert_instance_of Mechanize::Page, page
-    assert_equal @mech, page.mech
-  end
-
-  def test_response_parse_content_type_case
-    body = '<title>hi</title>'
-    @res.instance_variable_set(:@header, 'content-type' => %w[text/HTML])
-
-    page = @agent.response_parse @res, body, @uri
-
-    assert_instance_of Mechanize::Page, page
-
-    assert_equal 'text/HTML', page.content_type
-  end
-
-  def test_response_parse_content_type_encoding
-    body = '<title>hi</title>'
-    @res.instance_variable_set(:@header,
-                               'content-type' =>
-                                 %w[text/html;charset=ISO-8859-1])
-
-    page = @agent.response_parse @res, body, @uri
-
-    assert_instance_of Mechanize::Page, page
-    assert_equal @mech, page.mech
-
-    assert_equal 'ISO-8859-1', page.encoding
-    assert_equal 'ISO-8859-1', page.parser.encoding
-  end
-
-  def test_response_parse_content_type_encoding_garbage
-    body = '<title>hi</title>'
-    @res.instance_variable_set(:@header,
-                               'content-type' =>
-                                 %w[text/html; charset=garbage_charset])
-
-    page = @agent.response_parse @res, body, @uri
-
-    assert_instance_of Mechanize::Page, page
-    assert_equal @mech, page.mech
-  end
-
-  def test_response_parse_content_type_encoding_broken_iso_8859_1
-    body = '<title>hi</title>'
-    @res.instance_variable_set(:@header,
-                               'content-type' =>
-                                 %w[text/html; charset=ISO_8859-1])
-
-    page = @agent.response_parse @res, body, @uri
-
-    assert_instance_of Mechanize::Page, page
-    assert_equal 'ISO_8859-1', page.encoding
-  end
-
-  def test_response_parse_content_type_encoding_broken_utf_8
-    body = '<title>hi</title>'
-    @res.instance_variable_set(:@header,
-                               'content-type' =>
-                                 %w[text/html; charset=UTF8])
-
-    page = @agent.response_parse @res, body, @uri
-
-    assert_instance_of Mechanize::Page, page
-    assert_equal 'UTF8', page.encoding
-    assert_equal 'UTF8', page.parser.encoding
-  end
-
-  def test_response_parse_content_type_encoding_semicolon
-    body = '<title>hi</title>'
-    @res.instance_variable_set(:@header,
-                               'content-type' =>
-                                 %w[text/html;charset=UTF-8;])
-
-    page = @agent.response_parse @res, body, @uri
+  def test_retry_change_request_equals
+    refute @agent.http.retry_change_requests
 
-    assert_instance_of Mechanize::Page, page
+    @agent.retry_change_requests = true
 
-    assert_equal 'UTF-8', page.encoding
+    assert @agent.http.retry_change_requests
   end
 
   def test_robots_allowed_eh
@@ -1258,63 +1305,6 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     end
   end
 
-  def test_set_http
-    @agent.set_http
-
-    assert_equal 'mechanize', @agent.http.name
-    refute @agent.http.retry_change_requests
-  end
-
-  def test_set_http_idle_timeout
-    @agent.idle_timeout = 1
-    @agent.set_http
-
-    assert_equal 'mechanize', @agent.http.name
-    assert_equal 1, @agent.http.idle_timeout
-  end
-
-  def test_set_http_ssl
-    in_tmpdir do
-      store = OpenSSL::X509::Store.new
-      @agent.cert = ssl_certificate
-      @agent.key  = ssl_private_key
-      @agent.cert_store = store
-      @agent.ca_file = '.'
-      @agent.verify_callback = proc { |ok, context| }
-
-      @agent.set_http
-
-      http = @agent.http
-
-      assert_equal ssl_certificate,           http.certificate
-      assert_equal ssl_private_key,           http.private_key
-      assert_equal store,                     http.cert_store
-      assert_equal '.',                       http.ca_file
-      assert_equal OpenSSL::SSL::VERIFY_PEER, http.verify_mode
-      assert http.verify_callback
-    end
-  end
-
-  def test_set_http_ssl_verify_none
-    in_tmpdir do
-      @agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      @agent.set_http
-
-      http = @agent.http
-
-      assert_equal OpenSSL::SSL::VERIFY_NONE, http.verify_mode
-    end
-  end
-
-  def test_set_http_retry_change_request
-    @agent.retry_change_requests = true
-    @agent.set_http
-
-    assert_equal 'mechanize', @agent.http.name
-    assert @agent.http.retry_change_requests
-  end
-
   def test_set_proxy
     @agent.set_proxy 'www.example.com', 9001, 'joe', 'lol'
 
@@ -1350,5 +1340,36 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'invalid value for port: "nonexistent service"', e.message
   end
 
+  def test_ssl
+    in_tmpdir do
+      store = OpenSSL::X509::Store.new
+      @agent.ca_file = '.'
+      @agent.cert_store = store
+      @agent.certificate = ssl_certificate
+      @agent.private_key = ssl_private_key
+      @agent.ssl_version = 'SSLv3' if RUBY_VERSION > '1.9'
+      @agent.verify_callback = proc { |ok, context| }
+
+      http = @agent.http
+
+      assert_equal '.',                       http.ca_file
+      assert_equal store,                     http.cert_store
+      assert_equal ssl_certificate,           http.certificate
+      assert_equal ssl_private_key,           http.private_key
+      assert_equal 'SSLv3',                   http.ssl_version if
+        RUBY_VERSION > '1.9'
+      assert_equal OpenSSL::SSL::VERIFY_PEER, http.verify_mode
+      assert http.verify_callback
+    end
+  end
+
+  def test_verify_none_equals
+    @agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+    http = @agent.http
+
+    assert_equal OpenSSL::SSL::VERIFY_NONE, http.verify_mode
+  end
+
 end