test/tc_form_action.rb in mechanize-0.6.11 vs test/tc_form_action.rb in mechanize-0.7.0

@@ -1,52 +1,44 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require File.dirname(__FILE__) + "/helper"
 
-require 'test/unit'
-require 'rubygems'
-require 'mechanize'
-require 'test_includes'
-require 'logger'
-
 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
     form = @page.form('post_form1') { |f|
       f.first_name = "Aaron"
     }
     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
     form = @page.form('post_form2') { |f|
       f.first_name = "Aaron"
     }
     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
     form = @page.form('post_form3') { |f|
       f.first_name = "Aaron"
     }
     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
     form = @page.form('post_form4') { |f|
       f.first_name = "Aaron"
     }
     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