mechanize 2.0 → 2.0.1

data/test/test_mechanize_form_check_box.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestMechanizeFormCheckBox < Test::Unit::TestCase
+class TestMechanizeFormCheckBox < MiniTest::Unit::TestCase
 
   def setup
     @agent = Mechanize.new

data/test/test_mechanize_form_encoding.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require "helper"
 
-class TestMechanizeFormEncoding < Test::Unit::TestCase
+class TestMechanizeFormEncoding < MiniTest::Unit::TestCase
 
   # See also: tests of Util.from_native_charset
   # Encoding test should do with non-utf-8 characters
@@ -41,7 +41,7 @@ class TestMechanizeFormEncoding < Test::Unit::TestCase
 
     assert accept_charset
     assert_equal accept_charset, form.encoding
-    assert_not_equal page.encoding, form.encoding
+    refute_equal page.encoding, form.encoding
   end
 
   def test_form_encoding_returns_page_encoding_when_no_accept_charset
@@ -50,7 +50,7 @@ class TestMechanizeFormEncoding < Test::Unit::TestCase
     accept_charset = form.form_node['accept-charset']
 
     assert_nil accept_charset
-    assert_not_equal accept_charset, form.encoding
+    refute_equal accept_charset, form.encoding
     assert_equal page.encoding, form.encoding
   end
 
@@ -58,7 +58,7 @@ class TestMechanizeFormEncoding < Test::Unit::TestCase
     page = @agent.get("http://localhost/form_set_fields.html")
     form = page.forms.first
 
-    assert_not_equal CONTENT_ENCODING, form.encoding
+    refute_equal CONTENT_ENCODING, form.encoding
 
     form.encoding = CONTENT_ENCODING
 
@@ -93,14 +93,16 @@ class TestMechanizeFormEncoding < Test::Unit::TestCase
   def test_post_form_with_problematic_encoding
     form = set_form_with_encoding INVALID_ENCODING
 
-    assert_raise(*ENCODING_ERRORS){ form.submit }
+    assert_raises(*ENCODING_ERRORS){ form.submit }
   end
 
   def test_form_ignore_encoding_error_is_true
     form = set_form_with_encoding INVALID_ENCODING
     form.ignore_encoding_error = true
 
-    assert_nothing_raised(*ENCODING_ERRORS){ form.submit }
+    form.submit
+
+    # HACK no assertions
   end
 
   def test_post_form_logs_form_encoding

data/test/test_mechanize_form_field.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestMechanizeFormField < Test::Unit::TestCase
+class TestMechanizeFormField < MiniTest::Unit::TestCase
 
   def test_field_spaceship
     doc = Nokogiri::HTML::Document.new

data/test/test_mechanize_form_image_button.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestMechanizeFormImageButton < Test::Unit::TestCase
+class TestMechanizeFormImageButton < MiniTest::Unit::TestCase
 
   def test_query_value
     button = Mechanize::Form::ImageButton.new 'name' => 'image_button'

data/test/test_mechanize_form_textarea.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestMechanizeFormTextarea < Test::Unit::TestCase
+class TestMechanizeFormTextarea < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
     @page  = @agent.get("http://localhost/tc_textarea.html")
@@ -26,20 +26,26 @@ class TestMechanizeFormTextarea < Test::Unit::TestCase
 
   def test_multi_textfield
     form = @page.form_with(:name => 'form3')
+
     assert_equal(2, form.fields_with(:name => 'text1').length)
     assert_equal('', form.fields_with(:name => 'text1')[0].value)
     assert_equal('sample text', form.fields_with(:name => 'text1')[1].value)
+
     form.text1 = 'Hello World'
+
     assert_equal('Hello World', form.fields_with(:name => 'text1')[0].value)
     assert_equal('sample text', form.fields_with(:name => 'text1')[1].value)
+
     page = @agent.submit(form)
+
     assert_equal(2, page.links.length)
+
     link = page.links_with(:text => 'text1:sample text')
-    assert_not_nil(link)
+
     assert_equal(1, link.length)
 
     link = page.links_with(:text => 'text1:Hello World')
-    assert_not_nil(link)
+
     assert_equal(1, link.length)
   end
 end

data/test/test_mechanize_http_agent.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'helper'
 
-class TestMechanizeHttpAgent < Test::Unit::TestCase
+class TestMechanizeHttpAgent < MiniTest::Unit::TestCase
 
   def setup
     @mech = Mechanize.new
@@ -95,7 +95,7 @@ class TestMechanizeHttpAgent < Test::Unit::TestCase
 
   def test_get_robots
     robotstxt = @agent.get_robots 'http://localhost/robots.txt'
-    assert_not_equal '', robotstxt
+    refute_equal '', robotstxt
 
     robotstxt = @agent.get_robots 'http://localhost/response_code?code=404'
     assert_equal '', robotstxt

data/test/test_mechanize_link.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestMechanizeLink < Test::Unit::TestCase
+class TestMechanizeLink < MiniTest::Unit::TestCase
 
   def setup
     @agent = Mechanize.new
@@ -9,7 +9,7 @@ class TestMechanizeLink < Test::Unit::TestCase
   def test_click
     page = @agent.get("http://localhost/frame_test.html")
     link = page.link_with(:text => "Form Test")
-    assert_not_nil(link)
+
     assert_equal('Form Test', link.text)
     page = link.click
     assert_equal("http://localhost/form_test.html",
@@ -25,16 +25,17 @@ class TestMechanizeLink < Test::Unit::TestCase
   def test_click_unsupported_scheme
     page = @agent.get("http://google.com/tc_links.html")
     link = page.link_with(:text => 'javascript link')
-    assert_raise(Mechanize::UnsupportedSchemeError) {
+    assert_raises Mechanize::UnsupportedSchemeError do
       link.click
-    }
+    end
 
     @agent.scheme_handlers['javascript'] = lambda { |my_link, my_page|
       URI.parse('http://localhost/tc_links.html')
     }
-    assert_nothing_raised {
-      link.click
-    }
+
+    link.click
+
+    # HACK no assertion
   end
 
   def test_text_alt_text

data/test/test_mechanize_page_encoding.rb

@@ -4,7 +4,7 @@ require 'cgi'
 
 # tests for Page encoding and charset and parsing
 
-class TestMechanizePageEncoding < Test::Unit::TestCase
+class TestMechanizePageEncoding < MiniTest::Unit::TestCase
 
   MECH_ASCII_ENCODING = Mechanize::Util::NEW_RUBY_ENCODING ? 'US-ASCII' : 'ISO-8859-1'
 

data/test/test_mechanize_page_link.rb

@@ -3,7 +3,7 @@
 require 'helper'
 require 'cgi'
 
-class TestMechanizePage < Test::Unit::TestCase
+class TestMechanizePage < MiniTest::Unit::TestCase
 
   WINDOWS_1255 = <<-HTML
 <meta http-equiv="content-type" content="text/html; charset=windows-1255">
@@ -290,7 +290,10 @@ class TestMechanizePage < Test::Unit::TestCase
   def test_link_with_unusual_characters
     page = @agent.get("http://localhost/tc_links.html")
     link = page.link_with(:text => 'unusual characters')
-    assert_nothing_raised { @agent.click link }
+
+    @agent.click link
+
+    # HACK no assertion
   end
 
   def test_links

data/test/test_mechanize_page_meta_refresh.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestMechanizePageMetaRefresh < Test::Unit::TestCase
+class TestMechanizePageMetaRefresh < MiniTest::Unit::TestCase
 
   def setup
     @MR = Mechanize::Page::MetaRefresh

data/test/test_mechanize_redirect_not_get_or_head_error.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestMechanizeRedirectNotGetOrHead < Test::Unit::TestCase
+class TestMechanizeRedirectNotGetOrHead < MiniTest::Unit::TestCase
 
   def setup
     @agent = Mechanize.new

data/test/test_mechanize_subclass.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestMechanizeSubclass < Test::Unit::TestCase
+class TestMechanizeSubclass < MiniTest::Unit::TestCase
 
   class Parent < Mechanize
     @html_parser = :parser

data/test/test_mechanize_util.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'helper'
 
-class TestMechanizeUtil < Test::Unit::TestCase
+class TestMechanizeUtil < MiniTest::Unit::TestCase
 
   INPUTTED_VALUE = "テスト" # "test" in Japanese UTF-8 encoding
   CONTENT_ENCODING = 'Shift_JIS' # one of Japanese encoding
@@ -19,7 +19,7 @@ class TestMechanizeUtil < Test::Unit::TestCase
   INVALID_ENCODING = 'UTF-eight'
 
   def setup
-    @result = "non_nil"
+    @result = "not set"
   end
 
   def test_from_native_charset
@@ -34,7 +34,7 @@ class TestMechanizeUtil < Test::Unit::TestCase
 
   def test_from_native_charset_doesnot_convert_when_no_encoding
     @result = Mechanize::Util.from_native_charset(INPUTTED_VALUE, nil)
-    assert_not_equal ENCODED_VALUE, @result
+    refute_equal ENCODED_VALUE, @result
     assert_equal INPUTTED_VALUE, @result
   end
 
@@ -43,28 +43,28 @@ class TestMechanizeUtil < Test::Unit::TestCase
     Mechanize.html_parser = 'Another HTML Parser'
 
     @result = Mechanize::Util.from_native_charset(INPUTTED_VALUE, CONTENT_ENCODING)
-    assert_not_equal ENCODED_VALUE, @result
+    refute_equal ENCODED_VALUE, @result
     assert_equal INPUTTED_VALUE, @result
-
+  ensure
     Mechanize.html_parser = parser
   end
 
   def test_from_native_charset_raises_error_with_bad_encoding
-    assert_raise(*ENCODING_ERRORS){
-      @result = Mechanize::Util.from_native_charset(INPUTTED_VALUE, INVALID_ENCODING)
-    }
+    assert_raises(*ENCODING_ERRORS) do
+      Mechanize::Util.from_native_charset(INPUTTED_VALUE, INVALID_ENCODING)
+    end
   end
 
   def test_from_native_charset_suppress_encoding_error_when_3rd_arg_is_true
-    assert_nothing_raised(*ENCODING_ERRORS){
-      @result = Mechanize::Util.from_native_charset(INPUTTED_VALUE, INVALID_ENCODING, true)
-    }
+    Mechanize::Util.from_native_charset(INPUTTED_VALUE, INVALID_ENCODING, true)
+
+    # HACK no assertion
   end
 
   def test_from_native_charset_doesnot_convert_when_encoding_error_raised_and_ignored
     @result = Mechanize::Util.from_native_charset(INPUTTED_VALUE, INVALID_ENCODING, true)
 
-    assert_not_equal ENCODED_VALUE, @result
+    refute_equal ENCODED_VALUE, @result
     assert_equal INPUTTED_VALUE, @result
   end
 
@@ -73,9 +73,10 @@ class TestMechanizeUtil < Test::Unit::TestCase
     log = Logger.new(sio)
     log.level = Logger::DEBUG
 
-    assert_raise(*ENCODING_ERRORS){
-      @result = Mechanize::Util.from_native_charset(INPUTTED_VALUE, INVALID_ENCODING, nil, log)
-    }
+    assert_raises(*ENCODING_ERRORS) do
+      Mechanize::Util.from_native_charset(INPUTTED_VALUE, INVALID_ENCODING, nil, log)
+    end
+
     assert_match ERROR_LOG_MESSAGE, sio.string
   end
 
@@ -84,9 +85,8 @@ class TestMechanizeUtil < Test::Unit::TestCase
     log = Logger.new(sio)
     log.level = Logger::DEBUG
 
-    assert_nothing_raised(*ENCODING_ERRORS){
-      @result = Mechanize::Util.from_native_charset(INPUTTED_VALUE, INVALID_ENCODING, true, log)
-    }
+    Mechanize::Util.from_native_charset(INPUTTED_VALUE, INVALID_ENCODING, true, log)
+
     assert_match ERROR_LOG_MESSAGE, sio.string
   end
 end

data/test/test_multi_select.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class MultiSelectTest < Test::Unit::TestCase
+class MultiSelectTest < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
     @page = @agent.get("http://localhost/form_multi_select.html")

data/test/test_no_attributes.rb

@@ -1,13 +1,13 @@
 require "helper"
 
-class TestNoAttributes < Test::Unit::TestCase
+class TestNoAttributes < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
   end
 
   def test_parse_no_attributes
-    assert_nothing_raised do
-      @agent.get('http://localhost/tc_no_attributes.html')
-    end
+    @agent.get('http://localhost/tc_no_attributes.html')
+
+    # HACK no assertions
   end
 end

data/test/test_option.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class OptionTest < Test::Unit::TestCase
+class OptionTest < MiniTest::Unit::TestCase
   class FakeAttribute < Hash
     attr_reader :inner_text
     def initialize(inner_text)

data/test/test_pluggable_parser.rb

@@ -1,30 +1,21 @@
 require "helper"
 
-class PluggableParserTest < Test::Unit::TestCase
+class PluggableParserTest < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
   end
 
   def test_content_type_error
     page = @agent.get("http://localhost/bad_content_type")
-    assert_raise(Mechanize::ContentTypeError) {
-      page = Mechanize::Page.new(
-                                      page.uri, 
-                                      page.response, 
-                                      page.body,
-                                      page.code
-                                     )
-    }
-    begin
-      page = Mechanize::Page.new(
-                                      page.uri, 
-                                      page.response, 
-                                      page.body,
-                                      page.code
-                                     )
-    rescue Mechanize::ContentTypeError => ex
-      assert_equal('text/xml', ex.content_type)
+
+    e = assert_raises Mechanize::ContentTypeError do
+      page = Mechanize::Page.new(page.uri,
+                                 page.response,
+                                 page.body,
+                                 page.code)
     end
+
+    assert_equal('text/xml', e.content_type)
   end
 
   def test_content_type
@@ -55,9 +46,10 @@ class PluggableParserTest < Test::Unit::TestCase
   def test_filter
     @agent.pluggable_parser.html = Filter
     page = @agent.get("http://localhost/find_link.html")
+
     assert_kind_of(Filter, page)
+
     assert_equal(19, page.links.length)
-    assert_not_nil(page.link_with(:text => 'Net::DAAP::Client'))
     assert_equal(1, page.links_with(:text => 'Net::DAAP::Client').length)
   end
 
@@ -68,7 +60,6 @@ class PluggableParserTest < Test::Unit::TestCase
     assert_equal(Filter, @agent.pluggable_parser['text/html'])
     assert_kind_of(Filter, page)
     assert_equal(19, page.links.length)
-    assert_not_nil(page.link_with(:text => 'Net::DAAP::Client'))
     assert_equal(1, page.links_with(:text => 'Net::DAAP::Client').length)
   end
 

data/test/test_post_form.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class PostForm < Test::Unit::TestCase
+class PostForm < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
   end
@@ -9,10 +9,8 @@ class PostForm < Test::Unit::TestCase
     page = @agent.post("http://localhost/form_post",
                         'gender' => 'female'
                       )
-    assert_not_nil(
-      page.links.find { |l| l.text == "gender:female" },
-      "gender field missing"
-    )
+    assert(page.links.find { |l| l.text == "gender:female" },
+           "gender field missing")
   end
 
   def test_post_form_json
@@ -28,14 +26,12 @@ class PostForm < Test::Unit::TestCase
                          ['gender', 'male']
                        ]
                       )
-    assert_not_nil(
-      page.links.find { |l| l.text == "gender:female" },
-      "gender field missing"
-    )
-    assert_not_nil(
-      page.links.find { |l| l.text == "gender:male" },
-      "gender field missing"
-    )
+    assert(page.links.find { |l| l.text == "gender:female" },
+           "gender field missing")
+
+    assert(page.links.find { |l| l.text == "gender:male" },
+           "gender field missing")
+
     assert_equal(2, page.links.length)
   end
 end