firewatir 1.2.1 → 1.6.2

data/unittests/images_xpath_test.rb

@@ -1,117 +1,118 @@
 # feature tests for Images
 # revision: $Revision: 1.0 $
 
-$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'
 
 class TC_Images_XPath < Test::Unit::TestCase
-    include FireWatir
+    
     
     def setup
         gotoImagePage
     end
     
     def gotoImagePage()
-        $ff.goto($htmlRoot + "images1.html")
+        goto_page("images1.html")
     end
 
     def test_imageExists
-        assert_false( $ff.image(:xpath , "//img[@name='missing_name']").exists?  )
-        assert(       $ff.image(:xpath , "//img[@name='circle']").exists?  )
-        assert(       $ff.image(:xpath , "//img[contains(@name , 'circ')]" ).exists?  )
+        assert_false( browser.image(:xpath , "//img[@name='missing_name']").exists?  )
+        assert(       browser.image(:xpath , "//img[@name='circle']").exists?  )
+        assert(       browser.image(:xpath , "//img[contains(@name , 'circ')]" ).exists?  )
         
-        assert_false( $ff.image(:xpath , "//img[@id='missing_id']").exists?  )
-        assert(       $ff.image(:xpath , "//img[@id='square']").exists?  )
-        assert(       $ff.image(:xpath , "//img[contains(@id, 'squ')]" ).exists?  )
+        assert_false( browser.image(:xpath , "//img[@id='missing_id']").exists?  )
+        assert(       browser.image(:xpath , "//img[@id='square']").exists?  )
+        assert(       browser.image(:xpath , "//img[contains(@id, 'squ')]" ).exists?  )
         
-        assert_false( $ff.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(       $ff.image(:src , "file:///#{$myDir}/html/images/triangle.jpg").exists?  )
-        assert(       $ff.image(:xpath , "//img[contains(@src , 'triangle')]" ).exists?  )
+        # assert(       browser.image(:src , "file:///#{$myDir}/html/images/triangle.jpg").exists?  )
+        assert(       browser.image(:xpath , "//img[contains(@src , 'triangle')]" ).exists?  )
         
-        assert(       $ff.image(:alt , "circle" ).exists?  )
-        assert(       $ff.image(:xpath , "//img[contains(@alt , 'cir')]" ).exists?  )
+        assert(       browser.image(:alt , "circle" ).exists?  )
+        assert(       browser.image(:xpath , "//img[contains(@alt , 'cir')]" ).exists?  )
         
-        assert_false(  $ff.image(:alt , "triangle" ).exists?  )
-        assert_false(  $ff.image(:xpath , "//img[contains(@alt , 'tri')]" ).exists?  )
+        assert_false(  browser.image(:alt , "triangle" ).exists?  )
+        assert_false(  browser.image(:xpath , "//img[contains(@alt , 'tri')]" ).exists?  )
     end
 
+    tag_method :test_element_by_xpath_class, :fails_on_ie
     def test_element_by_xpath_class
       # FIXME getting HTMLAnchorElement instead of HTMLImageElement
       # TODO: This should return null if object is not there.
-      #element = $ff.element_by_xpath("//img[@name='missing_name']")
+      #element = browser.element_by_xpath("//img[@name='missing_name']")
       #assert(element.instance_of?(Image),"element class should be #{Image}; got #{element.class}")
-      element = $ff.element_by_xpath("//img[@name='circle']")
-      assert(element.instance_of?(Image),"element class should be #{Image}; got #{element.class}")
-      element = $ff.element_by_xpath("//img[contains(@name , 'circ')]")
-      assert(element.instance_of?(Image),"element class should be #{Image}; got #{element.class}")
+      element = browser.element_by_xpath("//img[@name='circle']")
+      assert_class(element, 'Image')
+      element = browser.element_by_xpath("//img[contains(@name , 'circ')]")
+      assert_class(element, 'Image')
       # TODO: This should return null if object is not there.
-      #element = $ff.element_by_xpath("//img[@id='missing_id']")
+      #element = browser.element_by_xpath("//img[@id='missing_id']")
       #assert(element.instance_of?(Image),"element class should be #{Image}; got #{element.class}")
-      element = $ff.element_by_xpath("//img[@id='square']")
-      assert(element.instance_of?(Image),"element class should be #{Image}; got #{element.class}")
-      element = $ff.element_by_xpath("//img[contains(@id, 'squ')]")
-      assert(element.instance_of?(Image),"element class should be #{Image}; got #{element.class}")
-      element = $ff.element_by_xpath("//img[contains(@src , 'triangle')]")
-      assert(element.instance_of?(Image),"element class should be #{Image}; got #{element.class}")
-      element = $ff.element_by_xpath("//img[contains(@alt , 'cir')]")
-      assert(element.instance_of?(Image),"element class should be #{Image}; got #{element.class}")
+      element = browser.element_by_xpath("//img[@id='square']")
+      assert_class(element, 'Image')
+      element = browser.element_by_xpath("//img[contains(@id, 'squ')]")
+      assert_class(element, 'Image')
+      element = browser.element_by_xpath("//img[contains(@src , 'triangle')]")
+      assert_class(element, 'Image')
+      element = browser.element_by_xpath("//img[contains(@alt , 'cir')]")
+      assert_class(element, 'Image')
       # TODO: This should return null if object is not there.
-      #element = $ff.element_by_xpath("//img[contains(@alt , 'tri')]")
+      #element = browser.element_by_xpath("//img[contains(@alt , 'tri')]")
       #assert(element.instance_of?(Image),"element class should be #{Image}; got #{element.class}")
     end
     
     def test_image_click
-        assert_raises(UnknownObjectException ) { $ff.image(:xpath , "//img[@name='no_image_with_this']").click }
-        assert_raises(UnknownObjectException ) { $ff.image(:xpath , "//img[@id='no_image_with_this']").click }
-        assert_raises(UnknownObjectException ) { $ff.image(:xpath , "//img[@src='no_image_with_this']").click}
-        assert_raises(UnknownObjectException ) { $ff.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
-        $ff.text_field(:name , "text1").clear
-        $ff.button(:value , /Pos/ ).click
-        assert_equal('clicked' , $ff.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. Click the button to make it disabled
-        $ff.button(:name , 'disable_img').click
-        assert( $ff.image(:name , 'disabler_test').disabled )
+        browser.button(:name , 'disable_img').click
+        assert( browser.image(:name , 'disabler_test').disabled )
         
         # Click button again to make it enabled.
-        $ff.button(:name , 'disable_img').click
-        assert( ! $ff.image(:name , 'disabler_test').disabled )
+        browser.button(:name , 'disable_img').click
+        assert( ! browser.image(:name , 'disabler_test').disabled )
         
-        $ff.image(:src, /button/).click
-        assert($ff.text.include?("PASS") )
+        browser.image(:src, /button/).click
+        assert(browser.text.include?("PASS") )
 
     end
     
 
     # TODO: Need to see alternative for this in Mozilla
     #def test_imageHasLoaded
-    #    assert_raises(UnknownObjectException ) { $ff.image(:xpath , "//img[@name='no_image_with_this']").hasLoaded? }
-    #    assert_raises(UnknownObjectException ) { $ff.image(:xpath , "//img[@id='no_image_with_this']").hasLoaded? }
-    #    assert_raises(UnknownObjectException ) { $ff.image(:xpath , "//img[@src='no_image_with_this']").hasLoaded? }
-    #    assert_raises(UnknownObjectException ) { $ff.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_false( $ff.image(:xpath , "//img[@name='themissingimage']").hasLoaded?  )
-    #    assert( $ff.image(:xpath , "//img[@name='circle']").hasLoaded?  )
+    #    assert_false( browser.image(:xpath , "//img[@name='themissingimage']").hasLoaded?  )
+    #    assert( browser.image(:xpath , "//img[@name='circle']").hasLoaded?  )
     #    
-    #    assert( $ff.image(:xpath , "//img[@alt='circle']").hasLoaded?  )
-    #    # assert( $ff.image(:alt, /cir/ ).hasLoaded?  )
+    #    assert( browser.image(:xpath , "//img[@alt='circle']").hasLoaded?  )
+    #    # assert( browser.image(:alt, /cir/ ).hasLoaded?  )
     #end
     
     def test_image_properties
         # TODO: Need to see alternative for this in Mozilla
-        #assert_raises(UnknownObjectException ) { $ff.image(:xpath , "//img[@name='no_image_with_this']").hasLoaded? }
-        #assert_raises(UnknownObjectException ) { $ff.image(:xpath , "//img[@id='no_image_with_this']").hasLoaded? }
-        #assert_raises(UnknownObjectException ) { $ff.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 $ff.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/javascript_test.rb

@@ -1,71 +1,75 @@
-$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_JavaScript_Test < Test::Unit::TestCase
-    include FireWatir
+    
 #    include FireWatir::Dialog
     
     def setup
-        $ff.goto($htmlRoot  + 'JavascriptClick.html')
+        goto_page 'JavascriptClick.html'
     end
     
+    tag_method :test_alert, :fails_on_ie
     def test_alert
-        #$ff.button(:id, "btnAlert").click_no_wait()
+        #browser.button(:id, "btnAlert").click_no_wait()
 
-        #$ff.click_jspopup_button("OK")
-        $ff.startClicker("ok", 1, '', "Press OK")
-        $ff.button(:id, "btnAlert").click
+        #browser.click_jspopup_button("OK")
+        browser.startClicker("ok", 1, '', "Press OK")
+        browser.button(:id, "btnAlert").click
 
-        assert_equal($ff.text_field(:id, "testResult").value , "You pressed the Alert button!")
-        assert_equal("Press OK", $ff.get_popup_text)
+        assert_equal(browser.text_field(:id, "testResult").value , "You pressed the Alert button!")
+        assert_equal("Press OK", browser.get_popup_text)
         
-        $ff.startClicker("ok")
-        $ff.button(:id, "btnAlert").click
+        browser.startClicker("ok")
+        browser.button(:id, "btnAlert").click
 
-        assert_equal($ff.text_field(:id, "testResult").value , "You pressed the Alert button!")
-        assert_equal("Press OK", $ff.get_popup_text)
+        assert_equal(browser.text_field(:id, "testResult").value , "You pressed the Alert button!")
+        assert_equal("Press OK", browser.get_popup_text)
     end
     
+    tag_method :test_confirm_ok, :fails_on_ie
     def test_confirm_ok
-        #$ff.button(:id, "btnConfirm").click_no_wait()
+        #browser.button(:id, "btnConfirm").click_no_wait()
         
-        #$ff.click_jspopup_button("OK")
-        $ff.startClicker("ok", 1, '', "Press a button")
-        $ff.button(:id, "btnConfirm").click
+        #browser.click_jspopup_button("OK")
+        browser.startClicker("ok", 1, '', "Press a button")
+        browser.button(:id, "btnConfirm").click
 
-        assert_equal($ff.text_field(:id, "testResult").value , "You pressed the Confirm and OK button!")
-        assert_equal("Press a button", $ff.get_popup_text)
+        assert_equal(browser.text_field(:id, "testResult").value , "You pressed the Confirm and OK button!")
+        assert_equal("Press a button", browser.get_popup_text)
 
-        $ff.startClicker("ok")
-        $ff.button(:id, "btnConfirm").click
+        browser.startClicker("ok")
+        browser.button(:id, "btnConfirm").click
 
-        assert_equal($ff.text_field(:id, "testResult").value , "You pressed the Confirm and OK button!")
-        assert_equal("Press a button", $ff.get_popup_text)
+        assert_equal(browser.text_field(:id, "testResult").value , "You pressed the Confirm and OK button!")
+        assert_equal("Press a button", browser.get_popup_text)
     end
     
+    tag_method :test_confirm_cancel, :fails_on_ie
     def test_confirm_cancel
-        #$ff.button(:id, "btnConfirm").click_no_wait()
+        #browser.button(:id, "btnConfirm").click_no_wait()
         
-        #$ff.click_jspopup_button("Cancel")
-        $ff.startClicker("cancel", 1, '', "Press a button")
-        $ff.button(:id, "btnConfirm").click
+        #browser.click_jspopup_button("Cancel")
+        browser.startClicker("cancel", 1, '', "Press a button")
+        browser.button(:id, "btnConfirm").click
 
-        assert_equal($ff.text_field(:id, "testResult").value, "You pressed the Confirm and Cancel button!")
-        assert_equal("Press a button", $ff.get_popup_text)
+        assert_equal(browser.text_field(:id, "testResult").value, "You pressed the Confirm and Cancel button!")
+        assert_equal("Press a button", browser.get_popup_text)
 
-        $ff.startClicker("cancel")
-        $ff.button(:id, "btnConfirm").click
+        browser.startClicker("cancel")
+        browser.button(:id, "btnConfirm").click
 
-        assert_equal($ff.text_field(:id, "testResult").value, "You pressed the Confirm and Cancel button!")
-        assert_equal("Press a button", $ff.get_popup_text)
+        assert_equal(browser.text_field(:id, "testResult").value, "You pressed the Confirm and Cancel button!")
+        assert_equal("Press a button", browser.get_popup_text)
     end
 
+    tag_method :test_ok_selectbox, :fails_on_ie
     def test_ok_selectbox
-        $ff.goto($htmlRoot + "selectboxes1.html")
-        $ff.startClicker("ok")
-        $ff.select_list(:id , "selectbox_5").select_value(/2/)
+        goto_page("selectboxes1.html")
+        browser.startClicker("ok")
+        browser.select_list(:id , "selectbox_5").select_value(/2/)
 
-        assert_equal($ff.text_field(:id, "txtAlert").value , "You pressed OK button")
-        assert_equal("Press OK", $ff.get_popup_text)
+        assert_equal(browser.text_field(:id, "txtAlert").value , "You pressed OK button")
+        assert_equal("Press OK", browser.get_popup_text)
     end
 end

data/unittests/links_test.rb

@@ -1,169 +1,170 @@
 # feature tests for Links
 # revision: $Revision: 1.0 $
 
-$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 < Test::Unit::TestCase
-    include FireWatir
+    
     
     def setup()
-        $ff.goto($htmlRoot + "links1.html")
+        goto_page("links1.html")
     end
     
     def test_new_link_exists
-        assert($ff.link(:text, "test1").exists?)   
-        assert($ff.link(:text, /TEST/i).exists?)   
+        assert(browser.link(:text, "test1").exists?)   
+        assert(browser.link(:text, /TEST/i).exists?)   
     end
     
     # In current implementation, method_missing catches all the methods that are not defined
     # for the element. So there is no way to find out about missinwayoffindingobject exp.
+    tag_method :test_bad_attribute, :fails_on_ie
     def test_bad_attribute
-        assert_raises(UnknownObjectException) { $ff.link(:bad_attribute, 199).click }  
+        assert_raises(UnknownObjectException) { browser.link(:bad_attribute, 199).click }  
         begin
-            $ff.link(:bad_attribute, 199).click 
+            browser.link(:bad_attribute, 199).click 
         rescue UnknownObjectException => e           
-            assert_equal "Unable to locate object, using bad_attribute and 199", e.to_s
+            assert_equal "Unable to locate element, using :bad_attribute, 199", e.to_s
         end
     end
 
     def test_missing_links_dont_exist
-        assert_false($ff.link(:text, "missing").exists?)   
-        assert_false($ff.link(:text, /miss/).exists?)   
+        assert_false(browser.link(:text, "missing").exists?)   
+        assert_false(browser.link(:text, /miss/).exists?)   
     end
 
     def test_link_Exists
-        assert($ff.link(:text, "test1").exists?)   
-        assert($ff.link(:text, /TEST/i).exists?)   
-        assert_false($ff.link(:text, "missing").exists?)   
-        assert_false($ff.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($ff.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($ff.link(:url, /link_pass.html/).exists?)   
-        assert_false($ff.link(:url, "alsomissing.html").exists?)   
+        assert(browser.link(:url, /link_pass.html/).exists?)   
+        assert_false(browser.link(:url, "alsomissing.html").exists?)   
         
-        assert($ff.link(:id, "link_id").exists?)   
-        assert_false($ff.link(:id, "alsomissing").exists?)   
+        assert(browser.link(:id, "link_id").exists?)   
+        assert_false(browser.link(:id, "alsomissing").exists?)   
         
-        assert($ff.link(:id, /_id/).exists?)   
-        assert_false($ff.link(:id, /alsomissing/).exists?)   
+        assert(browser.link(:id, /_id/).exists?)   
+        assert_false(browser.link(:id, /alsomissing/).exists?)   
         
-        assert($ff.link(:name, "link_name").exists?)   
-        assert_false($ff.link(:name, "alsomissing").exists?)   
+        assert(browser.link(:name, "link_name").exists?)   
+        assert_false(browser.link(:name, "alsomissing").exists?)   
         
-        assert($ff.link(:name, /_n/).exists?)   
-        assert_false($ff.link(:name, /missing/).exists?)   
+        assert(browser.link(:name, /_n/).exists?)   
+        assert_false(browser.link(:name, /missing/).exists?)   
         
-        assert($ff.link(:title, /ti/).exists?)   
-        assert($ff.link(:title, "link_title").exists?)   
+        assert(browser.link(:title, /ti/).exists?)   
+        assert(browser.link(:title, "link_title").exists?)   
         
-        assert_false($ff.link(:title, /missing/).exists?)   
+        assert_false(browser.link(:title, /missing/).exists?)   
         
-        assert($ff.link(:url, /_pass/).exists?)   
-        assert_false($ff.link(:url, /dont_exist/).exists?)   
+        assert(browser.link(:url, /_pass/).exists?)   
+        assert_false(browser.link(:url, /dont_exist/).exists?)   
     end
     
     def test_link_click
-        $ff.link(:text, "test1").click
-        assert( $ff.text.include?("Links2-Pass") ) 
+        browser.link(:text, "test1").click
+        assert( browser.text.include?("Links2-Pass") ) 
     end
     def test_link2_click    
-        $ff.link(:url, /link_pass.html/).click
-        assert( $ff.text.include?("Links3-Pass") ) 
+        browser.link(:url, /link_pass.html/).click
+        assert( browser.text.include?("Links3-Pass") ) 
     end
     def test_link3_click        
-        $ff.link(:index, 1).click
-        assert( $ff.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" ) {   $ff.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" ) {   $ff.link(:index, 199).href }  
-        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ff.link(:index, 199).value}  
-        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ff.link(:index, 199).text }  
-        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ff.link(:index, 199).name }  
-        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ff.link(:index, 199).id }  
-        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ff.link(:index, 199).disabled }  
-        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ff.link(:index, 199).type }  
-        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ff.link(:index, 199).class_name }  
-        
-        assert_match( /links2/ ,$ff.link(:index, 1).href )
-        assert_equal( ""      , $ff.link(:index, 1).value)
-        assert_equal( "test1" , $ff.link(:index, 1).text )
-        assert_equal( ""      , $ff.link(:index, 1).name )
-        assert_equal( ""      , $ff.link(:index, 1).id )
-        #assert_equal( false   , $ff.link(:index, 1).disabled )  
-        assert_equal( ""      , $ff.link(:index, 1).class_name)
-        assert_equal( "link_class_1"      , $ff.link(:index, 2).class_name)
-        
-        assert_equal( "link_id"   , $ff.link(:index, 6).id )
-        assert_equal( "link_name" , $ff.link(:index, 7).name )
-        
-        assert_equal( "" , $ff.link(:index, 7).title)
-        
-        assert_equal( "link_title" , $ff.link(:index, 8).title)
+        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   browser.link(:index, 199).href }  
+        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   browser.link(:index, 199).value}  
+        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   browser.link(:index, 199).text }  
+        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   browser.link(:index, 199).name }  
+        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   browser.link(:index, 199).id }  
+        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   browser.link(:index, 199).disabled }  
+        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   browser.link(:index, 199).type }  
+        assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   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).text )
+        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_text_attribute
-        arr1 = $ff.link(:text, "nameDelet").to_s
-        arr2 = $ff.link(:text, /Delet/).to_s
+        arr1 = browser.link(:text, "nameDelet").to_s
+        arr2 = browser.link(:text, /Delet/).to_s
         assert_equal(arr1, arr2)
         
     end
     
     def test_link_iterator
-        assert_equal(11, $ff.links.length )
-        assert_equal("Link Using a name" , $ff.links[7].text)
+        assert_equal(11, browser.links.length )
+        assert_equal("Link Using a name" , browser.links[7].text)
         
         index = 1
-        $ff.links.each do |link|
-            assert_equal( $ff.link(:index, index).href      , link.href )
-            assert_equal( $ff.link(:index, index).id        , link.id )
-            assert_equal( $ff.link(:index, index).name      , link.name )
-            assert_equal( $ff.link(:index, index).innerText , link.text )
+        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.text )
             index+=1
         end
     end
     
     def test_div_xml_bug
-        $ff.goto($htmlRoot + "div_xml.html")
-        assert_nothing_raised {$ff.link(:text, 'Create').exists? }   
+        goto_page("div_xml.html")
+        assert_nothing_raised {browser.link(:text, 'Create').exists? }   
     end
     def test_link_to_s
-       puts  $ff.link(:id,"linktos").to_s
+       puts  browser.link(:id,"linktos").to_s
     end
 end
 
 class TC_Frame_Links < Test::Unit::TestCase
-    include FireWatir
+    
     
     def setup()
-        $ff.goto($htmlRoot + "frame_links.html")
+        goto_page("frame_links.html")
     end
 
     def test_new_frame_link_exists
-        assert($ff.frame("buttonFrame").link(:text, "test1").exists?)   
+        assert(browser.frame("buttonFrame").link(:text, "test1").exists?)   
     end
     def test_missing_frame_links_dont_exist        
-        assert_false($ff.frame("buttonFrame").link(:text, "missing").exists?)
-        assert_raise(UnknownFrameException, "UnknownFrameException was supposed to be thrown"){$ff.frame("missing").link(:text, "test1").exists?}
+        assert_false(browser.frame("buttonFrame").link(:text, "missing").exists?)
+        assert_raise(UnknownFrameException, "UnknownFrameException was supposed to be thrown"){browser.frame("missing").link(:text, "test1").exists?}
     end
     
     def test_links_in_frames
-        assert($ff.frame("buttonFrame").link(:text, "test1").exists?)   
-        assert_false($ff.frame("buttonFrame").link(:text, "missing").exists?)   
+        assert(browser.frame("buttonFrame").link(:text, "test1").exists?)   
+        assert_false(browser.frame("buttonFrame").link(:text, "missing").exists?)   
         
-        assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) { $ff.frame("buttonFrame").link(:index, 199).href }  
-        assert_match(/links2/, $ff.frame("buttonFrame").link(:index, 1).href)
+        assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) { browser.frame("buttonFrame").link(:index, 199).href }  
+        assert_match(/links2/, browser.frame("buttonFrame").link(:index, 1).href)
         
         count =0
-        $ff.frame("buttonFrame").links.each do |l|
+        browser.frame("buttonFrame").links.each do |l|
             count+=1
         end
         
@@ -172,13 +173,14 @@ class TC_Frame_Links < Test::Unit::TestCase
 end
 
 class TC_Links_Display < Test::Unit::TestCase
-  include FireWatir
+  
   include MockStdoutTestCase
 
+  tag_method :test_showLinks, :fails_on_ie
   def test_showLinks
-    $ff.goto($htmlRoot + "links1.html")
+    goto_page("links1.html")
     $stdout = @mockout
-    $ff.showLinks
+    browser.showLinks
     assert_equal(<<END_OF_MESSAGE, @mockout)
 There are 11 links
 link:  name: