mechanize 0.6.11 → 0.7.0

data/test/tc_cookie_class.rb

@@ -1,9 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'mechanize/cookie'
-require 'uri'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 module Enumerable
   def combine

data/test/tc_cookie_jar.rb

@@ -1,10 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'mechanize/cookie'
-require 'uri'
-require 'test_includes'
-require 'fileutils'
+require File.dirname(__FILE__) + "/helper"
 
 class CookieJarTest < Test::Unit::TestCase
   def cookie_from_hash(hash)

data/test/tc_cookies.rb

@@ -1,27 +1,20 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class CookiesMechTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
 
   def test_send_cookies
-    page = @agent.get("http://localhost:#{PORT}/many_cookies")
-    page = @agent.get("http://localhost:#{PORT}/send_cookies")
+    page = @agent.get("http://localhost/many_cookies")
+    page = @agent.get("http://localhost/send_cookies")
     assert_equal(3, page.links.length)
     assert_not_nil(page.links.find { |l| l.text == "name:Aaron" })
     assert_not_nil(page.links.find { |l| l.text == "no_expires:nope" })
   end
 
   def test_no_space_cookies
-    page = @agent.get("http://localhost:#{PORT}/one_cookie_no_space")
+    page = @agent.get("http://localhost/one_cookie_no_space")
     assert_equal(1, @agent.cookies.length)
     foo_cookie = @agent.cookies.find { |k| k.name == 'foo' }
     assert_not_nil(foo_cookie, 'Foo cookie was nil')
@@ -31,7 +24,7 @@ class CookiesMechTest < Test::Unit::TestCase
   end
 
   def test_many_cookies_as_string
-    page = @agent.get("http://localhost:#{PORT}/many_cookies_as_string")
+    page = @agent.get("http://localhost/many_cookies_as_string")
     assert_equal(4, @agent.cookies.length)
 
     name_cookie = @agent.cookies.find { |k| k.name == "name" }
@@ -62,7 +55,7 @@ class CookiesMechTest < Test::Unit::TestCase
   end
 
   def test_many_cookies
-    page = @agent.get("http://localhost:#{PORT}/many_cookies")
+    page = @agent.get("http://localhost/many_cookies")
     assert_equal(4, @agent.cookies.length)
 
     name_cookie = @agent.cookies.find { |k| k.name == "name" }
@@ -95,11 +88,11 @@ class CookiesMechTest < Test::Unit::TestCase
   def test_get_cookie
     assert_equal(true,
       @agent.cookie_jar.empty?(
-      URI::parse("http://localhost:#{PORT}/one_cookie")))
+      URI::parse("http://localhost/one_cookie")))
 
     assert_equal(0, @agent.cookies.length)
 
-    page = @agent.get("http://localhost:#{PORT}/one_cookie")
+    page = @agent.get("http://localhost/one_cookie")
     assert_equal(1, @agent.cookies.length)
 
     cookie = @agent.cookies.first
@@ -110,8 +103,8 @@ class CookiesMechTest < Test::Unit::TestCase
 
     assert_equal(false,
       @agent.cookie_jar.empty?(
-      URI::parse("http://localhost:#{PORT}/one_cookie")))
-    page = @agent.get("http://localhost:#{PORT}/one_cookie")
+      URI::parse("http://localhost/one_cookie")))
+    page = @agent.get("http://localhost/one_cookie")
 
     assert_equal(1, @agent.cookies.length)
 

data/test/tc_encoded_links.rb

@@ -1,27 +1,20 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
+require File.dirname(__FILE__) + "/helper"
 
 class TestEncodedLinks < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
-    @page = @agent.get("http://localhost:#{PORT}/tc_encoded_links.html")
+    @page = @agent.get("http://localhost/tc_encoded_links.html")
   end
 
   def test_click_link
     link = @page.links.first
-    assert_equal('/form_post?a=b&amp;b=c', link.href)
+    assert_equal('/form_post?a=b&b=c', link.href)
     page = @agent.click(link)
-    assert_equal("http://localhost:#{PORT}/form_post?a=b&b=c", page.uri.to_s)
+    assert_equal("http://localhost/form_post?a=b&b=c", page.uri.to_s)
   end
 
   def test_hpricot_link
     page = @agent.click(@page.search('a').first)
-    assert_equal("http://localhost:#{PORT}/form_post?a=b&b=c", page.uri.to_s)
+    assert_equal("http://localhost/form_post?a=b&b=c", page.uri.to_s)
   end
 end

data/test/tc_errors.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 MechErrorsTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
 
   def test_bad_form_method
-    page = @agent.get("http://localhost:#{PORT}/bad_form_test.html")
+    page = @agent.get("http://localhost/bad_form_test.html")
     assert_raise(RuntimeError) {
       @agent.submit(page.forms.first)
     }
@@ -21,14 +14,14 @@ class MechErrorsTest < Test::Unit::TestCase
 
   def test_non_exist
     begin
-      page = @agent.get("http://localhost:#{PORT}/bad_form_test.html")
+      page = @agent.get("http://localhost/bad_form_test.html")
     rescue RuntimeError => ex
       assert_equal("404", ex.inspect)
     end
   end
 
   def test_too_many_radio
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
     form = page.forms.name('post_form1').first
     form.radiobuttons.each { |r| r.checked = true }
     assert_raise(RuntimeError) {

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

data/test/tc_form_action.rb

@@ -1,17 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
-require 'logger'
+require File.dirname(__FILE__) + "/helper"
 
 class TestFormAction < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
-    @page  = @agent.get("http://localhost:#{PORT}/tc_form_action.html")
+    @page  = @agent.get("http://localhost/tc_form_action.html")
   end
 
   def test_post_encoded_action
@@ -20,7 +12,7 @@ class TestFormAction < Test::Unit::TestCase
     }
     assert_equal('/form_post?a=b&b=c', form.action)
     page = form.submit
-    assert_equal("http://localhost:#{PORT}/form_post?a=b&b=c", page.uri.to_s)
+    assert_equal("http://localhost/form_post?a=b&b=c", page.uri.to_s)
   end
 
   def test_get_encoded_action
@@ -29,7 +21,7 @@ class TestFormAction < Test::Unit::TestCase
     }
     assert_equal('/form_post?a=b&b=c', form.action)
     page = form.submit
-    assert_equal("http://localhost:#{PORT}/form_post?first_name=Aaron", page.uri.to_s)
+    assert_equal("http://localhost/form_post?first_name=Aaron", page.uri.to_s)
   end
 
   def test_post_nonencoded_action
@@ -38,7 +30,7 @@ class TestFormAction < Test::Unit::TestCase
     }
     assert_equal('/form_post?a=b&b=c', form.action)
     page = form.submit
-    assert_equal("http://localhost:#{PORT}/form_post?a=b&b=c", page.uri.to_s)
+    assert_equal("http://localhost/form_post?a=b&b=c", page.uri.to_s)
   end
 
   def test_post_pound_sign
@@ -47,6 +39,6 @@ class TestFormAction < Test::Unit::TestCase
     }
     assert_equal('/form_post#1', form.action)
     page = form.submit
-    assert_equal("http://localhost:#{PORT}/form_post#1", page.uri.to_s)
+    assert_equal("http://localhost/form_post#1", page.uri.to_s)
   end
 end

data/test/tc_form_as_hash.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 TestFormHash < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
     @page  = @agent.get('http://localhost/form_multival.html')

data/test/tc_form_button.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 TestFormButtons < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
@@ -33,4 +26,8 @@ class TestFormButtons < Test::Unit::TestCase
     assert_equal(1, page.forms.length)
     assert_equal(1, page.forms.first.buttons.length)
   end
+
+  def html_response
+    { 'content-type' => 'text/html' }
+  end
 end

data/test/tc_form_no_inputname.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 FormNoInputNameTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
     @page = @agent.get('http://localhost/form_no_input_name.html')

data/test/tc_forms.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 FormsMechTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
@@ -21,7 +13,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
   # Test submitting form with two fields of the same name
   def test_post_multival
-    page = @agent.get("http://localhost:#{PORT}/form_multival.html")
+    page = @agent.get("http://localhost/form_multival.html")
     form = page.forms.name('post_form').first
 
     assert_not_nil(form)
@@ -41,7 +33,7 @@ class FormsMechTest < Test::Unit::TestCase
 
   # Test calling submit on the form object
   def test_submit_on_form
-    page = @agent.get("http://localhost:#{PORT}/form_multival.html")
+    page = @agent.get("http://localhost/form_multival.html")
     form = page.forms.name('post_form').first
 
     assert_not_nil(form)
@@ -61,7 +53,7 @@ class FormsMechTest < Test::Unit::TestCase
 
   # Test submitting form with two fields of the same name
   def test_get_multival
-    page = @agent.get("http://localhost:#{PORT}/form_multival.html")
+    page = @agent.get("http://localhost/form_multival.html")
     form = page.forms.name('get_form').first
 
     assert_not_nil(form)
@@ -80,7 +72,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
 
   def test_post
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
     post_form = page.forms.find { |f| f.name == "post_form1" }
     assert_not_nil(post_form, "Post form is null")
     assert_equal("post", post_form.method.downcase)
@@ -157,7 +149,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
 
   def test_select_box
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
     post_form = page.forms.find { |f| f.name == "post_form1" }
     assert_not_nil(post_form, "Post form is null")
     assert_not_nil(page.header)
@@ -189,7 +181,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
 
   def test_get
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
     get_form = page.forms.find { |f| f.name == "get_form1" }
     assert_not_nil(get_form, "Get form is null")
     assert_equal("get", get_form.method.downcase)
@@ -264,7 +256,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
 
   def test_post_with_space_in_action
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
     post_form = page.forms.find { |f| f.name == "post_form2" }
     assert_not_nil(post_form, "Post form is null")
     assert_equal("post", post_form.method.downcase)
@@ -316,7 +308,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
 
   def test_get_with_space_in_action
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
     get_form = page.forms.find { |f| f.name == "get_form2" }
     assert_not_nil(get_form, "Get form is null")
     assert_equal("get", get_form.method.downcase)
@@ -368,7 +360,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
 
   def test_post_with_param_in_action
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
     post_form = page.forms.find { |f| f.name == "post_form3" }
     assert_not_nil(post_form, "Post form is null")
     assert_equal("post", post_form.method.downcase)
@@ -420,7 +412,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
 
   def test_get_with_param_in_action
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
     get_form = page.forms.find { |f| f.name == "get_form3" }
     assert_not_nil(get_form, "Get form is null")
     assert_equal("get", get_form.method.downcase)
@@ -472,14 +464,14 @@ class FormsMechTest < Test::Unit::TestCase
   end
 
   def test_field_addition
-    page = @agent.get("http://localhost:#{PORT}/form_test.html")
+    page = @agent.get("http://localhost/form_test.html")
     get_form = page.forms.find { |f| f.name == "get_form1" }
     get_form.field("first_name").value = "Gregory"
     assert_equal( "Gregory", get_form.field("first_name").value ) 
   end
 
   def test_fields_as_accessors
-    page = @agent.get("http://localhost:#{PORT}/form_multival.html")
+    page = @agent.get("http://localhost/form_multival.html")
     form = page.forms.name('post_form').first
 
     assert_not_nil(form)
@@ -490,7 +482,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
 
   def test_add_field
-    page = @agent.get("http://localhost:#{PORT}/form_multival.html")
+    page = @agent.get("http://localhost/form_multival.html")
     form = page.forms.name('post_form').first
 
     assert_not_nil(form)
@@ -502,7 +494,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
   
   def test_delete_field
-    page = @agent.get("http://localhost:#{PORT}/form_multival.html")
+    page = @agent.get("http://localhost/form_multival.html")
     form = page.forms.name('post_form').first
 
     assert_not_nil(form)
@@ -514,7 +506,7 @@ class FormsMechTest < Test::Unit::TestCase
   end
 
   def test_has_field
-    page = @agent.get("http://localhost:#{PORT}/form_multival.html")
+    page = @agent.get("http://localhost/form_multival.html")
     form = page.forms.name('post_form').first
 
     assert_not_nil(form)

data/test/tc_frames.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 FramesMechTest < Test::Unit::TestCase
-  include TestMethods
-
   def setup
     @agent = WWW::Mechanize.new
   end
 
   def test_frames
-    page = @agent.get("http://localhost:#{PORT}/frame_test.html")
+    page = @agent.get("http://localhost/frame_test.html")
     assert_equal(3, page.frames.size)
     assert_equal("frame1", page.frames[0].name)
     assert_equal("frame2", page.frames[1].name)
@@ -24,7 +17,7 @@ class FramesMechTest < Test::Unit::TestCase
   end
 
   def test_iframes
-    page = @agent.get("http://localhost:#{PORT}/iframe_test.html")
+    page = @agent.get("http://localhost/iframe_test.html")
     assert_equal(1, page.iframes.size)
     assert_equal("frame4", page.iframes.first.name)
     assert_equal("/file_upload.html", page.iframes.first.src)