Corrects some issues with merb_test_unit

cardmagic · Mar 5, 2008 · d550c0c · d550c0c
1 parent 7e68445
commit d550c0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/merb_test_unit/lib/asserts/hpricot_asserts.rb b/merb_test_unit/lib/asserts/hpricot_asserts.rb
@@ -11,7 +11,7 @@
 
 module Merb::Test::Unit::HpricotAsserts
   include Test::Unit::Assertions
-  include Merb::Test::HpricotHelper
+  # include Merb::Test::HpricotHelper
 
   def assert_elements(css_query, output = nil, equality = {}, &block)
     message = equality.delete(:message) if equality.is_a?(Hash)

diff --git a/merb_test_unit/lib/merb_test_unit.rb b/merb_test_unit/lib/merb_test_unit.rb
@@ -7,10 +7,12 @@
   require 'hpricot'
 
   require 'test/unit'
+  require 'merb-core/test/test_ext/hpricot'
+  require 'merb-core/test/test_ext/object'
 
   module Merb::Test::Unit
   end
-  
+
   require File.join(File.dirname(__FILE__) / 'asserts' / 'hpricot_asserts')
   require File.join(File.dirname(__FILE__) / 'asserts' / 'controller_asserts')
 end