mechanize 0.6.11 → 0.7.0

data/test/tc_gzipping.rb

@@ -1,13 +1,6 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class TestGzip < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
@@ -15,7 +8,7 @@ class TestGzip < Test::Unit::TestCase
   def test_request_gzip
     page = nil
     assert_nothing_raised do
-      page = @agent.get("http://localhost:#{PORT}/gzip?file=index.html")
+      page = @agent.get("http://localhost/gzip?file=index.html")
     end
     assert_kind_of(WWW::Mechanize::Page, page)
     assert_match('Hello World', page.body)

data/test/tc_history.rb

@@ -1,13 +1,6 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class TestHistory < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent    = WWW::Mechanize.new
     @history  = WWW::Mechanize::History.new
@@ -117,11 +110,11 @@ class TestHistory < Test::Unit::TestCase
     page = @agent.get('http://localhost')
 
     node = Struct.new(:href, :inner_text).new('http://localhost/', 'blah')
-    link = WWW::Mechanize::Link.new(node, nil, nil)
+    link = WWW::Mechanize::Page::Link.new(node, nil, nil)
     assert(@agent.visited?(link))
 
     node = Struct.new(:href, :inner_text).new('http://localhost', 'blah')
-    link = WWW::Mechanize::Link.new(node, nil, nil)
+    link = WWW::Mechanize::Page::Link.new(node, nil, nil)
     assert(@agent.visited?(link))
   end
 
@@ -129,11 +122,11 @@ class TestHistory < Test::Unit::TestCase
     page = @agent.get('http://localhost/')
 
     node = Struct.new(:href, :inner_text).new('http://localhost/', 'blah')
-    link = WWW::Mechanize::Link.new(node, nil, nil)
+    link = WWW::Mechanize::Page::Link.new(node, nil, nil)
     assert(@agent.visited?(link))
 
     node = Struct.new(:href, :inner_text).new('http://localhost', 'blah')
-    link = WWW::Mechanize::Link.new(node, nil, nil)
+    link = WWW::Mechanize::Page::Link.new(node, nil, nil)
     assert(@agent.visited?(link))
   end
 

data/test/tc_html_unscape_forms.rb

@@ -1,45 +1,38 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class TestCheckBoxes < Test::Unit::TestCase
-  include TestMethods
-
   def test_field
-    f = WWW::Mechanize::Field.new('a&amp;b', 'a&amp;b')
+    f = WWW::Mechanize::Form::Field.new('a&amp;b', 'a&amp;b')
     assert_equal('a&b', f.name)
     assert_equal('a&b', f.value)
 
-    f = WWW::Mechanize::Field.new('a&b', 'a&b')
+    f = WWW::Mechanize::Form::Field.new('a&b', 'a&b')
     assert_equal('a&b', f.name)
     assert_equal('a&b', f.value)
 
-    f = WWW::Mechanize::Field.new('a&#38;b', 'a&#38;b')
+    f = WWW::Mechanize::Form::Field.new('a&#38;b', 'a&#38;b')
     assert_equal('a&b', f.name)
     assert_equal('a&b', f.value)
   end
 
   def test_file_upload
-    f = WWW::Mechanize::FileUpload.new('a&amp;b', 'a&amp;b')
+    f = WWW::Mechanize::Form::FileUpload.new('a&amp;b', 'a&amp;b')
     assert_equal('a&b', f.name)
     assert_equal('a&b', f.file_name)
 
-    f = WWW::Mechanize::FileUpload.new('a&b', 'a&b')
+    f = WWW::Mechanize::Form::FileUpload.new('a&b', 'a&b')
     assert_equal('a&b', f.name)
     assert_equal('a&b', f.file_name)
   end
 
   def test_image_button
-    f = WWW::Mechanize::ImageButton.new('a&amp;b', 'a&amp;b')
+    f = WWW::Mechanize::Form::ImageButton.new('a&amp;b', 'a&amp;b')
     assert_equal('a&b', f.name)
     assert_equal('a&b', f.value)
   end
 
   def test_radio_button
-    f = WWW::Mechanize::RadioButton.new('a&amp;b', 'a&amp;b', nil, nil)
+    f = WWW::Mechanize::Form::RadioButton.new('a&amp;b', 'a&amp;b', nil, nil)
     assert_equal('a&b', f.name)
     assert_equal('a&b', f.value)
   end

data/test/tc_if_modified_since.rb

@@ -1,9 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class TestIfModifiedSince < Test::Unit::TestCase
   def setup

data/test/tc_keep_alive.rb

@@ -1,13 +1,6 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class TestKeepAlive < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end

data/test/tc_links.rb

@@ -1,13 +1,6 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class LinksMechTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
@@ -19,7 +12,7 @@ class LinksMechTest < Test::Unit::TestCase
   end
 
   def test_find_meta
-    page = @agent.get("http://localhost:#{PORT}/find_link.html")
+    page = @agent.get("http://localhost/find_link.html")
     assert_equal(3, page.meta.length)
     assert_equal(%w{
       http://www.drphil.com/
@@ -29,12 +22,12 @@ class LinksMechTest < Test::Unit::TestCase
   end
 
   def test_find_link
-    page = @agent.get("http://localhost:#{PORT}/find_link.html")
+    page = @agent.get("http://localhost/find_link.html")
     assert_equal(18, page.links.length)
   end
 
   def test_alt_text
-    page = @agent.get("http://localhost:#{PORT}/alt_text.html")
+    page = @agent.get("http://localhost/alt_text.html")
     assert_equal(5, page.links.length)
     assert_equal(1, page.meta.length)
 
@@ -48,27 +41,27 @@ class LinksMechTest < Test::Unit::TestCase
 
   def test_click_link
     @agent.user_agent_alias = 'Mac Safari'
-    page = @agent.get("http://localhost:#{PORT}/frame_test.html")
+    page = @agent.get("http://localhost/frame_test.html")
     link = page.links.text("Form Test")
     assert_not_nil(link)
     assert_equal('Form Test', link.text)
     page = @agent.click(link)
-    assert_equal("http://localhost:#{PORT}/form_test.html",
+    assert_equal("http://localhost/form_test.html",
       @agent.history.last.uri.to_s)
   end
 
   def test_click_method
-    page = @agent.get("http://localhost:#{PORT}/frame_test.html")
+    page = @agent.get("http://localhost/frame_test.html")
     link = page.links.text("Form Test")
     assert_not_nil(link)
     assert_equal('Form Test', link.text)
     page = link.click
-    assert_equal("http://localhost:#{PORT}/form_test.html",
+    assert_equal("http://localhost/form_test.html",
       @agent.history.last.uri.to_s)
   end
 
   def test_find_bold_link
-    page = @agent.get("http://localhost:#{PORT}/tc_links.html")
+    page = @agent.get("http://localhost/tc_links.html")
     link = page.links.text(/Bold Dude/)
     assert_equal(1, link.length)
     assert_equal('Bold Dude', link.first.text)
@@ -87,19 +80,19 @@ class LinksMechTest < Test::Unit::TestCase
   end
 
   def test_link_with_encoded_space
-    page = @agent.get("http://localhost:#{PORT}/tc_links.html")
+    page = @agent.get("http://localhost/tc_links.html")
     link = page.links.text('encoded space').first
     page = @agent.click link
   end
 
   def test_link_with_space
-    page = @agent.get("http://localhost:#{PORT}/tc_links.html")
+    page = @agent.get("http://localhost/tc_links.html")
     link = page.links.text('not encoded space').first
     page = @agent.click link
   end
 
   def test_link_with_unusual_characters
-    page = @agent.get("http://localhost:#{PORT}/tc_links.html")
+    page = @agent.get("http://localhost/tc_links.html")
     link = page.links.text('unusual characters').first
     assert_nothing_raised { @agent.click link }
   end

data/test/tc_mech.rb

@@ -1,14 +1,6 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'webrick'
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class TestMechMethods < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
@@ -36,18 +28,18 @@ class TestMechMethods < Test::Unit::TestCase
   def test_history
     0.upto(25) do |i|
       assert_equal(i, @agent.history.size)
-      page = @agent.get("http://localhost:#{PORT}/")
+      page = @agent.get("http://localhost/")
     end
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
 
-    assert_equal("http://localhost:#{PORT}/form_test.html",
+    assert_equal("http://localhost/form_test.html",
       @agent.history.last.uri.to_s)
-    assert_equal("http://localhost:#{PORT}/",
+    assert_equal("http://localhost/",
       @agent.history[-2].uri.to_s)
-    assert_equal("http://localhost:#{PORT}/",
+    assert_equal("http://localhost/",
       @agent.history[-2].uri.to_s)
 
-    assert_equal(true, @agent.visited?("http://localhost:#{PORT}/"))
+    assert_equal(true, @agent.visited?("http://localhost/"))
     assert_equal(true, @agent.visited?("/form_test.html"))
     assert_equal(false, @agent.visited?("http://google.com/"))
     assert_equal(true, @agent.visited?(page.links.first))
@@ -76,12 +68,12 @@ class TestMechMethods < Test::Unit::TestCase
     @agent.max_history = 10
     0.upto(10) do |i|
       assert_equal(i, @agent.history.size)
-      page = @agent.get("http://localhost:#{PORT}/")
+      page = @agent.get("http://localhost/")
     end
     
     0.upto(10) do |i|
       assert_equal(10, @agent.history.size)
-      page = @agent.get("http://localhost:#{PORT}/")
+      page = @agent.get("http://localhost/")
     end
   end
 
@@ -105,24 +97,24 @@ class TestMechMethods < Test::Unit::TestCase
   def test_back_button
     0.upto(5) do |i|
       assert_equal(i, @agent.history.size)
-      page = @agent.get("http://localhost:#{PORT}/")
+      page = @agent.get("http://localhost/")
     end
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
 
-    assert_equal("http://localhost:#{PORT}/form_test.html",
+    assert_equal("http://localhost/form_test.html",
       @agent.history.last.uri.to_s)
-    assert_equal("http://localhost:#{PORT}/",
+    assert_equal("http://localhost/",
       @agent.history[-2].uri.to_s)
 
     assert_equal(7, @agent.history.size)
     @agent.back
     assert_equal(6, @agent.history.size)
-    assert_equal("http://localhost:#{PORT}/",
+    assert_equal("http://localhost/",
       @agent.history.last.uri.to_s)
   end
 
   def test_google
-    page = @agent.get("http://localhost:#{PORT}/google.html")
+    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)
@@ -132,36 +124,36 @@ class TestMechMethods < Test::Unit::TestCase
 
   def test_click
     @agent.user_agent_alias = 'Mac Safari'
-    page = @agent.get("http://localhost:#{PORT}/frame_test.html")
+    page = @agent.get("http://localhost/frame_test.html")
     link = page.links.text("Form Test").first
     assert_not_nil(link)
     page = @agent.click(link)
-    assert_equal("http://localhost:#{PORT}/form_test.html",
+    assert_equal("http://localhost/form_test.html",
       @agent.history.last.uri.to_s)
   end
 
   def test_click_hpricot
-    page = @agent.get("http://localhost:#{PORT}/frame_test.html")
+    page = @agent.get("http://localhost/frame_test.html")
 
     link = (page/"a[@class=bar]").first
     assert_not_nil(link)
     page = @agent.click(link)
-    assert_equal("http://localhost:#{PORT}/form_test.html",
+    assert_equal("http://localhost/form_test.html",
       @agent.history.last.uri.to_s)
   end
 
   def test_click_hpricot_frame
-    page = @agent.get("http://localhost:#{PORT}/frame_test.html")
+    page = @agent.get("http://localhost/frame_test.html")
 
     link = (page/"frame[@name=frame2]").first
     assert_not_nil(link)
     page = @agent.click(link)
-    assert_equal("http://localhost:#{PORT}/form_test.html",
+    assert_equal("http://localhost/form_test.html",
       @agent.history.last.uri.to_s)
   end
 
   def test_new_find
-    page = @agent.get("http://localhost:#{PORT}/frame_test.html")
+    page = @agent.get("http://localhost/frame_test.html")
     assert_equal(3, page.frames.size)
 
     find_orig = page.frames.find_all { |f| f.name == 'frame1' }
@@ -175,18 +167,18 @@ class TestMechMethods < Test::Unit::TestCase
   end
 
   def test_get_file
-    page = @agent.get("http://localhost:#{PORT}/frame_test.html")
+    page = @agent.get("http://localhost/frame_test.html")
     content_length = page.header['Content-Length']
-    page_as_string = @agent.get_file("http://localhost:#{PORT}/frame_test.html")
+    page_as_string = @agent.get_file("http://localhost/frame_test.html")
     assert_equal(content_length.to_i, page_as_string.length.to_i)
   end
 
   def test_transact
-    page = @agent.get("http://localhost:#{PORT}/frame_test.html")
+    page = @agent.get("http://localhost/frame_test.html")
     assert_equal(1, @agent.history.length)
     @agent.transact { |a|
       5.times {
-        @agent.get("http://localhost:#{PORT}/frame_test.html")
+        @agent.get("http://localhost/frame_test.html")
       }
       assert_equal(6, @agent.history.length)
     }

data/test/{test_mechanize_file.rb → tc_mechanize_file.rb}

@@ -1,9 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class MechanizeFileTest < Test::Unit::TestCase
   def test_content_disposition

data/test/tc_multi_select.rb

@@ -1,19 +1,12 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class MultiSelectTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
 
   def test_select_none
-    page = @agent.get("http://localhost:#{PORT}/form_multi_select.html")
+    page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
     form.fields.name('list').first.select_none
     page = @agent.submit(form)
@@ -21,7 +14,7 @@ class MultiSelectTest < Test::Unit::TestCase
   end
 
   def test_select_all
-    page = @agent.get("http://localhost:#{PORT}/form_multi_select.html")
+    page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
     form.fields.name('list').first.select_all
     page = @agent.submit(form)
@@ -35,7 +28,7 @@ class MultiSelectTest < Test::Unit::TestCase
   end
 
   def test_click_all
-    page = @agent.get("http://localhost:#{PORT}/form_multi_select.html")
+    page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
     form.fields.name('list').first.options.each { |o| o.click }
     page = @agent.submit(form)
@@ -48,7 +41,7 @@ class MultiSelectTest < Test::Unit::TestCase
   end
 
   def test_select_default
-    page = @agent.get("http://localhost:#{PORT}/form_multi_select.html")
+    page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
     page = @agent.submit(form)
     assert_equal(1, page.links.length)
@@ -56,7 +49,7 @@ class MultiSelectTest < Test::Unit::TestCase
   end
 
   def test_select_one
-    page = @agent.get("http://localhost:#{PORT}/form_multi_select.html")
+    page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
     form.list = 'Aaron'
     assert_equal(['Aaron'], form.list)
@@ -66,7 +59,7 @@ class MultiSelectTest < Test::Unit::TestCase
   end
 
   def test_select_two
-    page = @agent.get("http://localhost:#{PORT}/form_multi_select.html")
+    page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
     form.list = ['1', 'Aaron']
     page = @agent.submit(form)
@@ -76,7 +69,7 @@ class MultiSelectTest < Test::Unit::TestCase
   end
 
   def test_select_three
-    page = @agent.get("http://localhost:#{PORT}/form_multi_select.html")
+    page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
     form.list = ['1', '2', '3']
     page = @agent.submit(form)
@@ -87,7 +80,7 @@ class MultiSelectTest < Test::Unit::TestCase
   end
 
   def test_select_three_twice
-    page = @agent.get("http://localhost:#{PORT}/form_multi_select.html")
+    page = @agent.get("http://localhost/form_multi_select.html")
     form = page.forms.first
     form.list = ['1', '2', '3']
     form.list = ['1', '2', '3']
@@ -99,7 +92,7 @@ class MultiSelectTest < Test::Unit::TestCase
   end
 
   def test_select_with_click
-    page = @agent.get("http://localhost:#{PORT}/form_multi_select.html")
+    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