mechanize 0.7.8 → 0.8.0

data/test/chain/test_argument_validator.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+
+class TestURIResolver < Test::Unit::TestCase
+  def test_handle
+    v = WWW::Mechanize::Chain.new([
+      WWW::Mechanize::Chain::URIResolver.new(Hash.new { |h,k|
+        h[k] = lambda { |u,r| u }
+      })
+    ])
+    assert_raises(ArgumentError) { v.handle({}) }
+    assert_nothing_raised { v.handle({:uri => 'http://google.com/'}) }
+    assert_raises(RuntimeError) { v.handle({:uri => 'google'}) }
+  end
+end

data/test/chain/test_custom_headers.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+
+class TestCustomHeaders < Test::Unit::TestCase
+  def test_handle
+    v = WWW::Mechanize::Chain.new([
+      WWW::Mechanize::Chain::CustomHeaders.new
+    ])
+    url = URI.parse('http://tenderlovemaking.com/')
+    hash = {
+      :request => Net::HTTP::Get.new(url.request_uri),
+      :headers => { 'Content-Length' => 300 }
+    }
+    v.handle(hash)
+    headers = hash[:request].to_hash
+    assert(headers.key?('content-length'))
+    assert_equal([300], headers['content-length'])
+  end
+end

data/test/chain/test_parameter_resolver.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+
+class TestParameterResolver < Test::Unit::TestCase
+  def test_handle_get
+    v = WWW::Mechanize::Chain.new([
+      WWW::Mechanize::Chain::ParameterResolver.new
+    ])
+    hash = {
+      :uri    => URI.parse('http://google.com/'),
+      :params => { :q => 'hello' },
+      :verb   => :get
+    }
+    assert_nothing_raised {
+      v.handle(hash)
+    }
+    assert_equal('q=hello', hash[:uri].query)
+    assert_equal([], hash[:params])
+  end
+
+  def test_handle_post
+    v = WWW::Mechanize::Chain.new([
+      WWW::Mechanize::Chain::ParameterResolver.new
+    ])
+    hash = {
+      :uri    => URI.parse('http://google.com/'),
+      :params => { :q => 'hello' },
+      :verb   => :post
+    }
+    assert_nothing_raised {
+      v.handle(hash)
+    }
+    assert_equal('', hash[:uri].query.to_s)
+    assert_equal({ :q => 'hello' }, hash[:params])
+  end
+end

data/test/chain/test_request_resolver.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+
+class TestRequestResolver < Test::Unit::TestCase
+  def test_handle_get
+    v = WWW::Mechanize::Chain.new([
+      WWW::Mechanize::Chain::RequestResolver.new
+    ])
+    hash = {
+      :uri  => URI.parse('http://google.com'),
+      :verb => :get
+    }
+    assert_nothing_raised { v.handle(hash) }
+    assert_kind_of(Net::HTTP::Get, hash[:request])
+    assert_equal('/', hash[:request].path)
+  end
+
+  def test_handle_post
+    v = WWW::Mechanize::Chain.new([
+      WWW::Mechanize::Chain::RequestResolver.new
+    ])
+    hash = {
+      :uri  => URI.parse('http://google.com'),
+      :verb => :post
+    }
+    assert_nothing_raised { v.handle(hash) }
+    assert_kind_of(Net::HTTP::Post, hash[:request])
+    assert_equal('/', hash[:request].path)
+  end
+end

data/test/chain/test_response_reader.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+
+class TestResponseReader < Test::Unit::TestCase
+  def test_handle_bad_response_code
+    response = Object.new
+    class << response
+      def read_body
+      end
+      def code; 999; end
+    end
+
+    v = WWW::Mechanize::Chain.new([
+      WWW::Mechanize::Chain::ResponseReader.new(response)
+    ])
+    assert_raises(WWW::Mechanize::ResponseCodeError) {
+      begin
+        v.handle({})
+      rescue Exception => x
+        assert_equal(999, x.response_code)
+        raise x
+      end
+    }
+  end
+end

data/test/helper.rb

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'rubygems'
 require 'mechanize'
 require 'webrick/httputils'
-require 'servlets'
+require File.join(File.dirname(__FILE__),'servlets')
 
 BASE_DIR = File.dirname(__FILE__)
 
@@ -44,6 +44,8 @@ class Net::HTTP
     '/if_modified_since'      => ModifiedSinceServlet,
     '/http_headers'           => HeaderServlet,
     '/infinite_redirect'      => InfiniteRedirectTest,
+    '/digest_auth'            => DigestAuthServlet,
+    '/verb'                   => VerbServlet,
   }
 
   PAGE_CACHE = {}

data/test/servlets.rb

@@ -5,6 +5,18 @@ require 'zlib'
 require 'stringio'
 require 'base64'
 
+class VerbServlet < WEBrick::HTTPServlet::AbstractServlet
+  def do_HEAD(req, res)
+    res.body = "method: HEAD"
+  end
+
+  def method_missing(method, *args, &block)
+    super unless method.to_s =~ /^do_([A-Z]*)$/
+    res = args[1]
+    res.body = "method: #{$1}"
+  end
+end
+
 class BasicAuthServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req,res)
     htpd = WEBrick::HTTPAuth::Htpasswd.new('dot.htpasswd')
@@ -26,9 +38,40 @@ class BasicAuthServlet < WEBrick::HTTPServlet::AbstractServlet
   alias :do_POST :do_GET
 end
 
+class DigestAuthServlet < WEBrick::HTTPServlet::AbstractServlet
+  htpd = WEBrick::HTTPAuth::Htdigest.new('digest.htpasswd')
+  htpd.set_passwd('Blah', 'user', 'pass')
+  @@authenticator = WEBrick::HTTPAuth::DigestAuth.new({
+                                                   :UserDB => htpd,
+                                                   :Realm  => 'Blah',
+                                                   :Algorithm => 'MD5',
+                                                   :Logger => Logger.new(nil)
+  }
+  )
+  def do_GET(req,res)
+    def req.request_time; Time.now; end
+    def req.request_uri; '/digest_auth'; end
+    def req.request_method; "GET"; end
+
+    begin
+      @@authenticator.authenticate(req,res)
+      res.body = 'You are authenticated'
+    rescue WEBrick::HTTPStatus::Unauthorized => ex
+      res.status = 401
+    end
+    FileUtils.rm('digest.htpasswd') if File.exists?('digest.htpasswd')
+  end
+  alias :do_POST :do_GET
+end
+
 class HeaderServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res['Content-Type'] = "text/html"
+
+    req.query.each do |x,y|
+      res[x] = y
+    end
+
     body = ''
     req.each_header do |k,v|
       body << "#{k}|#{v}\n"

data/test/test_authenticate.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class BasicAuthTest < Test::Unit::TestCase
   def setup
@@ -11,14 +11,21 @@ class BasicAuthTest < Test::Unit::TestCase
     assert_equal('You are authenticated', page.body)
   end
 
+  def test_digest_auth_success
+    @agent.basic_auth('user', 'pass')
+    page = @agent.get("http://localhost/digest_auth")
+    assert_equal('You are authenticated', page.body)
+  end
+
   def test_post_auth_success
     class << @agent
-      alias :old_fetch_request :fetch_request
+      alias :old_fetch_page :fetch_page
       attr_accessor :requests
-      def fetch_request(*args)
+      def fetch_page(args)
         @requests ||= []
-        @requests << old_fetch_request(*args)
-        @requests.last
+        x = old_fetch_page(args)
+        @requests << args[:verb]
+        x
       end
     end
     @agent.basic_auth('user', 'pass')
@@ -27,13 +34,7 @@ class BasicAuthTest < Test::Unit::TestCase
     assert_equal(2, @agent.requests.length)
     r1 = @agent.requests[0]
     r2 = @agent.requests[1]
-    assert r1['Content-Type']
-    assert r2['Content-Type']
-    assert_equal(r1['Content-Type'], r2['Content-Type'])
-
-    assert r1['Content-Length']
-    assert r2['Content-Length']
-    assert_equal(r1['Content-Length'], r2['Content-Length'])
+    assert_equal(r1, r2)
   end
 
   def test_auth_bad_user_pass

data/test/test_bad_links.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestBadLinks < Test::Unit::TestCase
   def setup

data/test/test_blank_form.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class BlankFormTest < Test::Unit::TestCase
   def setup

data/test/test_checkboxes.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestCheckBoxes < Test::Unit::TestCase
   def setup

data/test/test_content_type.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestContentType < Test::Unit::TestCase
   def setup

data/test/test_cookie_class.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 module Enumerable
   def combine

data/test/test_cookie_jar.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class CookieJarTest < Test::Unit::TestCase
   def cookie_from_hash(hash)

data/test/test_cookies.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class CookiesMechTest < Test::Unit::TestCase
   def setup

data/test/test_encoded_links.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestEncodedLinks < Test::Unit::TestCase
   def setup

data/test/test_errors.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class MechErrorsTest < Test::Unit::TestCase
   def setup

data/test/test_follow_meta.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class FollowMetaTest < Test::Unit::TestCase
   def setup

data/test/test_form_action.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestFormAction < Test::Unit::TestCase
   def setup

data/test/test_form_as_hash.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestFormHash < Test::Unit::TestCase
   def setup

data/test/test_form_button.rb

@@ -1,33 +1,38 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestFormButtons < Test::Unit::TestCase
   def setup
     @agent = WWW::Mechanize.new
   end
 
-  def test_submit_button
-    html = <<-END
-    <html><body>
-    <form><input type="submit" value="submit" /></form>
-    </body></html>
-    END
-    page = WWW::Mechanize::Page.new(  nil, html_response, html, 200, @agent )
-    assert_equal(1, page.forms.length)
-    assert_equal(1, page.forms.first.buttons.length)
+  def test_submit_input_tag
+    assert_form_contains_button('<input type="submit" value="submit" />')
+  end
+
+  def test_button_input_tag
+    assert_form_contains_button('<input type="button" value="submit" />')
+  end
+
+  def test_submit_button_tag
+    assert_form_contains_button('<button type="submit" value="submit"/>')
   end
 
-  def test_button_button
-    html = <<-END
-    <html><body>
-    <form><input type="button" value="submit" /></form>
-    </body></html>
-    END
-    page = WWW::Mechanize::Page.new(  nil, html_response, html, 200, @agent )
+  def test_button_button_tag
+    assert_form_contains_button('<button type="button" value="submit"/>')
+  end
+
+  def assert_form_contains_button(button)
+    page = WWW::Mechanize::Page.new(nil, html_response, html(button), 200, @agent)
     assert_equal(1, page.forms.length)
     assert_equal(1, page.forms.first.buttons.length)
   end
 
+  def html(input)
+    "<html><body><form>#{input}</form></body></html>"
+  end
+
   def html_response
     { 'content-type' => 'text/html' }
   end
 end
+

data/test/test_form_no_inputname.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class FormNoInputNameTest < Test::Unit::TestCase
   def setup

data/test/test_forms.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class FormsMechTest < Test::Unit::TestCase
   def setup
@@ -499,6 +499,7 @@ class FormsMechTest < Test::Unit::TestCase
 
     assert_not_nil(form)
     number_of_fields = form.fields.length
+    assert_equal 2, number_of_fields
 
     form.delete_field!('first')
     assert_nil(form['first'])

data/test/test_frames.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class FramesMechTest < Test::Unit::TestCase
   def setup

data/test/test_get_headers.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestGetHeaders < Test::Unit::TestCase
   def setup

data/test/test_gzipping.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestGzip < Test::Unit::TestCase
   def setup

data/test/test_hash_api.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestHashApi < Test::Unit::TestCase
   def setup
@@ -25,18 +25,21 @@ class TestHashApi < Test::Unit::TestCase
   end
 
   def test_get_with_referer
-    class << @agent
-      attr_reader :request
-      alias :old_set_headers :set_headers
-      def set_headers(u, request, cur_page)
-        old_set_headers(u, request, cur_page)
-        @request = request
-      end
-    end
-    @agent.get(:url => 'http://localhost/', :referer => URI.parse('http://google.com/'))
-    assert_equal 'http://google.com/', @agent.request['Referer']
-
-    @agent.get(:url => 'http://localhost/', :params => [], :referer => 'http://tenderlovemaking.com/')
-    assert_equal 'http://tenderlovemaking.com/', @agent.request['Referer']
+    request = nil
+    @agent.pre_connect_hooks << lambda { |params|
+      request = params[:request]
+    }
+
+    @agent.get( :url => 'http://localhost/',
+                :referer => URI.parse('http://google.com/')
+              )
+
+    assert request
+    assert_equal 'http://google.com/', request['Referer']
+
+    @agent.get( :url => 'http://localhost/',
+                :params => [],
+                :referer => 'http://tenderlovemaking.com/')
+    assert_equal 'http://tenderlovemaking.com/', request['Referer']
   end
 end