Switch to minitest, plus other test cleanup.

Author: eric1234

test/functional/cgi_test.rb

@@ -1,9 +1,7 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'mechanize'
-require 'rack/legacy'
-require 'rack/legacy/cgi'
 
-class CgiTest < Test::Unit::TestCase
+class CgiTest < MiniTest::Unit::TestCase
 
   def test_success
     response = Mechanize.new.get 'http://localhost:4000/success.cgi'
@@ -67,13 +65,11 @@ def test_post
   end
 
   def test_flushing
-    assert_nothing_raised do
-      # 5 seconds should be enough to know it didn't lock up
-      timeout 5 do
-        response = Mechanize.new.get 'http://localhost:4000/flush.cgi'
-        assert_equal '200', response.code
-        assert_equal 'text/html', response.header['content-type']
-      end
+    # 5 seconds should be enough to know it didn't lock up
+    timeout 5 do
+      response = Mechanize.new.get 'http://localhost:4000/flush.cgi'
+      assert_equal '200', response.code
+      assert_equal 'text/html', response.header['content-type']
     end
   end
 

test/functional/php_test.rb

@@ -1,11 +1,7 @@
-require 'test/unit'
-
-require 'rubygems'
+require 'minitest/autorun'
 require 'mechanize'
 
-require 'rack/legacy/php'
-
-class PhpTest < Test::Unit::TestCase
+class PhpTest < MiniTest::Unit::TestCase
 
   def test_success
     response = Mechanize.new.get 'http://localhost:4000/success.php'
@@ -59,13 +55,11 @@ def test_post
   end
 
   def test_flushing
-    assert_nothing_raised do
-      # 5 seconds should be enough to know it didn't lock up
-      timeout 5 do
-        response = Mechanize.new.get 'http://localhost:4000/flush.php'
-        assert_equal '200', response.code
-        assert_equal 'text/html', response.header['content-type']
-      end
+    # 5 seconds should be enough to know it didn't lock up
+    timeout 5 do
+      response = Mechanize.new.get 'http://localhost:4000/flush.php'
+      assert_equal '200', response.code
+      assert_equal 'text/html', response.header['content-type']
     end
   end
 

test/test_server.rb

@@ -1,13 +1,11 @@
-# The unit tests do full end-to-end testing therefore a real server
-# needs to be run. Start this script before running the unit tests.
+# The functional tests do full end-to-end testing therefore a real
+# server needs to be run. Start this script before running the
+# functional tests. The Rakefile does this automatically.
 
-require 'rubygems'
 require 'webrick'
 require 'rack'
 require 'rack/showexceptions'
 require 'rack/legacy'
-require 'rack/legacy/cgi'
-require 'rack/legacy/php'
 
 # Keep WEBrick quiet for functional tests
 class ::WEBrick::HTTPServer; def access_log(config, req, res); end end

test/unit/cgi_test.rb

@@ -1,9 +1,8 @@
-require 'test/unit'
-require 'flexmock/test_unit'
+require 'minitest/autorun'
 require 'rack/legacy'
 require 'rack/legacy/cgi'
 
-class CgiTest < Test::Unit::TestCase
+class CgiTest < MiniTest::Unit::TestCase
 
   def test_valid?
     assert app.valid?(fixture_file('success.cgi')) # Valid file

test/unit/php_test.rb

@@ -1,7 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
+require 'rack/legacy'
 require 'rack/legacy/php'
 
-class PhpTest < Test::Unit::TestCase
+class PhpTest < MiniTest::Unit::TestCase
 
   def test_valid?
     assert app.valid?('success.php') # Valid file