mechanize 0.8.4 → 0.8.5

data/test/test_follow_meta.rb

@@ -1,25 +1,69 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class FollowMetaTest < Test::Unit::TestCase
   def setup
     @agent = WWW::Mechanize.new
   end
 
-  def test_follow_meta
+  def test_dont_follow_meta_by_default
     page = @agent.get('http://localhost/tc_follow_meta.html')
     assert_equal('http://localhost/tc_follow_meta.html', page.uri.to_s)
     assert_equal(1, page.meta.length)
+  end
 
+  def test_follow_meta_if_set
     @agent.follow_meta_refresh = true
+
     page = @agent.get('http://localhost/tc_follow_meta.html')
+
+    assert_equal(2, @agent.history.length)
+    assert_equal('http://localhost/tc_follow_meta.html',
+                 @agent.history[0].uri.to_s)
+    assert_equal('http://localhost/index.html', page.uri.to_s)
+    assert_equal('http://localhost/index.html', @agent.history.last.uri.to_s)
+  end
+
+  def test_always_follow_302
+    @agent.follow_meta_refresh = false
+    page = @agent.get('http://localhost/response_code?code=302&ct=test/xml')
     assert_equal('http://localhost/index.html', page.uri.to_s)
-    assert_equal(3, @agent.history.length)
+    assert_equal(2, @agent.history.length)
   end
 
-  def test_follow_meta_on_302
+  def test_infinite_refresh_throws_exception
     @agent.follow_meta_refresh = true
-    assert_nothing_raised {
-      @agent.get("http://localhost/response_code?code=302&ct=test/xml")
+    assert_raises(WWW::Mechanize::RedirectLimitReachedError) {
+      begin
+        @agent.get('http://localhost/infinite_refresh')
+      rescue WWW::Mechanize::RedirectLimitReachedError => ex
+        raise ex
+      end
     }
   end
+  
+  def test_dont_honor_http_refresh_by_default
+    page = @agent.get('http://localhost/http_refresh?refresh_time=0')
+    assert_equal('http://localhost/http_refresh?refresh_time=0', page.uri.to_s)
+  end
+  
+  def test_honor_http_refresh_if_set
+    @agent.follow_meta_refresh = true
+    page = @agent.get('http://localhost/http_refresh?refresh_time=0')
+    assert_equal('http://localhost/index.html', page.uri.to_s)
+    assert_equal(2, @agent.history.length)
+  end
+
+  def test_honor_http_refresh_delay_if_set
+    @agent.follow_meta_refresh = true
+    class << @agent
+      attr_accessor :slept
+      def sleep *args
+        @slept = args
+      end
+    end
+
+    page = @agent.get('http://localhost/http_refresh?refresh_time=1')
+    assert_equal [1], @agent.slept
+  end
+
 end

data/test/test_form_as_hash.rb

@@ -7,7 +7,7 @@ class TestFormHash < Test::Unit::TestCase
   end
 
   def test_form_hash
-    form = @page.forms.name('post_form').first
+    form = @page.form_with(:name => 'post_form')
 
     assert_not_nil(form)
     field_length = form.fields.length
@@ -19,7 +19,7 @@ class TestFormHash < Test::Unit::TestCase
   end
 
   def test_add_field_via_hash
-    form = @page.forms.name('post_form').first
+    form = @page.form_with(:name => 'post_form')
 
     assert_not_nil(form)
     field_length = form.fields.length
@@ -31,14 +31,14 @@ class TestFormHash < Test::Unit::TestCase
   end
 
   def test_fields_as_hash
-    form = @page.forms.name('post_form').first
+    form = @page.form_with(:name => 'post_form')
 
     assert_not_nil(form)
-    assert_equal(2, form.fields.name('first').length)
+    assert_equal(2, form.fields_with(:name => 'first').length)
 
     form['first'] = 'Aaron'
     assert_equal('Aaron', form['first'])
-    assert_equal('Aaron', form.fields.name('first').first.value)
+    assert_equal('Aaron', form.field_with(:name => 'first').value)
   end
 
   def test_keys

data/test/test_forms.rb

@@ -11,64 +11,65 @@ class FormsMechTest < Test::Unit::TestCase
     page = @agent.submit(page.forms.first)
     assert_match('/form_no_action.html?first=Aaron', page.uri.to_s)
   end
+
   # Test submitting form with two fields of the same name
   def test_post_multival
     page = @agent.get("http://localhost/form_multival.html")
-    form = page.forms.name('post_form').first
+    form = page.form_with(:name => 'post_form')
 
     assert_not_nil(form)
-    assert_equal(2, form.fields.name('first').length)
+    assert_equal(2, form.fields_with(:name => 'first').length)
 
-    form.fields.name('first')[0].value = 'Aaron'
-    form.fields.name('first')[1].value = 'Patterson'
+    form.fields_with(:name => 'first')[0].value = 'Aaron'
+    form.fields_with(:name => 'first')[1].value = 'Patterson'
 
     page = @agent.submit(form)
 
     assert_not_nil(page)
 
     assert_equal(2, page.links.length)
-    assert_not_nil(page.links.text('first:Aaron').first)
-    assert_not_nil(page.links.text('first:Patterson').first)
+    assert_not_nil(page.link_with(:text => 'first:Aaron'))
+    assert_not_nil(page.link_with(:text => 'first:Patterson'))
   end
 
   # Test calling submit on the form object
   def test_submit_on_form
     page = @agent.get("http://localhost/form_multival.html")
-    form = page.forms.name('post_form').first
+    form = page.form_with(:name => 'post_form')
 
     assert_not_nil(form)
-    assert_equal(2, form.fields.name('first').length)
+    assert_equal(2, form.fields_with(:name => 'first').length)
 
-    form.fields.name('first')[0].value = 'Aaron'
-    form.fields.name('first')[1].value = 'Patterson'
+    form.fields_with(:name => 'first')[0].value = 'Aaron'
+    form.fields_with(:name => 'first')[1].value = 'Patterson'
 
     page = form.submit
 
     assert_not_nil(page)
 
     assert_equal(2, page.links.length)
-    assert_not_nil(page.links.text('first:Aaron').first)
-    assert_not_nil(page.links.text('first:Patterson').first)
+    assert_not_nil(page.link_with(:text => 'first:Aaron'))
+    assert_not_nil(page.link_with(:text => 'first:Patterson'))
   end
 
   # Test submitting form with two fields of the same name
   def test_get_multival
     page = @agent.get("http://localhost/form_multival.html")
-    form = page.forms.name('get_form').first
+    form = page.form_with(:name => 'get_form')
 
     assert_not_nil(form)
-    assert_equal(2, form.fields.name('first').length)
+    assert_equal(2, form.fields_with(:name => 'first').length)
 
-    form.fields.name('first')[0].value = 'Aaron'
-    form.fields.name('first')[1].value = 'Patterson'
+    form.fields_with(:name => 'first')[0].value = 'Aaron'
+    form.fields_with(:name => 'first')[1].value = 'Patterson'
 
     page = @agent.submit(form)
 
     assert_not_nil(page)
 
     assert_equal(2, page.links.length)
-    assert_not_nil(page.links.text('first:Aaron').first)
-    assert_not_nil(page.links.text('first:Patterson').first)
+    assert_not_nil(page.link_with(:text => 'first:Aaron'))
+    assert_not_nil(page.link_with(:text => 'first:Patterson'))
   end
 
   def test_post
@@ -159,7 +160,7 @@ class FormsMechTest < Test::Unit::TestCase
     assert_equal("/form_post", post_form.action)
 
     # Find the select list
-    s = post_form.fields.name(/country/).first
+    s = post_form.field_with(:name => /country/)
     assert_not_nil(s, "Couldn't find country select list")
     assert_equal(2, s.options.length)
     assert_equal("USA", s.value)
@@ -169,7 +170,7 @@ class FormsMechTest < Test::Unit::TestCase
     assert_equal("CANADA", s.options[1].text)
 
     # Now set all the fields
-    post_form.fields.name(/country/).value = s.options[1]
+    post_form.field_with(:name => /country/).value = s.options[1]
     assert_equal('CANADA', post_form.country)
     page = @agent.submit(post_form, post_form.buttons.first)
 
@@ -382,13 +383,13 @@ class FormsMechTest < Test::Unit::TestCase
       "Gender female button was nil"
     )
 
-    assert_not_nil(post_form.checkboxes.name("cool person").first,
+    assert_not_nil(post_form.checkbox_with(:name => "cool person"),
       "couldn't find cool person checkbox")
     assert_not_nil(post_form.checkboxes.find { |f| f.name == "likes ham" },
       "couldn't find likes ham checkbox")
 
     # Now set all the fields
-    post_form.fields.name('first_name').value = "Aaron"
+    post_form.field_with(:name => 'first_name').value = "Aaron"
     post_form.radiobuttons.find { |f| 
       f.name == "gender" && f.value == "male" 
     }.checked = true
@@ -472,10 +473,10 @@ class FormsMechTest < Test::Unit::TestCase
 
   def test_fields_as_accessors
     page = @agent.get("http://localhost/form_multival.html")
-    form = page.forms.name('post_form').first
+    form = page.form_with(:name => 'post_form')
 
     assert_not_nil(form)
-    assert_equal(2, form.fields.name('first').length)
+    assert_equal(2, form.fields_with(:name => 'first').length)
 
     form.first = 'Aaron'
     assert_equal('Aaron', form.first)
@@ -483,7 +484,7 @@ class FormsMechTest < Test::Unit::TestCase
 
   def test_add_field
     page = @agent.get("http://localhost/form_multival.html")
-    form = page.forms.name('post_form').first
+    form = page.form_with(:name => 'post_form')
 
     assert_not_nil(form)
     number_of_fields = form.fields.length
@@ -495,7 +496,7 @@ class FormsMechTest < Test::Unit::TestCase
   
   def test_delete_field
     page = @agent.get("http://localhost/form_multival.html")
-    form = page.forms.name('post_form').first
+    form = page.form_with(:name => 'post_form')
 
     assert_not_nil(form)
     number_of_fields = form.fields.length
@@ -508,7 +509,7 @@ class FormsMechTest < Test::Unit::TestCase
 
   def test_has_field
     page = @agent.get("http://localhost/form_multival.html")
-    form = page.forms.name('post_form').first
+    form = page.form_with(:name => 'post_form')
 
     assert_not_nil(form)
     assert_equal(false, form.has_field?('intarweb'))

data/test/test_links.rb

@@ -7,12 +7,12 @@ class LinksMechTest < Test::Unit::TestCase
 
   def test_unsupported_link_types
     page = @agent.get("http://google.com/tc_links.html")
-    link = page.links.text('javascript link').first
+    link = page.link_with(:text => 'javascript link')
     assert_raise(WWW::Mechanize::UnsupportedSchemeError) {
       link.click
     }
 
-    @agent.scheme_handlers['javascript'] = lambda { |link, page|
+    @agent.scheme_handlers['javascript'] = lambda { |my_link, my_page|
       URI.parse('http://localhost/tc_links.html')
     }
     assert_nothing_raised {
@@ -20,6 +20,12 @@ class LinksMechTest < Test::Unit::TestCase
     }
   end
 
+  def test_link_with_no_path
+    page = @agent.get("http://localhost/relative/tc_relative_links.html")
+    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
+
   def test_base
     page = @agent.get("http://google.com/tc_base_link.html")
     page = page.links.first.click
@@ -47,17 +53,17 @@ class LinksMechTest < Test::Unit::TestCase
     assert_equal(1, page.meta.length)
 
     assert_equal('', page.meta.first.text)
-    assert_equal('alt text', page.links.href('alt_text.html').first.text)
-    assert_equal('', page.links.href('no_alt_text.html').first.text)
-    assert_equal('no image', page.links.href('no_image.html').first.text)
-    assert_equal('', page.links.href('no_text.html').first.text)
-    assert_equal('', page.links.href('nil_alt_text.html').first.text)
+    assert_equal('alt text', page.link_with(:href => 'alt_text.html').text)
+    assert_equal('', page.link_with(:href => 'no_alt_text.html').text)
+    assert_equal('no image', page.link_with(:href => 'no_image.html').text)
+    assert_equal('', page.link_with(:href => 'no_text.html').text)
+    assert_equal('', page.link_with(:href => 'nil_alt_text.html').text)
   end
 
   def test_click_link
     @agent.user_agent_alias = 'Mac Safari'
     page = @agent.get("http://localhost/frame_test.html")
-    link = page.links.text("Form Test")
+    link = page.link_with(:text => "Form Test")
     assert_not_nil(link)
     assert_equal('Form Test', link.text)
     page = @agent.click(link)
@@ -67,7 +73,7 @@ class LinksMechTest < Test::Unit::TestCase
 
   def test_click_method
     page = @agent.get("http://localhost/frame_test.html")
-    link = page.links.text("Form Test")
+    link = page.link_with(:text => "Form Test")
     assert_not_nil(link)
     assert_equal('Form Test', link.text)
     page = link.click
@@ -77,38 +83,38 @@ class LinksMechTest < Test::Unit::TestCase
 
   def test_find_bold_link
     page = @agent.get("http://localhost/tc_links.html")
-    link = page.links.text(/Bold Dude/)
+    link = page.links_with(:text => /Bold Dude/)
     assert_equal(1, link.length)
     assert_equal('Bold Dude', link.first.text)
 
-    link = page.links.text('Aaron James Patterson')
+    link = page.links_with(:text => 'Aaron James Patterson')
     assert_equal(1, link.length)
     assert_equal('Aaron James Patterson', link.first.text)
 
-    link = page.links.text('Aaron Patterson')
+    link = page.links_with(:text => 'Aaron Patterson')
     assert_equal(1, link.length)
     assert_equal('Aaron Patterson', link.first.text)
 
-    link = page.links.text('Ruby Rocks!')
+    link = page.links_with(:text => 'Ruby Rocks!')
     assert_equal(1, link.length)
     assert_equal('Ruby Rocks!', link.first.text)
   end
 
   def test_link_with_encoded_space
     page = @agent.get("http://localhost/tc_links.html")
-    link = page.links.text('encoded space').first
+    link = page.link_with(:text => 'encoded space')
     page = @agent.click link
   end
 
   def test_link_with_space
     page = @agent.get("http://localhost/tc_links.html")
-    link = page.links.text('not encoded space').first
+    link = page.link_with(:text => 'not encoded space')
     page = @agent.click link
   end
 
   def test_link_with_unusual_characters
     page = @agent.get("http://localhost/tc_links.html")
-    link = page.links.text('unusual characters').first
+    link = page.link_with(:text => 'unusual characters')
     assert_nothing_raised { @agent.click link }
   end
 end

data/test/test_mech.rb

@@ -20,6 +20,25 @@ class TestMechMethods < Test::Unit::TestCase
     assert_equal('HTTP://localhost/?q=hello', page.uri.to_s)
   end
 
+  def test_get_no_referer
+    requests = []
+    @agent.pre_connect_hooks << lambda { |params|
+      requests << params[:request]
+    }
+
+    @agent.get('http://localhost/')
+    @agent.get('http://localhost/')
+    assert_equal(2, requests.length)
+    requests.each do |request|
+      assert_nil request['referer']
+    end
+  end
+
+  def test_with_anchor
+    page = @agent.get('http://localhost/?foo=bar&#34;')
+    assert_equal('http://localhost/?foo=bar%22', page.uri.to_s)
+  end
+
   def test_post_connect_hook_gets_called
     response = nil
     @agent.post_connect_hooks << lambda { |params|
@@ -161,15 +180,15 @@ class TestMechMethods < Test::Unit::TestCase
     page = @agent.get("http://localhost/google.html")
     search = page.forms.find { |f| f.name == "f" }
     assert_not_nil(search)
-    assert_not_nil(search.fields.name('q').first)
-    assert_not_nil(search.fields.name('hl').first)
+    assert_not_nil(search.field_with(:name => 'q'))
+    assert_not_nil(search.field_with(:name => 'hl'))
     assert_not_nil(search.fields.find { |f| f.name == 'ie' })
   end
 
   def test_click
     @agent.user_agent_alias = 'Mac Safari'
     page = @agent.get("http://localhost/frame_test.html")
-    link = page.links.text("Form Test").first
+    link = page.link_with(:text => "Form Test")
     assert_not_nil(link)
     page = @agent.click(link)
     assert_equal("http://localhost/form_test.html",
@@ -201,12 +220,10 @@ class TestMechMethods < Test::Unit::TestCase
     assert_equal(3, page.frames.size)
 
     find_orig = page.frames.find_all { |f| f.name == 'frame1' }
-    find1 = page.frames.with.name('frame1')
-    find2 = page.frames.name('frame1')
+    find1 = page.frames_with(:name => 'frame1')
 
-    find_orig.zip(find1, find2).each { |a,b,c|
+    find_orig.zip(find1).each { |a,b|
       assert_equal(a, b)
-      assert_equal(a, c)
     }
   end
 

data/test/test_multi_select.rb

@@ -8,7 +8,7 @@ class MultiSelectTest < Test::Unit::TestCase
   def test_select_none
     page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
-    form.fields.name('list').first.select_none
+    form.field_with(:name => 'list').select_none
     page = @agent.submit(form)
     assert_equal(0, page.links.length)
   end
@@ -16,28 +16,28 @@ class MultiSelectTest < Test::Unit::TestCase
   def test_select_all
     page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
-    form.fields.name('list').first.select_all
+    form.field_with(:name => 'list').select_all
     page = @agent.submit(form)
     assert_equal(6, page.links.length)
-    assert_equal(1, page.links.text('list:1').length)
-    assert_equal(1, page.links.text('list:2').length)
-    assert_equal(1, page.links.text('list:3').length)
-    assert_equal(1, page.links.text('list:4').length)
-    assert_equal(1, page.links.text('list:5').length)
-    assert_equal(1, page.links.text('list:6').length)
+    assert_equal(1, page.links_with(:text => 'list:1').length)
+    assert_equal(1, page.links_with(:text => 'list:2').length)
+    assert_equal(1, page.links_with(:text => 'list:3').length)
+    assert_equal(1, page.links_with(:text => 'list:4').length)
+    assert_equal(1, page.links_with(:text => 'list:5').length)
+    assert_equal(1, page.links_with(:text => 'list:6').length)
   end
 
   def test_click_all
     page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
-    form.fields.name('list').first.options.each { |o| o.click }
+    form.field_with(:name => 'list').options.each { |o| o.click }
     page = @agent.submit(form)
     assert_equal(5, page.links.length)
-    assert_equal(1, page.links.text('list:1').length)
-    assert_equal(1, page.links.text('list:3').length)
-    assert_equal(1, page.links.text('list:4').length)
-    assert_equal(1, page.links.text('list:5').length)
-    assert_equal(1, page.links.text('list:6').length)
+    assert_equal(1, page.links_with(:text => 'list:1').length)
+    assert_equal(1, page.links_with(:text => 'list:3').length)
+    assert_equal(1, page.links_with(:text => 'list:4').length)
+    assert_equal(1, page.links_with(:text => 'list:5').length)
+    assert_equal(1, page.links_with(:text => 'list:6').length)
   end
 
   def test_select_default
@@ -45,7 +45,7 @@ class MultiSelectTest < Test::Unit::TestCase
     form = page.forms.first
     page = @agent.submit(form)
     assert_equal(1, page.links.length)
-    assert_equal(1, page.links.text('list:2').length)
+    assert_equal(1, page.links_with(:text => 'list:2').length)
   end
 
   def test_select_one
@@ -64,8 +64,8 @@ class MultiSelectTest < Test::Unit::TestCase
     form.list = ['1', 'Aaron']
     page = @agent.submit(form)
     assert_equal(2, page.links.length)
-    assert_equal(1, page.links.text('list:1').length)
-    assert_equal(1, page.links.text('list:Aaron').length)
+    assert_equal(1, page.links_with(:text => 'list:1').length)
+    assert_equal(1, page.links_with(:text => 'list:Aaron').length)
   end
 
   def test_select_three
@@ -74,9 +74,9 @@ class MultiSelectTest < Test::Unit::TestCase
     form.list = ['1', '2', '3']
     page = @agent.submit(form)
     assert_equal(3, page.links.length)
-    assert_equal(1, page.links.text('list:1').length)
-    assert_equal(1, page.links.text('list:2').length)
-    assert_equal(1, page.links.text('list:3').length)
+    assert_equal(1, page.links_with(:text => 'list:1').length)
+    assert_equal(1, page.links_with(:text => 'list:2').length)
+    assert_equal(1, page.links_with(:text => 'list:3').length)
   end
 
   def test_select_three_twice
@@ -86,21 +86,21 @@ class MultiSelectTest < Test::Unit::TestCase
     form.list = ['1', '2', '3']
     page = @agent.submit(form)
     assert_equal(3, page.links.length)
-    assert_equal(1, page.links.text('list:1').length)
-    assert_equal(1, page.links.text('list:2').length)
-    assert_equal(1, page.links.text('list:3').length)
+    assert_equal(1, page.links_with(:text => 'list:1').length)
+    assert_equal(1, page.links_with(:text => 'list:2').length)
+    assert_equal(1, page.links_with(:text => 'list:3').length)
   end
 
   def test_select_with_click
     page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
     form.list = ['1', 'Aaron']
-    form.fields.name('list').first.options[3].tick
+    form.field_with(:name => 'list').options[3].tick
     assert_equal(['1', 'Aaron', '4'].sort, form.list.sort)
     page = @agent.submit(form)
     assert_equal(3, page.links.length)
-    assert_equal(1, page.links.text('list:1').length)
-    assert_equal(1, page.links.text('list:Aaron').length)
-    assert_equal(1, page.links.text('list:4').length)
+    assert_equal(1, page.links_with(:text => 'list:1').length)
+    assert_equal(1, page.links_with(:text => 'list:Aaron').length)
+    assert_equal(1, page.links_with(:text => 'list:4').length)
   end
 end