firewatir 1.2.1 → 1.6.2

data/unittests/setup.rb

@@ -1,35 +1,30 @@
-END {$ff.close if $ff} # close ff at completion of the tests
+$SETUP_LOADED = true
 
-# libraries used by feature tests
-require 'firewatir'
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'firewatir/testUnitAddons'
-require 'unittests/iostring'
+$myDir = File.expand_path(File.dirname(__FILE__))
 
 topdir = File.join(File.dirname(__FILE__), '..')
-Dir.chdir topdir do
-  $all_tests = Dir["unittests/*_test.rb"]
+$firewatir_dev_lib = File.join(topdir, 'lib')
+$watir_dev_lib = File.join(topdir, '..', 'watir', 'lib')
+libs = []
+libs << File.join(topdir, '..', 'watir-common', 'lib')
+libs << File.join(topdir, '..', 'watir-common') # for the unit tests
+libs.each { |lib| $LOAD_PATH.unshift File.expand_path(lib) }
+
+require 'watir'
+Watir::Browser.default = 'firefox'
+require 'unittests/setup/lib'
+module Watir::UnitTest
+  alias :uses_page :goto_page
 end
-$non_core_tests = [  ].collect {|x| "unittests/#{x}_test.rb"}
 
-$core_tests = $all_tests - $non_core_tests
+require 'unittests/setup/testUnitAddons'
+require 'unittests/iostring'
 
-def start_ff_with_logger
-  $ff = FireWatir::Firefox.new()
-#  $ff.logger = Watir::WatirLogger.new( 'debug.txt', 4, 10000 )
-  #$ff.set_fast_speed
+commondir = File.join(topdir, '..', 'watir-common')
+$all_tests = []
+Dir.chdir topdir do
+  $all_tests += Dir["unittests/*_test.rb"]
 end
-
-def set_local_dir
-  $myDir = File.expand_path(File.dirname(__FILE__))
-  $myDir.sub!( %r{/cygdrive/(\w)/}, '\1:/' ) # convert from cygwin to dos
-  # if you run the unit tests form a local file system use this line
-  $htmlRoot =  "file://#{$myDir}/html/" 
-  # if you run the unit tests from a web server use this line
-  #   $htmlRoot =  "http://localhost:8080/watir/html/"
+Dir.chdir commondir do
+  $all_tests += Dir["unittests/*_test.rb"]
 end
-
-start_ff_with_logger
-set_local_dir
-

data/unittests/table_test.rb

@@ -1,42 +1,43 @@
 # feature tests for Tables
 # 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_Tables < Test::Unit::TestCase
-  include FireWatir
+  
   
   def setup
-    $ff.goto($htmlRoot + "table1.html")
+    goto_page("table1.html")
   end
   
   def test_Table_Exists
-    assert(!$ff.table(:id, 'missingTable').exists?)
-    assert(!$ff.table(:index, 33).exists?)
+    assert_false(browser.table(:id, 'missingTable').exists?)
+    assert_false(browser.table(:index, 33).exists?)
     
-    assert($ff.table(:id, 't1').exists?)
-    assert($ff.table(:id, /t/).exists?)
-    assert(!$ff.table(:id, /missing_table/).exists?)
+    assert(browser.table(:id, 't1').exists?)
+    assert(browser.table(:id, /t/).exists?)
+    assert_false(browser.table(:id, /missing_table/).exists?)
     
-    assert($ff.table(:index, 1).exists?)
-    assert($ff.table(:index, 2).exists?)
+    assert(browser.table(:index, 1).exists?)
+    assert(browser.table(:index, 2).exists?)
   end
   
+  tag_method :test_rows, :fails_on_ie
   def test_rows
-    assert_raises(UnknownObjectException ){ $ff.table(:id, 'missingTable').row_count }
-    assert_raises(UnknownObjectException ){ $ff.table(:index, 66).row_count }
-    assert_raises(UnknownObjectException){ $ff.table(:bad_attribute, 99).row_count }
+    assert_raises(UnknownObjectException ){ browser.table(:id, 'missingTable').row_count }
+    assert_raises(UnknownObjectException ){ browser.table(:index, 66).row_count }
+    assert_raises(UnknownObjectException){ browser.table(:bad_attribute, 99).row_count }
     
-    assert_equal(2, $ff.table(:index, 1).row_count)
-    assert_equal(2, $ff.table(:index, 1).rows.length)
+    assert_equal(2, browser.table(:index, 1).row_count)
+    assert_equal(2, browser.table(:index, 1).rows.length)
     
-    assert_equal(5, $ff.table(:id, 't1').row_count)  # 4 rows and a header 
-    assert_equal(5, $ff.table(:index, 2).row_count)  # same table as above, just accessed by index 
-    assert_equal(5, $ff.table(:id, 't1').rows.length)   
+    assert_equal(5, browser.table(:id, 't1').row_count)  # 4 rows and a header 
+    assert_equal(5, browser.table(:index, 2).row_count)  # same table as above, just accessed by index 
+    assert_equal(5, browser.table(:id, 't1').rows.length)   
     
     # test the each iterator on rows - ie, go through each cell
-    row = $ff.table(:index, 2)[2]
+    row = browser.table(:index, 2)[2]
     count = 1
     row.each do |cell|
       if count == 1
@@ -47,31 +48,31 @@ class TC_Tables < Test::Unit::TestCase
       count += 1
     end
     assert_equal(2, count -1)
-    assert_equal(2, $ff.table(:index, 2)[2].column_count)        
+    assert_equal(2, browser.table(:index, 2)[2].column_count)        
   end
   
   def test_dynamic_tables
-    t = $ff.table(:id, 't1')
+    t = browser.table(:id, 't1')
     assert_equal(5, t.row_count)
     
-    $ff.button(:value, 'add row').click
+    browser.button(:value, 'add row').click
     assert_equal(6, t.row_count)
   end
   
   def test_columns
-    assert_raises(UnknownObjectException  ){ $ff.table(:id, 'missingTable').column_count }
-    assert_raises(UnknownObjectException  ){ $ff.table(:index, 77).column_count }
-    assert_equal(2, $ff.table(:index, 1).column_count)
-    assert_equal(1, $ff.table(:id, 't1').column_count)   # row one has 1 cell with a colspan of 2
+    assert_raises(UnknownObjectException  ){ browser.table(:id, 'missingTable').column_count }
+    assert_raises(UnknownObjectException  ){ browser.table(:index, 77).column_count }
+    assert_equal(2, browser.table(:index, 1).column_count)
+    assert_equal(1, browser.table(:id, 't1').column_count)   # row one has 1 cell with a colspan of 2
   end
   
   def test_to_a
     table1Expected = [ ["Row 1 Col1" , "Row 1 Col2"] ,[ "Row 2 Col1" , "Row 2 Col2"] ]
-    assert_equal(table1Expected, $ff.table(:index , 1).to_a )
+    assert_equal(table1Expected, browser.table(:index , 1).to_a )
   end
   
   def test_links_and_images_in_table
-    table = $ff.table(:id, 'pic_table')
+    table = browser.table(:id, 'pic_table')
     image = table[1][2].image(:index,1)
     assert_equal("106", image.width)
     
@@ -80,24 +81,24 @@ class TC_Tables < Test::Unit::TestCase
   end
   
   def test_cell_directly
-    assert( $ff.cell(:id, 'cell1').exists? )
-    assert(! $ff.cell(:id, 'no_exist').exists? )
-    assert_equal( "Row 1 Col1",  $ff.cell(:id, 'cell1').to_s.strip )
+    assert( browser.cell(:id, 'cell1').exists? )
+    assert_false( browser.cell(:id, 'no_exist').exists? )
+    assert_equal( "Row 1 Col1",  browser.cell(:id, 'cell1').to_s.strip )
     
     # not really cell directly, but just to show another way of geting the cell
-    assert_equal( "Row 1 Col1",  $ff.table(:index,1)[1][1].to_s.strip )
-    assert_equal(2, $ff.cell(:id, "cell_with_colspan").colspan)
+    assert_equal( "Row 1 Col1",  browser.table(:index,1)[1][1].to_s.strip )
+    assert_equal(2, browser.cell(:id, "cell_with_colspan").colspan)
   end
   
   def test_row_directly
-    assert( $ff.row(:id, 'row1').exists? )  
-    assert(! $ff.row(:id, 'no_exist').exists? )
+    assert( browser.row(:id, 'row1').exists? )  
+    assert_false( browser.row(:id, 'no_exist').exists? )
     
-    assert_equal('Row 2 Col1' ,  $ff.row(:id, 'row1')[1].to_s.strip )
+    assert_equal('Row 2 Col1' ,  browser.row(:id, 'row1')[1].to_s.strip )
   end
   
   def test_row_iterator
-    t = $ff.table(:index, 1)
+    t = browser.table(:index, 1)
     count = 1 
     t.each do |row|
       if count == 1
@@ -112,7 +113,7 @@ class TC_Tables < Test::Unit::TestCase
   end
   
   def test_row_collection
-    t = $ff.table(:index,1)
+    t = browser.table(:index,1)
     count = 1
     t.rows.each do |row|
       if count == 1
@@ -127,11 +128,11 @@ class TC_Tables < Test::Unit::TestCase
   end 
   
   #def test_table_body
-  #  assert_equal( 1, $ff.table(:index,1).bodies.length )
-  #  assert_equal( 3, $ff.table(:id, 'body_test' ).bodies.length )
+  #  assert_equal( 1, browser.table(:index,1).bodies.length )
+  #  assert_equal( 3, browser.table(:id, 'body_test' ).bodies.length )
   #  
   #  count = 1
-  #  $ff.table(:id, 'body_test').bodies.each do |n|
+  #  browser.table(:id, 'body_test').bodies.each do |n|
   #    
   #    # do something better here!
       # n.flash # this line commented out to speed up the test
@@ -149,13 +150,13 @@ class TC_Tables < Test::Unit::TestCase
   #    
   #    count += 1
   #  end
-  #  assert_equal( count - 1, $ff.table(:id, 'body_test').bodies.length )
+  #  assert_equal( count - 1, browser.table(:id, 'body_test').bodies.length )
   #  
-  #  assert_equal( "This text is in the THIRD TBODY." ,$ff.table(:id, 'body_test' ).body(:index,3)[1][1].to_s.strip ) 
+  #  assert_equal( "This text is in the THIRD TBODY." ,browser.table(:id, 'body_test' ).body(:index,3)[1][1].to_s.strip ) 
   #  
   #  # iterate through all the rows in a table body
   #  count = 1
-  #  $ff.table(:id, 'body_test').body(:index, 2).each do | row |
+  #  browser.table(:id, 'body_test').body(:index, 2).each do | row |
   #    # row.flash    # this line commented out, to speed up the tests
   #    if count == 1
   #      assert_equal('This text is in the SECOND TBODY.', row[1].text.strip )
@@ -167,19 +168,19 @@ class TC_Tables < Test::Unit::TestCase
   #end
   
   def test_table_container
-    assert_nothing_raised { $ff.table(:id, 't1').html }
+    assert_nothing_raised { browser.table(:id, 't1').html }
   end
 end    
 
 class TC_Tables_Simple < Test::Unit::TestCase
-  include FireWatir
+  
   
   def setup
-    $ff.goto($htmlRoot + "simple_table.html")
+    goto_page("simple_table.html")
   end
   
   def test_simple_table_access
-    table = $ff.table(:index,1)
+    table = browser.table(:index,1)
     
     assert_equal("Row 3 Col1",table[3][1].text.strip)
     assert_equal("Row 1 Col1",table[1][1].text.strip)
@@ -189,47 +190,47 @@ class TC_Tables_Simple < Test::Unit::TestCase
 end
 
 class TC_Tables_Buttons < Test::Unit::TestCase
-  include FireWatir
+  
   
   def setup
-    $ff.goto($htmlRoot + "simple_table_buttons.html")
+    goto_page("simple_table_buttons.html")
   end
   
   def test_simple_table_buttons
-    table = $ff.table(:index,1)
+    table = browser.table(:index,1)
     
     table[1][1].button(:index,1).click
-    assert($ff.text_field(:name,"confirmtext").verify_contains(/CLICK1/i))
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/CLICK1/i))
     table[2][1].button(:index,1).click
-    assert($ff.text_field(:name,"confirmtext").verify_contains(/CLICK2/i))
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/CLICK2/i))
     
     table[1][1].button(:id,'b1').click
-    assert($ff.text_field(:name,"confirmtext").verify_contains(/CLICK1/i))
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/CLICK1/i))
     
     assert_raises(UnknownObjectException   ) { table[1][1].button(:id,'b_missing').click }
     
     table[3][1].button(:index,2).click
-    assert($ff.text_field(:name,"confirmtext").verify_contains(/TOO/i))
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/TOO/i))
     
     table[3][1].button(:value ,"Click too").click
-    assert($ff.text_field(:name,"confirmtext").verify_contains(/TOO/i))
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/TOO/i))
     
-    $ff.table(:index,1)[4][1].text_field(:index,1).set("123")
-    assert($ff.text_field(:index,2).verify_contains("123"))
+    browser.table(:index,1)[4][1].text_field(:index,1).set("123")
+    assert(browser.text_field(:index,2).verify_contains("123"))
     
     # check when a cell contains 2 objects
     
     # if there were 2 different html objects in the same cell, some weird things happened ( button caption could change for example)
-    assert_equal( 'Click ->' , $ff.table(:index,1)[5][1].text_field(:index,1).value )
-    $ff.table(:index,1)[5][1].text_field(:index,1).click
-    assert_equal( 'Click ->' , $ff.table(:index,1)[5][1].text_field(:index,1).value )
+    assert_equal( 'Click ->' , browser.table(:index,1)[5][1].text_field(:index,1).value )
+    browser.table(:index,1)[5][1].text_field(:index,1).click
+    assert_equal( 'Click ->' , browser.table(:index,1)[5][1].text_field(:index,1).value )
     
-    $ff.table(:index,1)[5][1].button(:index,1).click
-    assert_equal( '' , $ff.table(:index,1)[5][1].text_field(:index,1).value )
+    browser.table(:index,1)[5][1].button(:index,1).click
+    assert_equal( '' , browser.table(:index,1)[5][1].text_field(:index,1).value )
   end
   
   def test_simple_table_gif
-    table = $ff.table(:index,2)
+    table = browser.table(:index,2)
     
     assert_match( /1\.gif/   , table[1][1].image( :index,1).src  )
     assert_match( /2\.gif/   , table[1][2].image( :index ,1).src )
@@ -239,7 +240,7 @@ class TC_Tables_Buttons < Test::Unit::TestCase
     assert_match( /2\.gif/   , table[3][2].image( :index ,1).src )
     assert_match( /3\.gif/   , table[3][3].image( :index ,1).src  )
     
-    table = $ff.table(:index,3)
+    table = browser.table(:index,3)
     assert_match( /1\.gif/   , table[1][1].image( :index ,1).src  )
     assert_match( /2\.gif/   , table[1][1].image( :index ,2).src )
     assert_match( /3\.gif/   , table[1][1].image( :index ,3).src )
@@ -250,7 +251,7 @@ class TC_Tables_Buttons < Test::Unit::TestCase
   end
   
   def test_table_with_hidden_or_visible_rows
-    t = $ff.table(:id , 'show_hide')
+    t = browser.table(:id , 'show_hide')
     
     # expand the table
     t.each do |r|
@@ -266,61 +267,61 @@ class TC_Tables_Buttons < Test::Unit::TestCase
   end
   
 #  def test_table_from_element
-#    button = $ff.button(:id, "b1")
-#    table = Table.create_from_element($ff, button)
+#    button = browser.button(:id, "b1")
+#    table = Table.create_from_element(browser, button)
     
 #    table[2][1].button(:index, 1).click
-#    assert($ff.textField(:name, "confirmtext").verify_contains(/CLICK2/i))
+#    assert(browser.textField(:name, "confirmtext").verify_contains(/CLICK2/i))
 #  end
 end
 
 class TC_Table_Columns < Test::Unit::TestCase
-  include FireWatir
+  
   def setup
-    $ff.goto($htmlRoot + "simple_table_columns.html")
+    goto_page("simple_table_columns.html")
   end
   
 #  def test_get_columnvalues_single_column
-#    assert_equal(["R1C1", "R2C1", "R3C1"], $ff.table(:index, 1).column_values(1))
+#    assert_equal(["R1C1", "R2C1", "R3C1"], browser.table(:index, 1).column_values(1))
 #  end
 
   def test_colspan
-    assert_equal(2, $ff.table(:index, 3)[2][1].colspan)
-    assert_equal(1, $ff.table(:index, 3)[1][1].colspan)
-    assert_equal(3, $ff.table(:index, 3)[4][1].colspan)
+    assert_equal(2, browser.table(:index, 3)[2][1].colspan)
+    assert_equal(1, browser.table(:index, 3)[1][1].colspan)
+    assert_equal(3, browser.table(:index, 3)[4][1].colspan)
   end
 
   def test_get_columnvalues_multiple_column
-    assert_equal(["R1C1", "R2C1", "R3C1"], $ff.table(:index, 2).column_values(1))
-    assert_equal(["R1C3", "R2C3", "R3C3"], $ff.table(:index, 2).column_values(3))
+    assert_equal(["R1C1", "R2C1", "R3C1"], browser.table(:index, 2).column_values(1))
+    assert_equal(["R1C3", "R2C3", "R3C3"], browser.table(:index, 2).column_values(3))
   end
 
   def test_get_columnvalues_with_colspan
-    assert_equal(["R1C1", "R2C1", "R3C1", "R4C1", "R5C1", "R6C2"], $ff.table(:index, 3).column_values(1))
+    assert_equal(["R1C1", "R2C1", "R3C1", "R4C1", "R5C1", "R6C2"], browser.table(:index, 3).column_values(1))
   end
 
   def test_get_rowvalues_full_row
-    assert_equal(["R1C1", "R1C2", "R1C3"], $ff.table(:index, 3).row_values(1))
+    assert_equal(["R1C1", "R1C2", "R1C3"], browser.table(:index, 3).row_values(1))
   end
 
   def test_get_rowvalues_with_colspan
-    assert_equal(["R2C1", "R2C2"], $ff.table(:index, 3).row_values(2))
+    assert_equal(["R2C1", "R2C2"], browser.table(:index, 3).row_values(2))
   end
 
   def test_getrowvalues_with_rowspan
-    assert_equal(["R5C1", "R5C2", "R5C3"], $ff.table(:index, 3).row_values(5))
-    assert_equal(["R6C2", "R6C3"], $ff.table(:index, 3).row_values(6))
+    assert_equal(["R5C1", "R5C2", "R5C3"], browser.table(:index, 3).row_values(5))
+    assert_equal(["R6C2", "R6C3"], browser.table(:index, 3).row_values(6))
   end
 end
 
 class TC_Tables_Complex < Test::Unit::TestCase
-  include FireWatir
+  
   def setup
-    $ff.goto($htmlRoot + "complex_table.html")
+    goto_page("complex_table.html")
   end
 
   def test_complex_table_access
-    table = $ff.table(:index,1)
+    table = browser.table(:index,1)
     
     assert_equal("subtable1 Row 1 Col1",table[1][1].table(:index,1)[1][1].text.strip)
     assert_equal("subtable1 Row 1 Col2",table[1][1].table(:index,1)[1][2].text.strip)
@@ -330,13 +331,13 @@ class TC_Tables_Complex < Test::Unit::TestCase
 end
 
 class TC_Tables_Display < Test::Unit::TestCase
-  include FireWatir
   include MockStdoutTestCase
 
+  tag_method :test_showTables, :fails_on_ie
   def test_showTables
-    $ff.goto($htmlRoot + "table1.html")
+    goto_page("table1.html")
     $stdout = @mockout
-    $ff.showTables
+    browser.showTables
     assert_equal(<<END_OF_MESSAGE, @mockout)
 There are 7 tables
 table:   id: tblTest

data/unittests/table_xpath_test.rb

@@ -1,40 +1,41 @@
 # feature tests for Tables
 # 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_Tables_XPath < Test::Unit::TestCase
-  include FireWatir
+  
   
   def setup
-    $ff.goto($htmlRoot + "table1.html")
+    goto_page("table1.html")
   end
   
   def test_Table_Exists
-    assert(!$ff.table(:xpath , "//table[@id = 'missingTable']").exists?)
-    assert($ff.table(:xpath, "//table[@id = 't1']").exists?)
+    assert_false(browser.table(:xpath , "//table[@id = 'missingTable']").exists?)
+    assert(browser.table(:xpath, "//table[@id = 't1']").exists?)
   end
 
+  tag_method :test_element_by_xpath_class, :fails_on_ie
   def test_element_by_xpath_class
-    element = $ff.element_by_xpath("//table[@id = 't1']")
-    assert(element.instance_of?(Table),"element class should be #{Table}; got #{element.class}")
+    element = browser.element_by_xpath("//table[@id = 't1']")
+    assert_class(element, 'Table')
     # FIXME really bizarre: this one should be a Table, but 
     # Firefox.element_factory gets HTMLAnchorElement as input
     # TODO: If element is not present, this should return null or raises exception
-    #element = $ff.element_by_xpath("//table[@id = 'missingTable']")
+    #element = browser.element_by_xpath("//table[@id = 'missingTable']")
     #assert(element.instance_of?(Table),"element class should be #{Table}; got #{element.class}")
   end
   
   def test_rows
-    assert_raises(UnknownObjectException ){ $ff.table(:xpath, "//table[@id = 'missingTable']").row_count }
-    assert_raises(UnknownObjectException){ $ff.table(:xpath, "//table[@bad_attribute = 99]").row_count }
+    assert_raises(UnknownObjectException ){ browser.table(:xpath, "//table[@id = 'missingTable']").row_count }
+    assert_raises(UnknownObjectException){ browser.table(:xpath, "//table[@bad_attribute = 99]").row_count }
     
-    assert_equal(5, $ff.table(:xpath, "//table[@id = 't1']").row_count)  # 4 rows and a header 
-    assert_equal(5, $ff.table(:xpath, "//table[@id = 't1']").rows.length)   
+    assert_equal(5, browser.table(:xpath, "//table[@id = 't1']").row_count)  # 4 rows and a header 
+    assert_equal(5, browser.table(:xpath, "//table[@id = 't1']").rows.length)   
     
     # test the each iterator on rows - ie, go through each cell
-    row = $ff.table(:xpath, "//table[@id = 't1']")[2]
+    row = browser.table(:xpath, "//table[@id = 't1']")[2]
     count = 1
     row.each do |cell|
       if count == 1
@@ -45,29 +46,29 @@ class TC_Tables_XPath < Test::Unit::TestCase
       count += 1
     end
     assert_equal(2, count -1)
-    assert_equal(2, $ff.table(:xpath, "//table[@id = 't1']")[2].column_count)        
+    assert_equal(2, browser.table(:xpath, "//table[@id = 't1']")[2].column_count)        
   end
   
   def test_dynamic_tables
-    t = $ff.table(:xpath, "//table[@id = 't1']")
+    t = browser.table(:xpath, "//table[@id = 't1']")
     assert_equal(5, t.row_count)
     
-    $ff.button(:xpath, "//input[@value = 'add row']").click
+    browser.button(:xpath, "//input[@value = 'add row']").click
     assert_equal(6, t.row_count)
   end
   
   def test_columns
-    assert_raises(UnknownObjectException  ){ $ff.table(:xpath, "//table[@id = 'missingTable']").column_count }
-    assert_equal(1, $ff.table(:xpath, "//table[@id = 't1']").column_count)   # row one has 1 cell with a colspan of 2
+    assert_raises(UnknownObjectException  ){ browser.table(:xpath, "//table[@id = 'missingTable']").column_count }
+    assert_equal(1, browser.table(:xpath, "//table[@id = 't1']").column_count)   # row one has 1 cell with a colspan of 2
   end
   
   def test_to_a
     table1Expected = [["Table 2"], ["Row 1 Col1" , "Row 1 Col2"] ,[ "Row 2 Col1" , "Row 2 Col2"],[ "Row 3 Col1" , "Row 3 Col2"],[ "Row 4 Col1" , "Row 4 Col2"] ]
-    assert_equal(table1Expected, $ff.table(:xpath, "//table[@id = 't1']").to_a )
+    assert_equal(table1Expected, browser.table(:xpath, "//table[@id = 't1']").to_a )
   end
   
   def test_links_and_images_in_table
-    table = $ff.table(:xpath, "//table[@id = 'pic_table']")
+    table = browser.table(:xpath, "//table[@id = 'pic_table']")
     image = table[1][2].image(:index,1)
     assert_equal("106", image.width)
     
@@ -76,23 +77,23 @@ class TC_Tables_XPath < Test::Unit::TestCase
   end
   
   #def test_cell_directly
-  #  assert( $ff.cell(:id, 'cell1').exists? )
-  #  assert(! $ff.cell(:id, 'no_exist').exists? )
-  #  assert_equal( "Row 1 Col1",  $ff.cell(:id, 'cell1').to_s.strip )
+  #  assert( browser.cell(:id, 'cell1').exists? )
+  #  assert_false( browser.cell(:id, 'no_exist').exists? )
+  #  assert_equal( "Row 1 Col1",  browser.cell(:id, 'cell1').to_s.strip )
   #  
   #  # not really cell directly, but just to show another way of geting the cell
-  #  assert_equal( "Row 1 Col1",  $ff.table(:index,1)[1][1].to_s.strip )
+  #  assert_equal( "Row 1 Col1",  browser.table(:index,1)[1][1].to_s.strip )
   #end
   
   #def test_row_directly
-  #  assert( $ff.row(:id, 'row1').exists? )  
-  #  assert(! $ff.row(:id, 'no_exist').exists? )
+  #  assert( browser.row(:id, 'row1').exists? )  
+  #  assert_false( browser.row(:id, 'no_exist').exists? )
   #  
-  #  assert_equal('Row 2 Col1' ,  $ff.row(:id, 'row1')[1].to_s.strip )
+  #  assert_equal('Row 2 Col1' ,  browser.row(:id, 'row1')[1].to_s.strip )
   #end
   
   def test_row_iterator
-    t = $ff.table(:xpath, "//table[@id = 't1']")
+    t = browser.table(:xpath, "//table[@id = 't1']")
     count = 1 
     t.each do |row|
       if count == 1
@@ -115,7 +116,7 @@ class TC_Tables_XPath < Test::Unit::TestCase
   end
   
   def test_row_collection
-    t = $ff.table(:xpath, "//table[@id = 't1']")
+    t = browser.table(:xpath, "//table[@id = 't1']")
     count = 1 
     t.rows.each do |row|
       if count == 1
@@ -138,11 +139,11 @@ class TC_Tables_XPath < Test::Unit::TestCase
   end
   
   #def test_table_body
-  #  assert_equal( 1, $ff.table(:index,1).bodies.length )
-  #  assert_equal( 3, $ff.table(:id, 'body_test' ).bodies.length )
+  #  assert_equal( 1, browser.table(:index,1).bodies.length )
+  #  assert_equal( 3, browser.table(:id, 'body_test' ).bodies.length )
   #  
   #  count = 1
-  #  $ff.table(:id, 'body_test').bodies.each do |n|
+  #  browser.table(:id, 'body_test').bodies.each do |n|
   #    
   #    # do something better here!
   #    # n.flash # this line commented out to speed up the test
@@ -160,13 +161,13 @@ class TC_Tables_XPath < Test::Unit::TestCase
   #    
   #    count += 1
   #  end
-  #  assert_equal( count - 1, $ff.table(:id, 'body_test').bodies.length )
+  #  assert_equal( count - 1, browser.table(:id, 'body_test').bodies.length )
   #  
-  #  assert_equal( "This text is in the THIRD TBODY." ,$ff.table(:id, 'body_test' ).body(:index,3)[1][1].to_s.strip ) 
+  #  assert_equal( "This text is in the THIRD TBODY." ,browser.table(:id, 'body_test' ).body(:index,3)[1][1].to_s.strip ) 
   #  
   #  # iterate through all the rows in a table body
   #  count = 1
-  #  $ff.table(:id, 'body_test').body(:index, 2).each do | row |
+  #  browser.table(:id, 'body_test').body(:index, 2).each do | row |
   #    # row.flash    # this line commented out, to speed up the tests
   #    if count == 1
   #      assert_equal('This text is in the SECOND TBODY.', row[1].text.strip )
@@ -178,7 +179,7 @@ class TC_Tables_XPath < Test::Unit::TestCase
  # end
   
   def test_table_container
-    assert_nothing_raised { $ff.table(:id, 't1').html }
+    assert_nothing_raised { browser.table(:id, 't1').html }
   end
 end