unittests/parent_child_test.rb in watir-1.5.6 vs unittests/parent_child_test.rb in watir-1.6.2

@@ -1,40 +1,44 @@
 # feature tests for relative navigation/specification
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
 class TC_Relative < Test::Unit::TestCase
   
   def setup
     goto_page "depot_store.html"
-    @headline = $ie.h3(:text, 'Pragmatic Version Control')
+    @headline = browser.h3(:text, 'Pragmatic Version Control')
   end
-  
+    
+  tag_method :test_parent, :fails_on_firefox
   def test_parent
     catalog_entry = @headline.parent
     link = catalog_entry.link(:class, 'addtocart')
     assert_equal 'http://localhost:3000/store/add_to_cart/12', link.href  
     assert_nothing_raised{link.click}
   end
   
+  tag_method :test_parent_page_container, :fails_on_firefox
   def test_parent_page_container
     catalog_entry = @headline.parent
     assert_not_nil catalog_entry.page_container
   end
-  
+    
+  tag_method :test_before_and_after, :fails_on_firefox
   def test_before_and_after
-    link = $ie.link(:class => 'addtocart', :index => 2)
+    link = browser.link(:class => 'addtocart', :index => 2)
     assert_equal 'http://localhost:3000/store/add_to_cart/12', link.href  
     assert(link.after?(@headline))
     assert(@headline.before?(link))
     assert !(link.before? @headline)
     assert !(@headline.after? link)
     assert !(link.after? link)
   end   
-  
+    
+  tag_method :test_find_after, :fails_on_firefox
   def test_find_after
-    link = $ie.link(:class => 'addtocart', :after? => @headline)
+    link = browser.link(:class => 'addtocart', :after? => @headline)
     assert_equal 'http://localhost:3000/store/add_to_cart/12', link.href  
   end
     
 end
\ No newline at end of file