fix ticket 121 - add parens to assert calls. also, remove 'merb-test'…

… require that broke specs

merb_test_unit/lib/asserts/controller_asserts.rb

@@ -3,22 +3,22 @@ module Merb::Test::Unit::ControllerAsserts
   include Merb::Test::ControllerHelper
 
   def assert_redirect(target)
-    assert [307, *(300..305)].include?(target.respond_to?(:status) ? target.status : target), redirect_failure_message(target)
+    assert([307, *(300..305)].include?(target.respond_to?(:status) ? target.status : target), redirect_failure_message(target))
   end
 
   def assert_redirect_to(expected, target)
     location = target.headers['Location']
 
     assert_redirect(target)
-    assert_equal expected, location, redirect_to_failure_message(expected, location)
+    assert_equal(expected, location, redirect_to_failure_message(expected, location))
   end
 
   def assert_success(target)
-    assert (200..207).include?(target.respond_to?(:status) ? target.status : target), success_failure_message(target)
+    assert((200..207).include?(target.respond_to?(:status) ? target.status : target), success_failure_message(target))
   end
 
   def assert_missing(target)
-    assert (400..417).include?(target.respond_to?(:status) ? target.status : target), missing_failure_message(target)
+    assert((400..417).include?(target.respond_to?(:status) ? target.status : target), missing_failure_message(target))
   end
 
   private

merb_test_unit/lib/asserts/hpricot_asserts.rb

@@ -39,9 +39,9 @@ def assert_elements(css_query, output = nil, equality = {}, &block)
     end
 
     if(equality[:count] != 0)
-      assert ret, "#{ message } \"#{ css_query }\" with \"#{ equality.inspect }\" was not found."
+      assert(ret, "#{ message } \"#{ css_query }\" with \"#{ equality.inspect }\" was not found.")
     else
-      assert ret, "#{ message } \"#{ css_query }\" with \"#{ equality.reject{|k,v| k == :count}.inspect }\" was found, but you specified :count => 0."
+      assert(ret, "#{ message } \"#{ css_query }\" with \"#{ equality.reject{|k,v| k == :count}.inspect }\" was found, but you specified :count => 0.")
     end
     ret
   end

merb_test_unit/specs/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require "merb-core"
-require "merb-test"
 require "test/unit"
 
 Merb.start :environment => 'test', :adapter => 'runner'