mechanize 2.7.4 → 2.8.1

data/test/test_mechanize_http_auth_challenge.rb

@@ -25,6 +25,14 @@ class TestMechanizeHttpAuthChallenge < Mechanize::TestCase
     assert_equal expected, @challenge.realm(@uri + '/foo')
   end
 
+  def test_realm_digest_case
+    challenge = @AC.new 'Digest', { 'realm' => 'R' }, 'Digest realm=R'
+
+    expected = @AR.new 'Digest', @uri, 'R'
+
+    assert_equal expected, challenge.realm(@uri + '/foo')
+  end
+
   def test_realm_unknown
     @challenge.scheme = 'Unknown'
 
@@ -39,6 +47,12 @@ class TestMechanizeHttpAuthChallenge < Mechanize::TestCase
     assert_equal 'r', @challenge.realm_name
   end
 
+  def test_realm_name_case
+    challenge = @AC.new 'Digest', { 'realm' => 'R' }, 'Digest realm=R'
+
+    assert_equal 'R', challenge.realm_name
+  end
+
   def test_realm_name_ntlm
     challenge = @AC.new 'Negotiate, NTLM'
 

data/test/test_mechanize_http_auth_realm.rb

@@ -14,7 +14,10 @@ class TestMechanizeHttpAuthRealm < Mechanize::TestCase
     assert_equal 'r', @realm.realm
 
     realm = @AR.new 'Digest', @uri, 'R'
-    assert_equal 'r', realm.realm
+    refute_equal 'r', realm.realm
+
+    realm = @AR.new 'Digest', @uri, 'R'
+    assert_equal 'R', realm.realm
 
     realm = @AR.new 'Digest', @uri, nil
     assert_nil realm.realm
@@ -30,6 +33,9 @@ class TestMechanizeHttpAuthRealm < Mechanize::TestCase
     other = @AR.new 'Digest', URI('http://other.example/'), 'r'
     refute_equal @realm, other
 
+    other = @AR.new 'Digest', @uri, 'R'
+    refute_equal @realm, other
+
     other = @AR.new 'Digest', @uri, 's'
     refute_equal @realm, other
   end

data/test/test_mechanize_http_auth_store.rb

@@ -57,6 +57,20 @@ class TestMechanizeHttpAuthStore < Mechanize::TestCase
     assert_equal expected, @store.auth_accounts
   end
 
+  def test_add_auth_realm_case
+    @store.add_auth @uri, 'user1', 'pass', 'realm'
+    @store.add_auth @uri, 'user2', 'pass', 'Realm'
+
+    expected = {
+      @uri => {
+        'realm' => ['user1', 'pass', nil],
+        'Realm' => ['user2', 'pass', nil],
+      }
+    }
+
+    assert_equal expected, @store.auth_accounts
+  end
+
   def test_add_auth_string
     @store.add_auth "#{@uri}/path", 'user', 'pass'
 
@@ -143,6 +157,14 @@ class TestMechanizeHttpAuthStore < Mechanize::TestCase
     assert_equal ['user1', 'pass', nil], @store.credentials_for(@uri, 'other')
   end
 
+  def test_credentials_for_realm_case
+    @store.add_auth @uri, 'user1', 'pass', 'realm'
+    @store.add_auth @uri, 'user2', 'pass', 'Realm'
+
+    assert_equal ['user1', 'pass', nil], @store.credentials_for(@uri, 'realm')
+    assert_equal ['user2', 'pass', nil], @store.credentials_for(@uri, 'Realm')
+  end
+
   def test_credentials_for_path
     @store.add_auth @uri, 'user', 'pass', 'realm'
 
@@ -183,6 +205,21 @@ class TestMechanizeHttpAuthStore < Mechanize::TestCase
     assert_equal expected, @store.auth_accounts
   end
 
+  def test_remove_auth_realm_case
+    @store.add_auth @uri, 'user1', 'pass', 'realm'
+    @store.add_auth @uri, 'user2', 'pass', 'Realm'
+
+    @store.remove_auth @uri, 'Realm'
+
+    expected = {
+      @uri => {
+        'realm' => ['user1', 'pass', nil]
+      }
+    }
+
+    assert_equal expected, @store.auth_accounts
+  end
+
   def test_remove_auth_string
     @store.add_auth @uri, 'user1', 'pass'
 

data/test/test_mechanize_http_content_disposition_parser.rb

@@ -30,6 +30,33 @@ class TestMechanizeHttpContentDispositionParser < Mechanize::TestCase
     assert_equal expected,     content_disposition.parameters
   end
 
+  def test_parse_date_iso8601_fallback
+    now = Time.at Time.now.to_i
+
+    content_disposition = @parser.parse \
+      'attachment;' \
+      'filename=value;' \
+      "creation-date=\"#{now.iso8601}\";" \
+      "modification-date=\"#{(now + 1).iso8601}\""
+
+    assert_equal 'attachment', content_disposition.type
+    assert_equal 'value',      content_disposition.filename
+    assert_equal now,          content_disposition.creation_date
+    assert_equal((now + 1),    content_disposition.modification_date)
+  end
+
+  def test_parse_date_invalid
+    now = Time.at Time.now.to_i
+
+    content_disposition = @parser.parse \
+      'attachment;' \
+      'filename=value;' \
+      "creation-date=\"#{now.to_s}\";" \
+      "modification-date=\"#{(now + 1).to_s}\""
+
+    assert_nil content_disposition
+  end
+
   def test_parse_header
     content_disposition = @parser.parse \
       'content-disposition: attachment;filename=value', true
@@ -119,7 +146,7 @@ class TestMechanizeHttpContentDispositionParser < Mechanize::TestCase
 
     assert_equal 'end "', string
   end
-  
+
   def test_parse_uppercase
     content_disposition = @parser.parse \
       'content-disposition: attachment; Filename=value', true
@@ -128,5 +155,12 @@ class TestMechanizeHttpContentDispositionParser < Mechanize::TestCase
     assert_equal 'value',      content_disposition.filename
   end
 
+  def test_parse_filename_starting_with_escaped_quote
+    content_disposition = @parser.parse \
+      'content-disposition: attachment; Filename="\"value\""', true
+
+    assert_equal '"value"', content_disposition.filename
+  end
+
 end
 

data/test/test_mechanize_http_www_authenticate_parser.rb

@@ -109,6 +109,14 @@ class TestMechanizeHttpWwwAuthenticateParser < Mechanize::TestCase
     assert_equal expected, @parser.parse('Basic ReAlM=foo')
   end
 
+  def test_parse_realm_value_case
+    expected = [
+      challenge('Basic', { 'realm' => 'Foo' }, 'Basic realm=Foo'),
+    ]
+
+    assert_equal expected, @parser.parse('Basic realm=Foo')
+  end
+
   def test_parse_scheme_uppercase
     expected = [
       challenge('Basic', { 'realm' => 'foo' }, 'BaSiC realm=foo'),
@@ -125,6 +133,14 @@ class TestMechanizeHttpWwwAuthenticateParser < Mechanize::TestCase
     assert_equal expected, @parser.parse('Basic realm = "foo"')
   end
 
+  def test_parse_bad_single_quote
+    expected = [
+      challenge('Basic', { 'realm' => "'foo" }, "Basic realm='foo"),
+    ]
+
+    assert_equal expected, @parser.parse("Basic realm='foo bar', qop='baz'")
+  end
+
   def test_quoted_string
     @parser.scanner = StringScanner.new '"text"'
 

data/test/test_mechanize_link.rb

@@ -2,6 +2,25 @@ require 'mechanize/test_case'
 
 class TestMechanizeLink < Mechanize::TestCase
 
+  def test_search
+    page = @mech.get("http://localhost/find_link.html")
+    link = page.link_with(text: "Form Test")
+
+    assert_equal('Form Test', link.text)
+
+    link_with_search = page.link_with(search: "//*[text()='Form Test']")
+    assert_equal(link, link_with_search)
+
+    link_with_xpath = page.link_with(xpath: "//*[text()='Form Test']")
+    assert_equal(link, link_with_xpath)
+
+    link_with_css = page.link_with(css: ".formtest")
+    assert_equal(link, link_with_css)
+
+    link_with_class = page.link_with(class: "formtest")
+    assert_equal(link, link_with_class)
+  end
+
   def test_click
     page = @mech.get("http://localhost/frame_test.html")
     link = page.link_with(:text => "Form Test")
@@ -10,7 +29,7 @@ class TestMechanizeLink < Mechanize::TestCase
     page = link.click
     assert_equal("http://localhost/form_test.html",
       @mech.history.last.uri.to_s)
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse body of NOFRAMES
 
   def test_click_bang
     page = @mech.get("http://localhost/frame_test.html")
@@ -20,7 +39,7 @@ class TestMechanizeLink < Mechanize::TestCase
     page = link.click
     assert_equal("http://localhost/form_test.html",
       @mech.history.last.uri.to_s)
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse body of NOFRAMES
 
   def test_click_base
     page = @mech.get("http://google.com/tc_base_link.html")
@@ -103,7 +122,7 @@ class TestMechanizeLink < Mechanize::TestCase
     page = page.link_with(:text => 'just the query string').click
     assert_equal('http://localhost/relative/tc_relative_links.html?a=b',
                  page.uri.to_s)
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse IFRAME
 
   def test_uri_weird
     doc = Nokogiri::HTML::Document.new
@@ -116,12 +135,36 @@ class TestMechanizeLink < Mechanize::TestCase
     assert_equal 'http://foo.bar/%20baz', link.uri.to_s
   end
 
+  def test_uri_weird_with_fragment
+    doc = Nokogiri::HTML::Document.new
+
+    node = Nokogiri::XML::Node.new('foo', doc)
+    node['href'] = 'http://foo.bar/ baz#уважение'
+
+    link = Mechanize::Page::Link.new(node, nil, nil)
+
+    assert_equal '%D1%83%D0%B2%D0%B0%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5', link.uri.fragment
+  end
+
+  def test_bad_uri_raise_compatible_exception
+    doc = Nokogiri::HTML::Document.new
+
+    node = Nokogiri::XML::Node.new('foo', doc)
+    node['href'] = 'http://http:foo.bar/ baz'
+
+    link = Mechanize::Page::Link.new(node, nil, nil)
+
+    assert_raises URI::InvalidURIError do
+      link.uri
+    end
+  end
+
   def test_resolving_full_uri
     page = @mech.get("http://localhost/frame_test.html")
     link = page.link_with(:text => "Form Test")
 
     assert_equal "/form_test.html", link.uri.to_s
     assert_equal "http://localhost/form_test.html", link.resolved_uri.to_s
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse body of NOFRAMES
 end
 

data/test/test_mechanize_page.rb

@@ -108,6 +108,8 @@ class TestMechanizePage < Mechanize::TestCase
     assert_equal "frame3",            page.frames[2].name
     assert_equal "/file_upload.html", page.frames[2].src
     assert_equal "File Upload Form",  page.frames[2].content.title
+
+    assert_equal %w[/google.html /file_upload.html], page.frames_with(search: '*[name=frame1], *[name=frame3]').map(&:src)
   end
 
   def test_iframes
@@ -123,7 +125,7 @@ class TestMechanizePage < Mechanize::TestCase
     assert_equal "frame4",            page.iframes.first.name
     assert_equal "/file_upload.html", page.iframes.first.src
     assert_equal "File Upload Form",  page.iframes.first.content.title
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse IFRAME
 
   def test_image_with
     page = html_page <<-BODY
@@ -248,5 +250,31 @@ class TestMechanizePage < Mechanize::TestCase
     assert_empty page.links_with(:search => '//img')
   end
 
+	def test_multiple_titles
+		page = html_page <<-BODY
+<!doctype html>
+<html>
+	<head>
+		<title>HTML&gt;TITLE</title>
+	</head>
+	<body>
+		<svg>
+			<title>SVGTITLE</title>
+			<metadata id="metadata5">
+				<rdf:RDF>
+					<cc:Work>
+						<dc:title>RDFDCTITLE</dc:title>
+					</cc:Work>
+				</rdf:RDF>
+			</metadata>
+			<g></g>
+		</svg>
+	</body>
+</html>
+		BODY
+
+		assert_equal page.title, "HTML>TITLE"
+	end
+
 end
 

data/test/test_mechanize_page_encoding.rb

@@ -183,5 +183,27 @@ class TestMechanizePageEncoding < Mechanize::TestCase
     assert_equal Encoding::UTF_8, result.text.encoding
   end
 
-end
+  def test_parser_error_message_containing_encoding_errors
+    # https://github.com/sparklemotion/mechanize/issues/553
+    body = <<~EOF
+      <html>
+      <body>
+      <!--
+      ## メモ
+      処理の一般化, 二重ループ, 多重ループ
+      wzxhzdk:25
+      -->
+    EOF
+    page = util_page body
 
+    # this should not raise an "invalid byte sequence in UTF-8" error while processing parsing errors
+    page.search("body")
+
+    # let's assert on the setup: a libxml2-returned parsing error itself contains an invalid character
+    assert(error = page.parser.errors.find { |e| e.message.include?("Comment not terminated") })
+    exception = assert_raises(ArgumentError) do
+      error.message =~ /any regex just to trigger encoding error/
+    end
+    assert_includes(exception.message, "invalid byte sequence in UTF-8")
+  end unless RUBY_ENGINE == 'jruby' # this is a libxml2-specific condition
+end

data/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

data/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
@@ -290,7 +290,7 @@ class TestMechanizePageLink < Mechanize::TestCase
   def test_links
     page = @mech.get("http://localhost/find_link.html")
     assert_equal(18, page.links.length)
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse FRAME outside of FRAMESET
 
   def test_links_with_bold
     page = @mech.get("http://localhost/tc_links.html")
@@ -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

data/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

data/test/test_mechanize_parser.rb

@@ -99,10 +99,10 @@ class TestMechanizeParser < Mechanize::TestCase
     @parser.uri = URI 'http://example'
 
     @parser.response = {
-      'content-disposition' => 'attachment; filename="some \"file\""'
+      'content-disposition' => 'attachment; filename="\"some \"file\""'
     }
 
-    assert_equal 'some__file_', @parser.extract_filename
+    assert_equal '_some__file_', @parser.extract_filename
   end
 
   def test_extract_filename_content_disposition_special
@@ -162,6 +162,16 @@ class TestMechanizeParser < Mechanize::TestCase
     end
   end
 
+  def test_extract_filename_content_disposition_empty
+    @parser.uri = URI 'http://example'
+
+    @parser.response = {
+      'content-disposition' => 'inline; filename="/"'
+    }
+
+    assert_equal '', @parser.extract_filename
+  end
+
   def test_extract_filename_host
     @parser.response = {}
     @parser.uri = URI 'http://example'

data/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