mechanize 0.6.11 → 0.7.0

data/test/tc_no_attributes.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 TestNoAttributes < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end

data/test/tc_page.rb

@@ -1,24 +1,17 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class TestPage < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
 
   def test_title
-    page = @agent.get("http://localhost:#{PORT}/file_upload.html")
+    page = @agent.get("http://localhost/file_upload.html")
     assert_equal('File Upload Form', page.title)
   end
 
   def test_no_title
-    page = @agent.get("http://localhost:#{PORT}/no_title_test.html")
+    page = @agent.get("http://localhost/no_title_test.html")
     assert_equal(nil, page.title)
   end
 end

data/test/tc_pluggable_parser.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 PluggableParserTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
 
   def test_content_type_error
-    page = @agent.get("http://localhost:#{PORT}/bad_content_type")
+    page = @agent.get("http://localhost/bad_content_type")
     assert_raise(WWW::Mechanize::ContentTypeError) {
       page = WWW::Mechanize::Page.new(
                                       page.uri, 
@@ -35,7 +28,7 @@ class PluggableParserTest < Test::Unit::TestCase
   end
 
   def test_content_type
-    page = @agent.get("http://localhost:#{PORT}/content_type_test")
+    page = @agent.get("http://localhost/content_type_test")
     assert_kind_of(WWW::Mechanize::Page, page)
   end
 
@@ -61,7 +54,7 @@ class PluggableParserTest < Test::Unit::TestCase
 
   def test_filter
     @agent.pluggable_parser.html = Filter
-    page = @agent.get("http://localhost:#{PORT}/find_link.html")
+    page = @agent.get("http://localhost/find_link.html")
     assert_kind_of(Filter, page)
     assert_equal(19, page.links.length)
     assert_not_nil(page.links.text('Net::DAAP::Client').first)
@@ -70,7 +63,7 @@ class PluggableParserTest < Test::Unit::TestCase
 
   def test_filter_hash
     @agent.pluggable_parser['text/html'] = Filter
-    page = @agent.get("http://localhost:#{PORT}/find_link.html")
+    page = @agent.get("http://localhost/find_link.html")
     assert_kind_of(Class, @agent.pluggable_parser['text/html'])
     assert_equal(Filter, @agent.pluggable_parser['text/html'])
     assert_kind_of(Filter, page)
@@ -93,7 +86,7 @@ class PluggableParserTest < Test::Unit::TestCase
 
   def test_content_type_pdf
     @agent.pluggable_parser.pdf = FileFilter
-    page = @agent.get("http://localhost:#{PORT}/content_type_test?ct=application/pdf")
+    page = @agent.get("http://localhost/content_type_test?ct=application/pdf")
     assert_kind_of(Class, @agent.pluggable_parser['application/pdf'])
     assert_equal(FileFilter, @agent.pluggable_parser['application/pdf'])
     assert_kind_of(FileFilter, page)
@@ -101,7 +94,7 @@ class PluggableParserTest < Test::Unit::TestCase
 
   def test_content_type_csv
     @agent.pluggable_parser.csv = FileFilter
-    page = @agent.get("http://localhost:#{PORT}/content_type_test?ct=text/csv")
+    page = @agent.get("http://localhost/content_type_test?ct=text/csv")
     assert_kind_of(Class, @agent.pluggable_parser['text/csv'])
     assert_equal(FileFilter, @agent.pluggable_parser['text/csv'])
     assert_kind_of(FileFilter, page)
@@ -109,7 +102,7 @@ class PluggableParserTest < Test::Unit::TestCase
 
   def test_content_type_xml
     @agent.pluggable_parser.xml = FileFilter
-    page = @agent.get("http://localhost:#{PORT}/content_type_test?ct=text/xml")
+    page = @agent.get("http://localhost/content_type_test?ct=text/xml")
     assert_kind_of(Class, @agent.pluggable_parser['text/xml'])
     assert_equal(FileFilter, @agent.pluggable_parser['text/xml'])
     assert_kind_of(FileFilter, page)

data/test/tc_post_form.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 PostForm < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
 
   def test_post_form
-    page = @agent.post("http://localhost:#{PORT}/form_post",
+    page = @agent.post("http://localhost/form_post",
                         'gender' => 'female'
                       )
     assert_not_nil(
@@ -23,7 +16,7 @@ class PostForm < Test::Unit::TestCase
   end
 
   def test_post_form_multival
-    page = @agent.post("http://localhost:#{PORT}/form_post",
+    page = @agent.post("http://localhost/form_post",
                        [ ['gender', 'female'],
                          ['gender', 'male']
                        ]

data/test/tc_pretty_print.rb

@@ -1,25 +1,18 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class TestPrettyPrint < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
   
   def test_pretty_print
-    @agent.get("http://localhost:#{PORT}/tc_pretty_print.html")
+    @agent.get("http://localhost/tc_pretty_print.html")
     pretty_string = @agent.pretty_print_inspect
     assert_match("{title \"tc_pretty_print.html\"}", pretty_string)
     assert_match(/\{frames[^"]*"http:\/\/meme/, pretty_string)
     assert_match(/\{iframes[^"]*"http:\/\/meme/, pretty_string)
     assert_match(
-     "{links #<WWW::Mechanize::Link \"Google\" \"http://google.com/\">}",
+     "{links #<WWW::Mechanize::Page::Link \"Google\" \"http://google.com/\">}",
      pretty_string
                 )
     assert_match("form1", pretty_string)

data/test/tc_radiobutton.rb

@@ -1,16 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class TestRadioButtons < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
-    @page  = @agent.get("http://localhost:#{PORT}/tc_radiobuttons.html")
+    @page  = @agent.get("http://localhost/tc_radiobuttons.html")
   end
 
   def test_select_one

data/test/tc_referer.rb

@@ -1,46 +1,39 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class RefererTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
 
   def test_no_referer
-    page = @agent.get("http://localhost:#{PORT}/referer")
+    page = @agent.get("http://localhost/referer")
     assert_equal('', page.body)
   end
 
   def test_send_referer
-    page = @agent.get("http://localhost:#{PORT}/tc_referer.html")
+    page = @agent.get("http://localhost/tc_referer.html")
     page = @agent.click page.links.first
-    assert_equal("http://localhost:#{PORT}/tc_referer.html", page.body)
+    assert_equal("http://localhost/tc_referer.html", page.body)
   end
 
   def test_fetch_two
-    page1 = @agent.get("http://localhost:#{PORT}/tc_referer.html")
-    page2 = @agent.get("http://localhost:#{PORT}/tc_pretty_print.html")
+    page1 = @agent.get("http://localhost/tc_referer.html")
+    page2 = @agent.get("http://localhost/tc_pretty_print.html")
     page = @agent.click page1.links.first
-    assert_equal("http://localhost:#{PORT}/tc_referer.html", page.body)
+    assert_equal("http://localhost/tc_referer.html", page.body)
   end
 
   def test_fetch_two_first
-    page1 = @agent.get("http://localhost:#{PORT}/tc_referer.html")
-    page2 = @agent.get("http://localhost:#{PORT}/tc_pretty_print.html")
+    page1 = @agent.get("http://localhost/tc_referer.html")
+    page2 = @agent.get("http://localhost/tc_pretty_print.html")
     page = @agent.click page1.links
-    assert_equal("http://localhost:#{PORT}/tc_referer.html", page.body)
+    assert_equal("http://localhost/tc_referer.html", page.body)
   end
 
   def test_post_form
-    page1 = @agent.get("http://localhost:#{PORT}/tc_referer.html")
-    page2 = @agent.get("http://localhost:#{PORT}/tc_pretty_print.html")
+    page1 = @agent.get("http://localhost/tc_referer.html")
+    page2 = @agent.get("http://localhost/tc_pretty_print.html")
     page = @agent.submit page1.forms.first
-    assert_equal("http://localhost:#{PORT}/tc_referer.html", page.body)
+    assert_equal("http://localhost/tc_referer.html", page.body)
   end
 end

data/test/tc_relative_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 TestRelativeLinks < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end

data/test/tc_response_code.rb

@@ -1,51 +1,44 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class ResponseCodeMechTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
 
   def test_redirect
-    @agent.get("http://localhost:#{PORT}/response_code?code=300")
-    assert_equal("http://localhost:#{PORT}/index.html",
+    @agent.get("http://localhost/response_code?code=300")
+    assert_equal("http://localhost/index.html",
       @agent.current_page.uri.to_s)
 
-    @agent.get("http://localhost:#{PORT}/response_code?code=301")
-    assert_equal("http://localhost:#{PORT}/index.html",
+    @agent.get("http://localhost/response_code?code=301")
+    assert_equal("http://localhost/index.html",
       @agent.current_page.uri.to_s)
 
-    @agent.get("http://localhost:#{PORT}/response_code?code=302")
-    assert_equal("http://localhost:#{PORT}/index.html",
+    @agent.get("http://localhost/response_code?code=302")
+    assert_equal("http://localhost/index.html",
       @agent.current_page.uri.to_s)
 
-    @agent.get("http://localhost:#{PORT}/response_code?code=303")
-    assert_equal("http://localhost:#{PORT}/index.html",
+    @agent.get("http://localhost/response_code?code=303")
+    assert_equal("http://localhost/index.html",
       @agent.current_page.uri.to_s)
 
-    @agent.get("http://localhost:#{PORT}/response_code?code=307")
-    assert_equal("http://localhost:#{PORT}/index.html",
+    @agent.get("http://localhost/response_code?code=307")
+    assert_equal("http://localhost/index.html",
       @agent.current_page.uri.to_s)
   end
 
   def test_do_not_follow_redirect
     @agent.redirect_ok = false
 
-    @agent.get("http://localhost:#{PORT}/response_code?code=302")
-    assert_equal("http://localhost:#{PORT}/response_code?code=302",
+    @agent.get("http://localhost/response_code?code=302")
+    assert_equal("http://localhost/response_code?code=302",
       @agent.current_page.uri.to_s)
   end
 
   def test_error
     @agent = WWW::Mechanize.new
     begin
-      @agent.get("http://localhost:#{PORT}/response_code?code=500")
+      @agent.get("http://localhost/response_code?code=500")
     rescue WWW::Mechanize::ResponseCodeError => err
       assert_equal("500", err.response_code)
     end

data/test/tc_save_file.rb

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

data/test/tc_select.rb

@@ -1,16 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class SelectTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
-    @page = @agent.get("http://localhost:#{PORT}/form_select.html")
+    @page = @agent.get("http://localhost/form_select.html")
     @form = @page.forms.first
   end
 
@@ -25,7 +18,7 @@ class SelectTest < Test::Unit::TestCase
   end
 
   def test_correct_class
-    assert_instance_of(WWW::Mechanize::SelectList,
+    assert_instance_of(WWW::Mechanize::Form::SelectList,
       @form.fields.name('list').first)
   end
 

data/test/tc_select_all.rb

@@ -1,16 +1,8 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
-
+require File.dirname(__FILE__) + "/helper"
 class SelectAllTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
-    @page = @agent.get("http://localhost:#{PORT}/form_select_all.html")
+    @page = @agent.get("http://localhost/form_select_all.html")
     @form = @page.forms.first
   end
 

data/test/tc_select_none.rb

@@ -1,16 +1,8 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
-
+require File.dirname(__FILE__) + "/helper"
 class SelectNoneTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
-    @page = @agent.get("http://localhost:#{PORT}/form_select_none.html")
+    @page = @agent.get("http://localhost/form_select_none.html")
     @form = @page.forms.first
   end
 

data/test/tc_select_noopts.rb

@@ -1,16 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class SelectNoOptionsTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
-    @page = @agent.get("http://localhost:#{PORT}/form_select_noopts.html")
+    @page = @agent.get("http://localhost/form_select_noopts.html")
     @form = @page.forms.first
   end