firewatir 1.2.1 → 1.6.2

data/unittests/frame_test.rb

@@ -1,49 +1,49 @@
 # feature tests for Frames
 # 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_Frames < Test::Unit::TestCase
-  include FireWatir
+  
   
   def setup
-    $ff.goto($htmlRoot + "frame_buttons.html")
+    goto_page("frame_buttons.html")
   end
   
   def test_frame_no_what
-    assert_raises(UnknownFrameException) { $ff.frame("missingFrame").button(:id, "b2").enabled?  }  
-    assert_raises(UnknownObjectException) { $ff.frame("buttonFrame2").button(:id, "b2").enabled?  }  
-    assert($ff.frame("buttonFrame").button(:id, "b2").enabled?)   
-    assert(!$ff.frame("buttonFrame").button(:caption, "Disabled Button").enabled?)
+    assert_raises(UnknownFrameException) { browser.frame("missingFrame").button(:id, "b2").enabled?  }  
+    assert_raises(UnknownObjectException) { browser.frame("buttonFrame2").button(:id, "b2").enabled?  }  
+    assert(browser.frame("buttonFrame").button(:id, "b2").enabled?)   
+    assert_false(browser.frame("buttonFrame").button(:caption, "Disabled Button").enabled?)
   end
   
   def test_frame_using_name
-    assert_raises(UnknownFrameException) { $ff.frame(:name , "missingFrame").button(:id, "b2").enabled?  }  
-    assert_raises(UnknownObjectException) { $ff.frame(:name, "buttonFrame2").button(:id, "b2").enabled?  }  
-    assert($ff.frame(:name, "buttonFrame").button(:id, "b2").enabled?)   
-    assert(!$ff.frame(:name , "buttonFrame").button(:caption, "Disabled Button").enabled?)
+    assert_raises(UnknownFrameException) { browser.frame(:name , "missingFrame").button(:id, "b2").enabled?  }  
+    assert_raises(UnknownObjectException) { browser.frame(:name, "buttonFrame2").button(:id, "b2").enabled?  }  
+    assert(browser.frame(:name, "buttonFrame").button(:id, "b2").enabled?)   
+    assert_false(browser.frame(:name , "buttonFrame").button(:caption, "Disabled Button").enabled?)
   end
   
   def test_frame_using_name_and_regexp
-    assert_raises(UnknownFrameException) { $ff.frame(:name , /missingFrame/).button(:id, "b2").enabled?  }  
-    assert($ff.frame(:name, /button/).button(:id, "b2").enabled?)   
+    assert_raises(UnknownFrameException) { browser.frame(:name , /missingFrame/).button(:id, "b2").enabled?  }  
+    assert(browser.frame(:name, /button/).button(:id, "b2").enabled?)   
   end
   
   def test_frame_using_index
-    assert_raises(UnknownFrameException) { $ff.frame(:index, 8).button(:id, "b2").enabled?  }  
-    assert_raises(UnknownObjectException) { $ff.frame(:index, 2).button(:id, "b2").enabled?  }  
-    assert($ff.frame(:index, 1 ).button(:id, "b2").enabled?)   
-    assert(!$ff.frame(:index, 1).button(:caption, "Disabled Button").enabled?)
+    assert_raises(UnknownFrameException) { browser.frame(:index, 8).button(:id, "b2").enabled?  }  
+    assert_raises(UnknownObjectException) { browser.frame(:index, 2).button(:id, "b2").enabled?  }  
+    assert(browser.frame(:index, 1 ).button(:id, "b2").enabled?)   
+    assert_false(browser.frame(:index, 1).button(:caption, "Disabled Button").enabled?)
   end
   
 #  def test_frame_with_invalid_attribute
-#    assert_raises(ArgumentError) { $ff.frame(:blah, 'no_such_thing').button(:id, "b2").enabled?  }  
+#    assert_raises(ArgumentError) { browser.frame(:blah, 'no_such_thing').button(:id, "b2").enabled?  }  
 #  end
   
   def test_preset_frame
     # with ruby's instance_eval, we are able to use the same frame for several actions
-    results = $ff.frame("buttonFrame").instance_eval do [
+    results = browser.frame("buttonFrame").instance_eval do [
      button(:id, "b2").enabled?, 
      button(:caption, "Disabled Button").enabled?
      ]
@@ -54,54 +54,54 @@ class TC_Frames < Test::Unit::TestCase
 end
 
 class TC_Frames2 < Test::Unit::TestCase
-  include FireWatir
+  
  
   def setup
-    $ff.goto($htmlRoot + "frame_multi.html")
+    goto_page("frame_multi.html")
   end
   
   def test_frame_with_no_name
-    assert_raises(UnknownFrameException) { $ff.frame(:name , "missingFrame").button(:id, "b2").enabled?  }  
+    assert_raises(UnknownFrameException) { browser.frame(:name , "missingFrame").button(:id, "b2").enabled?  }  
   end            
   
   def test_frame_by_id
-    assert_raises(UnknownFrameException) { $ff.frame(:id , "missingFrame").button(:id, "b2").enabled?  }  
-    assert($ff.frame(:id, 'first_frame').button(:id, "b2").enabled?)
-    assert(/.*Test page for buttons.*/ =~ $ff.frame(:id, 'first_frame').html)
+    assert_raises(UnknownFrameException) { browser.frame(:id , "missingFrame").button(:id, "b2").enabled?  }  
+    assert(browser.frame(:id, 'first_frame').button(:id, "b2").enabled?)
+    assert(/.*Test page for buttons.*/ =~ browser.frame(:id, 'first_frame').html)
   end
 end
 
 class TC_NestedFrames < Test::Unit::TestCase
-  include FireWatir
+  
   
   def setup
-    $ff.goto($htmlRoot + "nestedFrames.html")
+    goto_page("nestedFrames.html")
   end
   
   def test_frame
-    assert_raises(UnknownFrameException) { $ff.frame("missingFrame").button(:id, "b2").enabled?  }  
-    assert_raises(UnknownFrameException) { $ff.frame("nestedFrame").frame("subFrame").button(:id, "b2").enabled?  }  
-    assert($ff.frame("nestedFrame").frame("senderFrame").button(:name, "sendIt").enabled?)   
-    $ff.frame("nestedFrame").frame("senderFrame").text_field(:index, "1").set("Hello")
-    $ff.frame("nestedFrame").frame("senderFrame").button(:name, "sendIt").click
-    assert($ff.frame("nestedFrame").frame("receiverFrame").text_field(:name, "receiverText").verify_contains("Hello"))   
+    assert_raises(UnknownFrameException) { browser.frame("missingFrame").button(:id, "b2").enabled?  }  
+    assert_raises(UnknownFrameException) { browser.frame("nestedFrame").frame("subFrame").button(:id, "b2").enabled?  }  
+    assert(browser.frame("nestedFrame").frame("senderFrame").button(:name, "sendIt").enabled?)   
+    browser.frame("nestedFrame").frame("senderFrame").text_field(:index, "1").set("Hello")
+    browser.frame("nestedFrame").frame("senderFrame").button(:name, "sendIt").click
+    assert(browser.frame("nestedFrame").frame("receiverFrame").text_field(:name, "receiverText").verify_contains("Hello"))   
   end
   
 end
 
 class TC_IFrames < Test::Unit::TestCase
-  include FireWatir
+  
   
   def setup
-    $ff.goto($htmlRoot + "iframeTest.html")
+    goto_page("iframeTest.html")
   end
   
   def test_Iframe
-    f = $ff.frame("senderFrame")
+    f = browser.frame("senderFrame")
     f.text_field(:name, "textToSend").set("Hello World")
-    $ff.frame("senderFrame").text_field(:name , "textToSend").set( "Hello World")
-    $ff.frame("senderFrame").button(:index, 1).click
-    assert( $ff.frame("receiverFrame").text_field(:name , "receiverText").verify_contains("Hello World") )
+    browser.frame("senderFrame").text_field(:name , "textToSend").set( "Hello World")
+    browser.frame("senderFrame").button(:index, 1).click
+    assert( browser.frame("receiverFrame").text_field(:name , "receiverText").verify_contains("Hello World") )
   end
   
 end   
@@ -109,11 +109,12 @@ end
 require 'unittests/iostring'
 class TC_show_frames < Test::Unit::TestCase
   include MockStdoutTestCase                
+  tags :fails_on_ie
  
   def capture_and_compare(page, expected)
-    $ff.goto($htmlRoot + page)
+    goto_page(page)
     $stdout = @mockout
-    $ff.showFrames
+    browser.showFrames
     assert_equal(expected, @mockout)
   end
  

data/unittests/hidden_test.rb

@@ -1,73 +1,73 @@
 # feature tests for Input Hidden elements
 # 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_Hidden_Fields < Test::Unit::TestCase
     def setup
-        $ff.goto($htmlRoot + "forms3.html")
+        goto_page("forms3.html")
     end
     
     def test_hidden
         
         # test using index
-        assert( $ff.hidden(:index,1).exists? )
-        assert( $ff.hidden(:index,2).exists? )
-        assert_false( $ff.hidden(:index,3).exists? )
+        assert( browser.hidden(:index,1).exists? )
+        assert( browser.hidden(:index,2).exists? )
+        assert_false( browser.hidden(:index,3).exists? )
         
-        $ff.hidden(:index,1).value = 44
-        $ff.hidden(:index,2).value = 55
+        browser.hidden(:index,1).value = 44
+        browser.hidden(:index,2).value = 55
         
-        $ff.button(:value , "Show Hidden").click
+        browser.button(:value , "Show Hidden").click
        
-        assert_equal("44"  , $ff.text_field(:name , "vis1").value ) 
-        assert_equal("55"  , $ff.text_field(:name , "vis2").value )
+        assert_equal("44"  , browser.text_field(:name , "vis1").value ) 
+        assert_equal("55"  , browser.text_field(:name , "vis2").value )
                         
         # test using name and ID
-        assert( $ff.hidden(:name ,"hid1").exists? )
-        assert( $ff.hidden(:id,"hidden_1").exists? )
-        assert_false( $ff.hidden(:name,"hidden_44").exists? )
-        assert_false( $ff.hidden(:id,"hidden_55").exists? )
+        assert( browser.hidden(:name ,"hid1").exists? )
+        assert( browser.hidden(:id,"hidden_1").exists? )
+        assert_false( browser.hidden(:name,"hidden_44").exists? )
+        assert_false( browser.hidden(:id,"hidden_55").exists? )
         
-        $ff.hidden(:name ,"hid1").value = 444
-        $ff.hidden(:id,"hidden_1").value = 555
+        browser.hidden(:name ,"hid1").value = 444
+        browser.hidden(:id,"hidden_1").value = 555
         
-        $ff.button(:value , "Show Hidden").click
+        browser.button(:value , "Show Hidden").click
         
-        assert_equal("444"  , $ff.text_field(:name , "vis1").value ) 
-        assert_equal("555"  , $ff.text_field(:name ,"vis2").value )
+        assert_equal("444"  , browser.text_field(:name , "vis1").value ) 
+        assert_equal("555"  , browser.text_field(:name ,"vis2").value )
                 
         #  test the over-ridden append method
-        $ff.hidden(:name ,"hid1").append("a")
-        $ff.button(:value , "Show Hidden").click
-        assert_equal("444a"  , $ff.text_field(:name , "vis1").value ) 
-        assert_equal("555"  , $ff.text_field(:name ,"vis2").value )
+        browser.hidden(:name ,"hid1").append("a")
+        browser.button(:value , "Show Hidden").click
+        assert_equal("444a"  , browser.text_field(:name , "vis1").value ) 
+        assert_equal("555"  , browser.text_field(:name ,"vis2").value )
         
         #  test the over-ridden clear method
-        $ff.hidden(:name ,"hid1").clear
-        $ff.button(:value , "Show Hidden").click
-        assert_equal(""  , $ff.text_field(:name , "vis1").value ) 
-        assert_equal("555"  , $ff.text_field(:name ,"vis2").value )
+        browser.hidden(:name ,"hid1").clear
+        browser.button(:value , "Show Hidden").click
+        assert_equal(""  , browser.text_field(:name , "vis1").value ) 
+        assert_equal("555"  , browser.text_field(:name ,"vis2").value )
         
         # test using a form
-        assert( $ff.form(:name , "has_a_hidden").hidden(:name ,"hid1").exists? )
-        assert( $ff.form(:name , "has_a_hidden").hidden(:id,"hidden_1").exists? )
-        assert_false( $ff.form(:name , "has_a_hidden").hidden(:name,"hidden_44").exists? )
-        assert_false( $ff.form(:name , "has_a_hidden").hidden(:id,"hidden_55").exists? )
+        assert( browser.form(:name , "has_a_hidden").hidden(:name ,"hid1").exists? )
+        assert( browser.form(:name , "has_a_hidden").hidden(:id,"hidden_1").exists? )
+        assert_false( browser.form(:name , "has_a_hidden").hidden(:name,"hidden_44").exists? )
+        assert_false( browser.form(:name , "has_a_hidden").hidden(:id,"hidden_55").exists? )
         
-        $ff.form(:name , "has_a_hidden").hidden(:name ,"hid1").value = 222
-        $ff.form(:name , "has_a_hidden").hidden(:id,"hidden_1").value = 333
+        browser.form(:name , "has_a_hidden").hidden(:name ,"hid1").value = 222
+        browser.form(:name , "has_a_hidden").hidden(:id,"hidden_1").value = 333
         
-        $ff.button(:value , "Show Hidden").click
+        browser.button(:value , "Show Hidden").click
         
-        assert_equal("222"  , $ff.text_field(:name , "vis1").value ) 
-        assert_equal("333"  , $ff.text_field(:name ,"vis2").value )
+        assert_equal("222"  , browser.text_field(:name , "vis1").value ) 
+        assert_equal("333"  , browser.text_field(:name ,"vis2").value )
         
         # iterators
-        assert_equal(2, $ff.hiddens.length)
+        assert_equal(2, browser.hiddens.length)
         count =1
-        $ff.hiddens.each do |h|
+        browser.hiddens.each do |h|
             case count
             when 1
                 assert_equal( "", h.id)
@@ -79,7 +79,7 @@ class TC_Hidden_Fields < Test::Unit::TestCase
             count+=1
         end
         
-        assert_equal("hid1" , $ff.hiddens[1].name )
-        assert_equal("hidden_1" , $ff.hiddens[2].id )
+        assert_equal("hid1" , browser.hiddens[1].name )
+        assert_equal("hidden_1" , browser.hiddens[2].id )
     end
 end

data/unittests/hidden_xpath_test.rb

@@ -1,60 +1,60 @@
 # feature tests for Input Hidden elements
 # 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_Hidden_Fields_XPath < Test::Unit::TestCase
     def setup
-        $ff.goto($htmlRoot + "forms3.html")
+        goto_page("forms3.html")
     end
     
     def test_hidden
         
         # test using name and ID
-        assert( $ff.hidden(:xpath,"//input[@type='hidden' and @name='hid1']").exists? )
-        assert( $ff.hidden(:xpath,"//input[@type='hidden' and @id='hidden_1']").exists? )
-        assert_false( $ff.hidden(:xpath,"//input[@type='hidden' and @name='hidden_44']").exists? )
-        assert_false( $ff.hidden(:xpath,"//input[@type='hidden' and @id='hidden_55']").exists? )
+        assert( browser.hidden(:xpath,"//input[@type='hidden' and @name='hid1']").exists? )
+        assert( browser.hidden(:xpath,"//input[@type='hidden' and @id='hidden_1']").exists? )
+        assert_false( browser.hidden(:xpath,"//input[@type='hidden' and @name='hidden_44']").exists? )
+        assert_false( browser.hidden(:xpath,"//input[@type='hidden' and @id='hidden_55']").exists? )
         
-        $ff.hidden(:xpath,"//input[@type='hidden' and @name='hid1']").value = 444
-        $ff.hidden(:xpath,"//input[@type='hidden' and @id='hidden_1']").value = 555
+        browser.hidden(:xpath,"//input[@type='hidden' and @name='hid1']").value = 444
+        browser.hidden(:xpath,"//input[@type='hidden' and @id='hidden_1']").value = 555
         
-        $ff.button(:xpath , "//input[@type='button' and @value='Show Hidden']").click
+        browser.button(:xpath , "//input[@type='button' and @value='Show Hidden']").click
         
-        assert_equal("444"  , $ff.text_field(:xpath , "//input[@name='vis1']").value ) 
-        assert_equal("555"  , $ff.text_field(:xpath ,"//input[@name='vis2']").value )
+        assert_equal("444"  , browser.text_field(:xpath , "//input[@name='vis1']").value ) 
+        assert_equal("555"  , browser.text_field(:xpath ,"//input[@name='vis2']").value )
                 
         #  test the over-ridden append method
-        $ff.hidden(:xpath,"//input[@type='hidden' and @name='hid1']").append("a")
-        $ff.button(:xpath , "//input[@type='button' and @value='Show Hidden']").click
-        assert_equal("444a"  , $ff.text_field(:xpath , "//input[@name='vis1']").value ) 
-        assert_equal("555"  , $ff.text_field(:xpath ,"//input[@name='vis2']").value )
+        browser.hidden(:xpath,"//input[@type='hidden' and @name='hid1']").append("a")
+        browser.button(:xpath , "//input[@type='button' and @value='Show Hidden']").click
+        assert_equal("444a"  , browser.text_field(:xpath , "//input[@name='vis1']").value ) 
+        assert_equal("555"  , browser.text_field(:xpath ,"//input[@name='vis2']").value )
         
         #  test the over-ridden clear method
-        $ff.hidden(:xpath,"//input[@type='hidden' and @name='hid1']").clear
-        $ff.button(:xpath , "//input[@type='button' and @value='Show Hidden']").click
-        assert_equal(""  , $ff.text_field(:xpath , "//input[@name='vis1']").value ) 
-        assert_equal("555"  , $ff.text_field(:xpath ,"//input[@name='vis2']").value )
+        browser.hidden(:xpath,"//input[@type='hidden' and @name='hid1']").clear
+        browser.button(:xpath , "//input[@type='button' and @value='Show Hidden']").click
+        assert_equal(""  , browser.text_field(:xpath , "//input[@name='vis1']").value ) 
+        assert_equal("555"  , browser.text_field(:xpath ,"//input[@name='vis2']").value )
         
         # test using a form
-        #assert( $ff.form(:name , "has_a_hidden").hidden(:name ,"hid1").exists? )
-        #assert( $ff.form(:name , "has_a_hidden").hidden(:id,"hidden_1").exists? )
-        #assert_false( $ff.form(:name , "has_a_hidden").hidden(:name,"hidden_44").exists? )
-        #assert_false( $ff.form(:name , "has_a_hidden").hidden(:id,"hidden_55").exists? )
+        #assert( browser.form(:name , "has_a_hidden").hidden(:name ,"hid1").exists? )
+        #assert( browser.form(:name , "has_a_hidden").hidden(:id,"hidden_1").exists? )
+        #assert_false( browser.form(:name , "has_a_hidden").hidden(:name,"hidden_44").exists? )
+        #assert_false( browser.form(:name , "has_a_hidden").hidden(:id,"hidden_55").exists? )
         
-        #$ff.form(:name , "has_a_hidden").hidden(:name ,"hid1").value = 222
-        #$ff.form(:name , "has_a_hidden").hidden(:id,"hidden_1").value = 333
+        #browser.form(:name , "has_a_hidden").hidden(:name ,"hid1").value = 222
+        #browser.form(:name , "has_a_hidden").hidden(:id,"hidden_1").value = 333
         
-        #$ff.button(:value , "Show Hidden").click
+        #browser.button(:value , "Show Hidden").click
         
-        #assert_equal("222"  , $ff.text_field(:name , "vis1").value ) 
-        #assert_equal("333"  , $ff.text_field(:name ,"vis2").value )
+        #assert_equal("222"  , browser.text_field(:name , "vis1").value ) 
+        #assert_equal("333"  , browser.text_field(:name ,"vis2").value )
         
         # iterators
-        #assert_equal(2, $ff.hiddens.length)
+        #assert_equal(2, browser.hiddens.length)
         #count =1
-        #$ff.hiddens.each do |h|
+        #browser.hiddens.each do |h|
         #    case count
         #    when 1
         #        assert_equal( "", h.id)
@@ -66,7 +66,7 @@ class TC_Hidden_Fields_XPath < Test::Unit::TestCase
         #    count+=1
         #end
         
-        #assert_equal("hid1" , $ff.hiddens[1].name )
-        #assert_equal("hidden_1" , $ff.hiddens[2].id )
+        #assert_equal("hid1" , browser.hiddens[1].name )
+        #assert_equal("hidden_1" , browser.hiddens[2].id )
     end
 end

data/unittests/images_test.rb

@@ -1,16 +1,16 @@
 # 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 < Test::Unit::TestCase
-    include FireWatir
+    
     
     def setup
-        $ff.goto($htmlRoot + "images1.html")
+        goto_page("images1.html")
         @saved_img_path = build_path("sample.img.dat");
         clean_saved_image
     end
@@ -19,136 +19,136 @@ class TC_Images < Test::Unit::TestCase
         clean_saved_image
     end
 #    def test_show_all_objects
-#        $ff.show_all_objects
+#        browser.show_all_objects
 #    end
     
     def test_imageExists
-        assert( !  $ff.image(:name , "missing_name").exists?  )
-        assert(    $ff.image(:name , "circle").exists?  )
-        assert(    $ff.image(:name , /circ/ ).exists?  )
+        assert( !  browser.image(:name , "missing_name").exists?  )
+        assert(    browser.image(:name , "circle").exists?  )
+        assert(    browser.image(:name , /circ/ ).exists?  )
         
-        assert( !  $ff.image(:id , "missing_id").exists?  )
-        assert(    $ff.image(:id , "square").exists?  )
-        assert(    $ff.image(:id , /squ/ ).exists?  )
+        assert( !  browser.image(:id , "missing_id").exists?  )
+        assert(    browser.image(:id , "square").exists?  )
+        assert(    browser.image(:id , /squ/ ).exists?  )
         
-        assert( !  $ff.image(:src, "missingsrc.gif").exists?  )
+        assert( !  browser.image(:src, "missingsrc.gif").exists?  )
          
-        assert(    $ff.image(:src, /images\/triangle.jpg/).exists?  )
-        assert(    $ff.image(:src , /triangle/ ).exists?  )
+        assert(    browser.image(:src, /images\/triangle.jpg/).exists?  )
+        assert(    browser.image(:src , /triangle/ ).exists?  )
         
-        assert(    $ff.image(:alt , "circle" ).exists?  )
-        assert(    $ff.image(:alt , /cir/ ).exists?  )
+        assert(    browser.image(:alt , "circle" ).exists?  )
+        assert(    browser.image(:alt , /cir/ ).exists?  )
         
-        assert( !  $ff.image(:alt , "triangle" ).exists?  )
-        assert( !  $ff.image(:alt , /tri/ ).exists?  )
+        assert( !  browser.image(:alt , "triangle" ).exists?  )
+        assert( !  browser.image(:alt , /tri/ ).exists?  )
         
-        assert(    $ff.image(:title, 'square_image').exists? )
-        assert( !  $ff.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 ) { $ff.image(:name, "no_image_with_this").click }
-        assert_raises(UnknownObjectException ) { $ff.image(:id, "no_image_with_this").click }
-        assert_raises(UnknownObjectException ) { $ff.image(:src, "no_image_with_this").click}
-        assert_raises(UnknownObjectException ) { $ff.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
-        $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") )
-        assert($ff.contains_text("PASS") )
+        browser.image(:src, /button/).click
+        #assert(browser.text.include?("PASS") )
+        assert(browser.contains_text("PASS") )
     end
     
     # TODO: Need to see alternative for this in Mozilla
     #def test_imageHasLoaded
-    #    assert_raises(UnknownObjectException ) { $ff.image(:name, "no_image_with_this").hasLoaded? }
-    #    assert_raises(UnknownObjectException ) { $ff.image(:id, "no_image_with_this").hasLoaded? }
-    #    assert_raises(UnknownObjectException ) { $ff.image(:src, "no_image_with_this").hasLoaded? }
-    #    assert_raises(UnknownObjectException ) { $ff.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( ! $ff.image(:name, "themissingimage").hasLoaded?  )
-    #    assert( $ff.image(:name, "circle").hasLoaded?  )
+    #    assert( ! browser.image(:name, "themissingimage").hasLoaded?  )
+    #    assert( browser.image(:name, "circle").hasLoaded?  )
     #    
-    #    assert( $ff.image(:alt, "circle").hasLoaded?  )
-    #    assert( $ff.image(:alt, /cir/ ).hasLoaded?  )
+    #    assert( browser.image(: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(:name, "no_image_with_this").hasLoaded? }
-        #assert_raises(UnknownObjectException ) { $ff.image(:id, "no_image_with_this").hasLoaded? }
-        #assert_raises(UnknownObjectException ) { $ff.image(:src, "no_image_with_this").hasLoaded? }
-        #assert_raises(UnknownObjectException ) { $ff.image(:index, 82).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(:index, 82).hasLoaded? }
         
-        assert_raises(UnknownObjectException ) { $ff.image(:index, 82).name }
-        assert_raises(UnknownObjectException ) { $ff.image(:index, 82).id }
-        assert_raises(UnknownObjectException ) { $ff.image(:index, 82).src }
-        assert_raises(UnknownObjectException ) { $ff.image(:index, 82).value }
-        assert_raises(UnknownObjectException ) { $ff.image(:index, 82).height }
-        assert_raises(UnknownObjectException ) { $ff.image(:index, 82).width }
+        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 }
         
         # TODO: Need to see alternative for this in Mozilla
-        #assert_raises(UnknownObjectException ) { $ff.image(:index, 82).fileCreatedDate }
-        #assert_raises(UnknownObjectException ) { $ff.image(:index, 82).fileSize }
+        #assert_raises(UnknownObjectException ) { browser.image(:index, 82).fileCreatedDate }
+        #assert_raises(UnknownObjectException ) { browser.image(:index, 82).fileSize }
         
-        assert_raises(UnknownObjectException ) { $ff.image(:index, 82).alt}
-        assert_raises(UnknownObjectException ) { $ff.image(:index, 82).title}
+        assert_raises(UnknownObjectException ) { browser.image(:index, 82).alt}
+        assert_raises(UnknownObjectException ) { browser.image(:index, 82).title}
         
-        assert_equal( ""       , $ff.image(:index, 2).name ) 
-        assert_equal( "square" , $ff.image(:index, 2).id )
-        assert_match( /square\.jpg/i ,$ff.image(:index, 2).src )
-        assert_equal( "" , $ff.image(:index, 2).value )
-        assert_equal( "88" , $ff.image(:index, 2).height )
-        assert_equal( "88" , $ff.image(:index, 2).width )
+        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" , $ff.image(:index, 2).fileCreatedDate )
-        #assert_equal( "788",  $ff.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' , $ff.image(:index, 6).alt) 
-        assert_equal( ""      , $ff.image(:index, 2).alt) 
-        assert_equal('square_image', $ff.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)
 
         # to string tests -- output should be verified!
-        puts $ff.image(:name  , "circle").to_s
-        puts  $ff.image(:index , 2).to_s
+        puts browser.image(:name  , "circle").to_s
+        puts  browser.image(:index , 2).to_s
     end
     
     def test_image_iterator
-        assert_equal(6 , $ff.images.length)
-        assert_equal("" , $ff.images[2].name )
-        assert_equal("square", $ff.images[2].id )
-        assert_match(/square/, $ff.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
-        $ff.images.each do |i|
-            assert_equal( $ff.image(:index, index).id , i.id )
-            assert_equal( $ff.image(:index, index).name , i.name )
-            assert_equal( $ff.image(:index, index).src , i.src )
-            assert_equal( $ff.image(:index, index).height , i.height.to_s )
-            assert_equal( $ff.image(:index, index).width , i.width.to_s )
+        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.to_s )
+            assert_equal( browser.image(:index, index).width , i.width.to_s )
             
             index+=1
         end
-        assert_equal( index-1 , $ff.images.length )
+        assert_equal( index-1 , browser.images.length )
     end
     
     #def test_save_local_image
-    #   $ff.images[1].save(build_windows_path("sample.img.dat"))
-    #    assert(File.compare(@saved_img_path, $ff.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
@@ -165,13 +165,14 @@ class TC_Images < Test::Unit::TestCase
 end
 
 class TC_Images_Display < Test::Unit::TestCase
-  include FireWatir
+  
   include MockStdoutTestCase
 
+  tag_method :test_showImages, :fails_on_ie
   def test_showImages
-    $ff.goto($htmlRoot + "images1.html")
+    goto_page("images1.html")
     $stdout = @mockout
-    $ff.showImages
+    browser.showImages
     assert_equal(<<END_OF_MESSAGE, @mockout)
 There are 6 images
 image: name: