watir 1.5.6 → 1.6.2

data/unittests/ie_exists_test.rb

@@ -1,10 +1,11 @@
 # test IE#exists?
 # revision: $Revision: 962 $
 
-$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_IE_Exists < Test::Unit::TestCase 
+  tags :fails_on_firefox, :new
   def setup
     @ie = Watir::IE.new
   end
@@ -17,16 +18,17 @@ class TC_IE_Exists < Test::Unit::TestCase
 end
 
 class TC_IENotExists < Test::Unit::TestCase 
+  tags :fails_on_firefox, :new
   def setup
     @ie = Watir::IE.new
   end
   def test_we_closed_it
     @ie.close
-    assert(!@ie.exists?)
+    assert_false(@ie.exists?)
   end
   def test_some_one_else_closed_it
     @ie.ie.quit
     sleep 0.3 # give it some time to close
-    assert(!@ie.exists?)
+    assert_false(@ie.exists?)
   end    
 end

data/unittests/ie_test.rb

@@ -1,7 +1,7 @@
 # Unit Test for Internet Explorer
-# revision: $Revision: 1318 $
+# revision: $Revision: 1417 $
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'watir/win32ole'
 require 'unittests/ie_mock'
 require 'test/unit'

data/unittests/images_test.rb

@@ -1,13 +1,14 @@
 # feature tests for Images
-# revision: $Revision: 1348 $
+# revision: $Revision: 1431 $
 
-$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'
 require 'ftools'
 require 'webrick'
 require 'watir/cookiemanager'
 
 class TC_Images < Test::Unit::TestCase
+  tags :must_be_visible, :creates_windows
   include Watir
   
   def setup
@@ -21,124 +22,124 @@ class TC_Images < Test::Unit::TestCase
   end
   
   def test_imageExists
-    assert( !  $ie.image(:name , "missing_name").exists?  )
-    assert(    $ie.image(:name , "circle").exists?  )
-    assert(    $ie.image(:name , /circ/ ).exists?  )
+    assert( !  browser.image(:name , "missing_name").exists?  )
+    assert(    browser.image(:name , "circle").exists?  )
+    assert(    browser.image(:name , /circ/ ).exists?  )
     
-    assert( !  $ie.image(:id , "missing_id").exists?  )
-    assert(    $ie.image(:id , "square").exists?  )
-    assert(    $ie.image(:id , /squ/ ).exists?  )
+    assert( !  browser.image(:id , "missing_id").exists?  )
+    assert(    browser.image(:id , "square").exists?  )
+    assert(    browser.image(:id , /squ/ ).exists?  )
     
-    assert( !  $ie.image(:src, "missingsrc.gif").exists?  )
+    assert( !  browser.image(:src, "missingsrc.gif").exists?  )
     
-    assert(    $ie.image(:src, "file:///#{$myDir}/html/images/triangle.jpg").exists?  )
-    assert(    $ie.image(:src , /triangle/ ).exists?  )
+    assert(    browser.image(:src, "file:///#{$myDir}/html/images/triangle.jpg").exists?  )
+    assert(    browser.image(:src , /triangle/ ).exists?  )
     
-    assert(    $ie.image(:alt , "circle" ).exists?  )
-    assert(    $ie.image(:alt , /cir/ ).exists?  )
+    assert(    browser.image(:alt , "circle" ).exists?  )
+    assert(    browser.image(:alt , /cir/ ).exists?  )
     
-    assert( !  $ie.image(:alt , "triangle" ).exists?  )
-    assert( !  $ie.image(:alt , /tri/ ).exists?  )
+    assert( !  browser.image(:alt , "triangle" ).exists?  )
+    assert( !  browser.image(:alt , /tri/ ).exists?  )
     
-    assert(    $ie.image(:title, 'square_image').exists? )
-    assert( !  $ie.image(:title, 'pentagram').exists? )
+    assert(    browser.image(:title, 'square_image').exists? )
+    assert( !  browser.image(:title, 'pentagram').exists? )
   end
   
   def test_image_click
-    assert_raises(UnknownObjectException ) { $ie.image(:name, "no_image_with_this").click }
-    assert_raises(UnknownObjectException ) { $ie.image(:id, "no_image_with_this").click }
-    assert_raises(UnknownObjectException ) { $ie.image(:src, "no_image_with_this").click}
-    assert_raises(UnknownObjectException ) { $ie.image(:alt, "no_image_with_this").click}
+    assert_raises(UnknownObjectException) { browser.image(:name, "no_image_with_this").click }
+    assert_raises(UnknownObjectException) { browser.image(:id, "no_image_with_this").click }
+    assert_raises(UnknownObjectException) { browser.image(:src, "no_image_with_this").click}
+    assert_raises(UnknownObjectException) { browser.image(:alt, "no_image_with_this").click}
     
     # test for bug 1882
-    $ie.text_field(:name , "text1").clear
-    $ie.button(:value , /Pos/ ).click
-    assert_equal('clicked' , $ie.text_field(:name , "text1" ).value )
+    browser.text_field(:name , "text1").clear
+    browser.button(:value , /Pos/ ).click
+    assert_equal('clicked' , browser.text_field(:name , "text1" ).value )
     
     # test for disabled button
-    assert( ! $ie.image(:name , 'disabler_test').disabled )
-    $ie.button(:name , 'disable_img').click
+    assert( ! browser.image(:name , 'disabler_test').disabled )
+    browser.button(:name , 'disable_img').click
     
-    assert( $ie.image(:name , 'disabler_test').disabled )
-    $ie.button(:name , 'disable_img').click
+    assert( browser.image(:name , 'disabler_test').disabled )
+    browser.button(:name , 'disable_img').click
     
-    $ie.image(:src, /button/).click
-    assert($ie.text.include?("PASS") )
+    browser.image(:src, /button/).click
+    assert(browser.text.include?("PASS") )
   end
   
   def test_imageHasLoaded
-    assert_raises(UnknownObjectException ) { $ie.image(:name, "no_image_with_this").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:id, "no_image_with_this").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:src, "no_image_with_this").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:alt, "no_image_with_this").hasLoaded? }
+    assert_raises(UnknownObjectException) { browser.image(:name, "no_image_with_this").hasLoaded? }
+    assert_raises(UnknownObjectException) { browser.image(:id, "no_image_with_this").hasLoaded? }
+    assert_raises(UnknownObjectException) { browser.image(:src, "no_image_with_this").hasLoaded? }
+    assert_raises(UnknownObjectException) { browser.image(:alt, "no_image_with_this").hasLoaded? }
     
-    assert( ! $ie.image(:name, "themissingimage").hasLoaded?  )
-    assert( $ie.image(:name, "circle").hasLoaded?  )
+    assert( ! browser.image(:name, "themissingimage").hasLoaded?  )
+    assert( browser.image(:name, "circle").hasLoaded?  )
     
-    assert( $ie.image(:alt, "circle").hasLoaded?  )
-    assert( $ie.image(:alt, /cir/ ).hasLoaded?  )
+    assert( browser.image(:alt, "circle").hasLoaded?  )
+    assert( browser.image(:alt, /cir/ ).hasLoaded?  )
   end
   
   def test_image_properties
-    assert_raises(UnknownObjectException ) { $ie.image(:name, "no_image_with_this").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:id, "no_image_with_this").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:src, "no_image_with_this").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).hasLoaded? }
-    
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).name }
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).id }
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).src }
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).value }
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).height }
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).width }
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).fileCreatedDate }
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).fileSize }
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).alt}
-    assert_raises(UnknownObjectException ) { $ie.image(:index, 82).title}
-    
-    assert_equal( ""       , $ie.image(:index, 2).name ) 
-    assert_equal( "square" , $ie.image(:index, 2).id )
-    assert_match( /square\.jpg/i ,$ie.image(:index, 2).src )
-    assert_equal( "" , $ie.image(:index, 2).value )
-    assert_equal( "88" , $ie.image(:index, 2).height )
-    assert_equal( "88" , $ie.image(:index, 2).width )
+    assert_raises(UnknownObjectException) { browser.image(:name, "no_image_with_this").hasLoaded? }
+    assert_raises(UnknownObjectException) { browser.image(:id, "no_image_with_this").hasLoaded? }
+    assert_raises(UnknownObjectException) { browser.image(:src, "no_image_with_this").hasLoaded? }
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).hasLoaded? }
+    
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).name }
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).id }
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).src }
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).value }
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).height }
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).width }
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).fileCreatedDate }
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).fileSize }
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).alt}
+    assert_raises(UnknownObjectException) { browser.image(:index, 82).title}
+    
+    assert_equal( ""       , browser.image(:index, 2).name ) 
+    assert_equal( "square" , browser.image(:index, 2).id )
+    assert_match( /square\.jpg/i ,browser.image(:index, 2).src )
+    assert_equal( "" , browser.image(:index, 2).value )
+    assert_equal( "88" , browser.image(:index, 2).height )
+    assert_equal( "88" , browser.image(:index, 2).width )
     
     # this line fails, as the date is when it is installed on the local oc, not the date the file was really created
-    #assert_equal( "03/10/2005" , $ie.image(:index, 2).fileCreatedDate )
-    assert_equal( "788",  $ie.image(:index, 2).fileSize )
+    #assert_equal( "03/10/2005" , browser.image(:index, 2).fileCreatedDate )
+    assert_equal( "788",  browser.image(:index, 2).fileSize )
     
     # tool tips: alt text + title
-    assert_equal('circle' , $ie.image(:index, 6).alt) 
-    assert_equal( ""      , $ie.image(:index, 2).alt) 
-    assert_equal('square_image', $ie.image(:id, 'square').title)
+    assert_equal('circle' , browser.image(:index, 6).alt) 
+    assert_equal( ""      , browser.image(:index, 2).alt) 
+    assert_equal('square_image', browser.image(:id, 'square').title)
     
     # TODO: to string tests -- output should be verified!
-    $ie.image(:name  , "circle").to_s
-    $ie.image(:index , 2).to_s
+    browser.image(:name  , "circle").to_s
+    browser.image(:index , 2).to_s
   end
   
   def test_image_iterator
-    assert_equal(6 , $ie.images.length)
-    assert_equal("" , $ie.images[2].name )
-    assert_equal("square", $ie.images[2].id )
-    assert_match(/square/, $ie.images[2].src )
+    assert_equal(6 , browser.images.length)
+    assert_equal("" , browser.images[2].name )
+    assert_equal("square", browser.images[2].id )
+    assert_match(/square/, browser.images[2].src )
     
     index = 1
-    $ie.images.each do |i|
-      assert_equal( $ie.image(:index, index).id , i.id )
-      assert_equal( $ie.image(:index, index).name , i.name )
-      assert_equal( $ie.image(:index, index).src , i.src )
-      assert_equal( $ie.image(:index, index).height , i.height )
-      assert_equal( $ie.image(:index, index).width , i.width )
+    browser.images.each do |i|
+      assert_equal( browser.image(:index, index).id , i.id )
+      assert_equal( browser.image(:index, index).name , i.name )
+      assert_equal( browser.image(:index, index).src , i.src )
+      assert_equal( browser.image(:index, index).height , i.height )
+      assert_equal( browser.image(:index, index).width , i.width )
       
-      index+=1
+      index += 1
     end
-    assert_equal( index-1 , $ie.images.length )
+    assert_equal(index - 1 , browser.images.length)
   end
   
   def test_save_local_image
-    $ie.images[1].save(build_windows_path("sample.img.dat"))
-    assert(File.compare(@saved_img_path, $ie.images[1].src.gsub(/^file:\/\/\//, '')))
+    browser.images[1].save(build_windows_path("sample.img.dat"))
+    assert(File.compare(@saved_img_path, browser.images[1].src.gsub(/^file:\/\/\//, '')))
   end
   
   def clean_saved_image
@@ -150,7 +151,7 @@ class TC_Images < Test::Unit::TestCase
   end
   
   def build_path(part) 
-        "#{$myDir}/#{part}"
+    "#{$myDir}/#{part}"
   end
 end
 

data/unittests/images_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Images
-# revision: $Revision: 1348 $
+# revision: $Revision: 1505 $
 
-$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'
 require 'ftools'
 require 'webrick'
@@ -19,72 +19,72 @@ class TC_Images_XPath < Test::Unit::TestCase
   end
   
   def test_imageExists
-    assert(! $ie.image(:xpath , "//img[@name='missing_name']/").exists?  )
-    assert(       $ie.image(:xpath , "//img[@name='circle']/").exists?  )
-    # assert(       $ie.image(:name , /circ/ ).exists?  )
+    assert_false( browser.image(:xpath , "//img[@name='missing_name']/").exists?  )
+    assert(       browser.image(:xpath , "//img[@name='circle']/").exists?  )
+    # assert(       browser.image(:name , /circ/ ).exists?  )
     
-    assert(! $ie.image(:xpath , "//img[@id='missing_id']/").exists?  )
-    assert(       $ie.image(:xpath , "//img[@id='square']/").exists?  )
-    # assert(       $ie.image(:id , /squ/ ).exists?  )
+    assert_false( browser.image(:xpath , "//img[@id='missing_id']/").exists?  )
+    assert(       browser.image(:xpath , "//img[@id='square']/").exists?  )
+    # assert(       browser.image(:id , /squ/ ).exists?  )
     
-    assert(! $ie.image(:xpath , "//img[@src='missingsrc.gif']/").exists?  )
+    assert_false( browser.image(:xpath , "//img[@src='missingsrc.gif']/").exists?  )
     
     # BP -- This fails for me but not for Paul. It doesn't make sense to me that it should pass.  
-    # assert(       $ie.image(:src , "file:///#{$myDir}/html/images/triangle.jpg").exists?  )
-    # assert(       $ie.image(:src , /triangle/ ).exists?  )
+    # assert(       browser.image(:src , "file:///#{$myDir}/html/images/triangle.jpg").exists?  )
+    # assert(       browser.image(:src , /triangle/ ).exists?  )
     
-    assert(       $ie.image(:alt , "circle" ).exists?  )
-    # assert(       $ie.image(:alt , /cir/ ).exists?  )
+    assert(       browser.image(:alt , "circle" ).exists?  )
+    # assert(       browser.image(:alt , /cir/ ).exists?  )
     
-    assert(!  $ie.image(:alt , "triangle" ).exists?  )
-    # assert(!  $ie.image(:alt , /tri/ ).exists?  )
+    assert_false(  browser.image(:alt , "triangle" ).exists?  )
+    # assert_false(  browser.image(:alt , /tri/ ).exists?  )
   end
   
   def test_image_click
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@name='no_image_with_this']/").click }
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@id='no_image_with_this']/").click }
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@src='no_image_with_this']/").click}
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@alt='no_image_with_this']/").click}
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@name='no_image_with_this']/").click }
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@id='no_image_with_this']/").click }
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@src='no_image_with_this']/").click}
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@alt='no_image_with_this']/").click}
     
     # test for bug 1882
-    $ie.text_field(:name , "text1").clear
-    $ie.button(:value , /Pos/ ).click
-    assert_equal('clicked' , $ie.text_field(:name , "text1" ).value )
+    browser.text_field(:name , "text1").clear
+    browser.button(:value , /Pos/ ).click
+    assert_equal('clicked' , browser.text_field(:name , "text1" ).value )
     
     # test for disabled button
-    # assert(! $ie.image(:name , 'disabler_test').disabled )
-    # $ie.button(:name , 'disable_img').click
+    # assert_false( browser.image(:name , 'disabler_test').disabled )
+    # browser.button(:name , 'disable_img').click
     
-    # assert( $ie.image(:name , 'disabler_test').disabled )
-    # $ie.button(:name , 'disable_img').click
+    # assert( browser.image(:name , 'disabler_test').disabled )
+    # browser.button(:name , 'disable_img').click
     
-    # $ie.image(:src, /button/).click
-    # assert($ie.text.include?("PASS") )
+    # browser.image(:src, /button/).click
+    # assert(browser.text.include?("PASS") )
     
   end
   
   
   
   def test_imageHasLoaded
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@name='no_image_with_this']/").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@id='no_image_with_this']/").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@src='no_image_with_this']/").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@alt='no_image_with_this']/").hasLoaded? }
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@name='no_image_with_this']/").hasLoaded? }
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@id='no_image_with_this']/").hasLoaded? }
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@src='no_image_with_this']/").hasLoaded? }
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@alt='no_image_with_this']/").hasLoaded? }
     
-    assert(! $ie.image(:xpath , "//img[@name='themissingimage']/").hasLoaded?  )
-    assert( $ie.image(:xpath , "//img[@name='circle']/").hasLoaded?  )
+    assert_false( browser.image(:xpath , "//img[@name='themissingimage']/").hasLoaded?  )
+    assert( browser.image(:xpath , "//img[@name='circle']/").hasLoaded?  )
     
-    assert( $ie.image(:xpath , "//img[@alt='circle']/").hasLoaded?  )
-    # assert( $ie.image(:alt, /cir/ ).hasLoaded?  )
+    assert( browser.image(:xpath , "//img[@alt='circle']/").hasLoaded?  )
+    # assert( browser.image(:alt, /cir/ ).hasLoaded?  )
   end
   
   def test_image_properties
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@name='no_image_with_this']/").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@id='no_image_with_this']/").hasLoaded? }
-    assert_raises(UnknownObjectException ) { $ie.image(:xpath , "//img[@src='no_image_with_this']/").hasLoaded? }
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@name='no_image_with_this']/").hasLoaded? }
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@id='no_image_with_this']/").hasLoaded? }
+    assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@src='no_image_with_this']/").hasLoaded? }
     
     # to string tests -- output should be verified!
-    puts $ie.image(:xpath , "//img[@name='circle']/").to_s
+    puts browser.image(:xpath , "//img[@name='circle']/").to_s
   end
   
 end

data/unittests/iostring_test.rb

@@ -1,6 +1,6 @@
 # unit tests for IOString in iostring.rb
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/iostring'
 require 'test/unit'
 

data/unittests/links_multi_test.rb

@@ -1,26 +1,26 @@
 # feature tests for Links with multiple attributes
 # revision: $Revision: 1009 $
 
-$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_Links_Multi < Test::Unit::TestCase
   
   def setup
-    browser.goto $htmlRoot + 'links_multi.html'
+    goto_page 'links_multi.html'
   end
   
   def test_existing
-    assert_match(/not.html/, browser.link(:class_name, 'Papa').href)
+    assert_match(/not.html/, browser.link(:class, 'Papa').href)
     assert_match(/mama.html/, browser.link(:text, 'click').href)
   end
-  
+
   def test_class_alias
-    assert_match(/not.html/, browser.link(:class, 'Papa').href)
+    assert_match(/not.html/, browser.link(:class_name, 'Papa').href)
   end
-
+  
   def test_hash_syntax
-    assert_match(/not.html/, browser.link(:class_name => 'Papa').href)
+    assert_match(/not.html/, browser.link(:class => 'Papa').href)
     assert_match(/mama.html/, browser.link(:text => 'click').href)
   end
   
@@ -32,7 +32,6 @@ class TC_Links_Multi < Test::Unit::TestCase
     assert_match(/papa.html/, browser.link(:class => 'Papa', :index => 2).href)
   end  
 
-  include Watir::Exception
   def test_not_found_single
     exception = assert_raise(UnknownObjectException) do
       browser.link(:id, 'Missing').href

data/unittests/links_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Links
-# revision: $Revision: 1348 $
+# revision: $Revision: 1536 $
 
-$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'
 require 'cgi'
 
@@ -12,115 +12,116 @@ class TC_Links < Test::Unit::TestCase
     goto_page "links1.html"
   end
   
+  tag_method :test_bad_attribute, :fails_on_firefox
   def test_bad_attribute
-    assert_raises(MissingWayOfFindingObjectException) { $ie.link(:bad_attribute, 199).click }  
+    assert_raises(MissingWayOfFindingObjectException) { browser.link(:bad_attribute, 199).click }  
     begin
-      $ie.link(:bad_attribute, 199).click 
+      browser.link(:bad_attribute, 199).click 
     rescue MissingWayOfFindingObjectException => e           
       assert_equal "bad_attribute is an unknown way of finding a <A> element (199)", e.to_s
     end
   end
   
   def xtest_missing_links_dont_exist
-    assert(!exists?{$ie.link(:text, "missing")})   
-    assert(!exists?{$ie.link(:text, /miss/)})   
+    assert_false(exists?{browser.link(:text, "missing")})   
+    assert_false(exists?{browser.link(:text, /miss/)})   
   end
   
   def test_link_Exists
-    assert($ie.link(:text, "test1").exists?)   
-    assert($ie.link(:text, /TEST/i).exists?)   
-    assert(!$ie.link(:text, "missing").exists?)   
-    assert(!$ie.link(:text, /miss/).exists?)   
+    assert(browser.link(:text, "test1").exists?)   
+    assert(browser.link(:text, /TEST/i).exists?)   
+    assert_false(browser.link(:text, "missing").exists?)   
+    assert_false(browser.link(:text, /miss/).exists?)   
     
     # this assert we have to build up the path
     #  this is what it looks like if you do a to_s on the link  file:///C:/watir_bonus/unitTests/html/links1.HTML
     # but what we get back from $htmlRoot is a mixed case, so its almost impossible for use to test this correctly
-    # assert($ie.link(:url,'file:///C:/watir_bonus/unitTests/html/links1.HTML' ).exists?)   
+    # assert(browser.link(:url,'file:///C:/watir_bonus/unitTests/html/links1.HTML' ).exists?)   
     
-    assert($ie.link(:url, /link_pass.html/).exists?)   
-    assert(!$ie.link(:url, "alsomissing.html").exists?)   
+    assert(browser.link(:url, /link_pass.html/).exists?)   
+    assert_false(browser.link(:url, "alsomissing.html").exists?)   
     
-    assert($ie.link(:id, "link_id").exists?)   
-    assert(!$ie.link(:id, "alsomissing").exists?)   
+    assert(browser.link(:id, "link_id").exists?)   
+    assert_false(browser.link(:id, "alsomissing").exists?)   
     
-    assert($ie.link(:id, /_id/).exists?)   
-    assert(!$ie.link(:id, /alsomissing/).exists?)   
+    assert(browser.link(:id, /_id/).exists?)   
+    assert_false(browser.link(:id, /alsomissing/).exists?)   
     
-    assert($ie.link(:name, "link_name").exists?)   
-    assert(!$ie.link(:name, "alsomissing").exists?)   
+    assert(browser.link(:name, "link_name").exists?)   
+    assert_false(browser.link(:name, "alsomissing").exists?)   
     
-    assert($ie.link(:name, /_n/).exists?)   
-    assert(!$ie.link(:name, /missing/).exists?)   
+    assert(browser.link(:name, /_n/).exists?)   
+    assert_false(browser.link(:name, /missing/).exists?)   
     
-    assert($ie.link(:title, /ti/).exists?)   
-    assert($ie.link(:title, "link_title").exists?)   
+    assert(browser.link(:title, /ti/).exists?)   
+    assert(browser.link(:title, "link_title").exists?)   
     
-    assert(!$ie.link(:title, /missing/).exists?)   
+    assert_false(browser.link(:title, /missing/).exists?)   
     
-    assert($ie.link(:url, /_pass/).exists?)   
-    assert(!$ie.link(:url, /dont_exist/).exists?)   
+    assert(browser.link(:url, /_pass/).exists?)   
+    assert_false(browser.link(:url, /dont_exist/).exists?)   
   end
   
   def test_link_click
-    $ie.link(:text, "test1").click
-    assert( $ie.text.include?("Links2-Pass") ) 
+    browser.link(:text, "test1").click
+    assert( browser.text.include?("Links2-Pass") ) 
   end
   def test_link2_click    
-    $ie.link(:url, /link_pass.html/).click
-    assert( $ie.text.include?("Links3-Pass") ) 
+    browser.link(:url, /link_pass.html/).click
+    assert( browser.text.include?("Links3-Pass") ) 
   end
   def test_link3_click        
-    $ie.link(:index, 1).click
-    assert( $ie.text.include?("Links2-Pass") ) 
+    browser.link(:index, 1).click
+    assert( browser.text.include?("Links2-Pass") ) 
   end
   def test_link4_click        
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.link(:index, 199).click }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.link(:index, 199).click }  
   end
   
   def test_link_properties
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.link(:index, 199).href }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.link(:index, 199).value}  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.link(:index, 199).innerText }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.link(:index, 199).name }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.link(:index, 199).id }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.link(:index, 199).disabled }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.link(:index, 199).type }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.link(:index, 199).class_name }  
-    
-    assert_match( /links2/ ,$ie.link(:index, 1).href )
-    assert_equal( ""      , $ie.link(:index, 1).value)
-    assert_equal( "test1" , $ie.link(:index, 1).innerText )
-    assert_equal( ""      , $ie.link(:index, 1).name )
-    assert_equal( ""      , $ie.link(:index, 1).id )
-    assert_equal( false   , $ie.link(:index, 1).disabled )  
-    assert_equal( ""      , $ie.link(:index, 1).class_name)
-    assert_equal( "link_class_1"      , $ie.link(:index, 2).class_name)
-    
-    assert_equal( "link_id"   , $ie.link(:index, 6).id )
-    assert_equal( "link_name" , $ie.link(:index, 7).name )
-    
-    assert_equal( "" , $ie.link(:index, 7).title)
-    
-    assert_equal( "link_title" , $ie.link(:index, 8).title)
+    assert_raises(UnknownObjectException) { browser.link(:index, 199).href }  
+    assert_raises(UnknownObjectException) { browser.link(:index, 199).value}  
+    assert_raises(UnknownObjectException) { browser.link(:index, 199).innerText }  
+    assert_raises(UnknownObjectException) { browser.link(:index, 199).name }  
+    assert_raises(UnknownObjectException) { browser.link(:index, 199).id }  
+    assert_raises(UnknownObjectException) { browser.link(:index, 199).disabled }  
+    assert_raises(UnknownObjectException) { browser.link(:index, 199).type }  
+    assert_raises(UnknownObjectException) { browser.link(:index, 199).class_name }  
+    
+    assert_match(/links2/ ,browser.link(:index, 1).href )
+    assert_equal(""      , browser.link(:index, 1).value)
+    assert_equal("test1" , browser.link(:index, 1).innerText )
+    assert_equal(""      , browser.link(:index, 1).name )
+    assert_equal(""      , browser.link(:index, 1).id )
+    assert_equal(false   , browser.link(:index, 1).disabled )  
+    assert_equal(""      , browser.link(:index, 1).class_name)
+    assert_equal("link_class_1"      , browser.link(:index, 2).class_name)
+    
+    assert_equal("link_id"   , browser.link(:index, 6).id )
+    assert_equal("link_name" , browser.link(:index, 7).name )
+    
+    assert_equal("" , browser.link(:index, 7).title)
+    
+    assert_equal("link_title" , browser.link(:index, 8).title)
   end
   
   def test_link_iterator
-    assert_equal(9, $ie.links.length )
-    assert_equal("Link Using a name" , $ie.links[7].innerText)
+    assert_equal(9, browser.links.length )
+    assert_equal("Link Using a name" , browser.links[7].innerText)
     
     index = 1
-    $ie.links.each do |link|
-      assert_equal( $ie.link(:index, index).href      , link.href )
-      assert_equal( $ie.link(:index, index).id        , link.id )
-      assert_equal( $ie.link(:index, index).name      , link.name )
-      assert_equal( $ie.link(:index, index).innerText , link.innerText )
+    browser.links.each do |link|
+      assert_equal(browser.link(:index, index).href      , link.href )
+      assert_equal(browser.link(:index, index).id        , link.id )
+      assert_equal(browser.link(:index, index).name      , link.name )
+      assert_equal(browser.link(:index, index).innerText , link.innerText )
       index+=1
     end
   end
   
   def test_div_xml_bug
     goto_page "div_xml.html"
-    assert_nothing_raised {$ie.link(:text, 'Create').exists? }   
+    assert_nothing_raised {browser.link(:text, 'Create').exists? }   
   end
 end
 
@@ -132,14 +133,14 @@ class TC_Frame_Links < Test::Unit::TestCase
   end
   
   def test_links_in_frames
-    assert($ie.frame("linkFrame").link(:text, "test1").exists?)   
-    assert(!$ie.frame("linkFrame").link(:text, "missing").exists?)   
+    assert(browser.frame("linkFrame").link(:text, "test1").exists?)   
+    assert_false(browser.frame("linkFrame").link(:text, "missing").exists?)   
     
-    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) { $ie.frame("linkFrame").link(:index, 199).href }  
-    assert_match(/links2/, $ie.frame("linkFrame").link(:index, 1).href)
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) { browser.frame("linkFrame").link(:index, 199).href }  
+    assert_match(/links2/, browser.frame("linkFrame").link(:index, 1).href)
     
     count =0
-    $ie.frame("linkFrame").links.each do |l|
+    browser.frame("linkFrame").links.each do |l|
       count+=1
     end
     
@@ -149,12 +150,13 @@ end
 
 require 'unittests/iostring'
 class TC_showlinks < Test::Unit::TestCase
+  tags :fails_on_firefox
   include MockStdoutTestCase
   
   def test_showLinks
     goto_page "links1.html"
     $stdout = @mockout
-    $ie.showLinks
+    browser.showLinks
     expected = [/^index name +id +href + text\/src$/,
     get_path_regex(1, "links2.html", "test1"),
     get_path_regex(2, "link_pass.html", "test1"),