watir 1.5.6 → 1.6.2

data/unittests/selectbox_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Select Boxes
-# revision: $Revision: 1348 $
+# revision: $Revision: 1544 $
 
-$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_Selectbox_XPath < Test::Unit::TestCase
@@ -12,102 +12,102 @@ class TC_Selectbox_XPath < Test::Unit::TestCase
   end
   
   def test_textBox_Exists
-    assert($ie.select_list(:xpath, "//select[@name='sel1']/").exists?)   
-    assert(!$ie.select_list(:xpath, "//select[@name='missing']/").exists?)   
-    assert(!$ie.select_list(:xpath, "//select[@id='missing']/").exists?)   
+    assert(browser.select_list(:xpath, "//select[@name='sel1']/").exists?)   
+    assert_false(browser.select_list(:xpath, "//select[@name='missing']/").exists?)   
+    assert_false(browser.select_list(:xpath, "//select[@id='missing']/").exists?)   
   end
   
   def test_select_list_enabled
-    assert($ie.select_list(:xpath, "//select[@name='sel1']/").enabled?)   
-    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").enabled? }  
+    assert(browser.select_list(:xpath, "//select[@name='sel1']/").enabled?)   
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").enabled? }  
   end
   
   def test_select_list_getAllContents
-    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").getAllContents }  
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getAllContents }  
     assert_equal( ["Option 1" ,"Option 2" , "Option 3" , "Option 4"] , 
-    $ie.select_list(:xpath, "//select[@name='sel1']/").getAllContents)   
+    browser.select_list(:xpath, "//select[@name='sel1']/").getAllContents)   
   end
   
   def test_select_list_getSelectedItems
-    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
     assert_equal( ["Option 3" ] , 
-    $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
     assert_equal( ["Option 3" , "Option 6" ] , 
-    $ie.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
   end
   
   def test_clearSelection
-    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").clearSelection }  
-    $ie.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").clearSelection }  
+    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
     
     # the box sel1 has no ability to have a de-selected item
-    assert_equal( ["Option 3" ] , $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    assert_equal( ["Option 3" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
     
-    $ie.select_list(:xpath, "//select[@name='sel2']/").clearSelection
-    assert_equal( [ ] , $ie.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel2']/").clearSelection
+    assert_equal( [ ] , browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
   end
   
   def test_select_list_select
-    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
-    assert_raises(NoValueFoundException) { $ie.select_list(:xpath, "//select[@name='sel1']/").select("missing item") }  
-    assert_raises(NoValueFoundException) { $ie.select_list(:xpath, "//select[@name='sel1']/").select(/missing/) }  
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
+    assert_raises(NoValueFoundException) { browser.select_list(:xpath, "//select[@name='sel1']/").select("missing item") }  
+    assert_raises(NoValueFoundException) { browser.select_list(:xpath, "//select[@name='sel1']/").select(/missing/) }  
     
     # the select method keeps any currently selected items - use the clear selectcion method first
-    $ie.select_list(:xpath, "//select[@name='sel1']/").clearSelection
-    $ie.select_list(:xpath, "//select[@name='sel1']/").select("Option 1")
-    assert_equal( ["Option 1" ] , $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    browser.select_list(:xpath, "//select[@name='sel1']/").select("Option 1")
+    assert_equal( ["Option 1" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
     
-    $ie.select_list(:xpath, "//select[@name='sel1']/").clearSelection
-    $ie.select_list(:xpath, "//select[@name='sel1']/").select(/2/)
-    assert_equal( ["Option 2" ] , $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    browser.select_list(:xpath, "//select[@name='sel1']/").select(/2/)
+    assert_equal( ["Option 2" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
     
-    $ie.select_list(:xpath, "//select[@name='sel2']/").clearSelection
-    $ie.select_list(:xpath, "//select[@name='sel2']/").select( /2/ )
-    $ie.select_list(:xpath, "//select[@name='sel2']/").select( /4/ )
+    browser.select_list(:xpath, "//select[@name='sel2']/").clearSelection
+    browser.select_list(:xpath, "//select[@name='sel2']/").select( /2/ )
+    browser.select_list(:xpath, "//select[@name='sel2']/").select( /4/ )
     assert_equal( ["Option 2" , "Option 4" ] , 
-    $ie.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
     
     # these are to test the onchange event
     # the event shouldnt get fired, as this is the selected item
-    $ie.select_list(:xpath, "//select[@name='sel3']/").select( /3/ )
-    assert(!$ie.text.include?("Pass") )
+    browser.select_list(:xpath, "//select[@name='sel3']/").select( /3/ )
+    assert_false(browser.text.include?("Pass") )
   end
   
   def test_select_list_select2
     # the event should get fired
-    $ie.select_list(:xpath, "//select[@name='sel3']/").select( /2/ )
-    assert($ie.text.include?("PASS") )
+    browser.select_list(:xpath, "//select[@name='sel3']/").select( /2/ )
+    assert(browser.text.include?("PASS") )
   end
   
   def test_select_list_select_using_value
-    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
-    assert_raises(NoValueFoundException) { $ie.select_list(:xpath, "//select[@name='sel1']/").select_value("missing item") }  
-    assert_raises(NoValueFoundException) { $ie.select_list(:xpath, "//select[@name='sel1']/").select_value(/missing/) }  
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
+    assert_raises(NoValueFoundException) { browser.select_list(:xpath, "//select[@name='sel1']/").select_value("missing item") }  
+    assert_raises(NoValueFoundException) { browser.select_list(:xpath, "//select[@name='sel1']/").select_value(/missing/) }  
     
     # the select method keeps any currently selected items - use the clear selectcion method first
-    $ie.select_list(:xpath, "//select[@name='sel1']/").clearSelection
-    $ie.select_list(:xpath, "//select[@name='sel1']/").select_value("o1")
-    assert_equal( ["Option 1" ] , $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    browser.select_list(:xpath, "//select[@name='sel1']/").select_value("o1")
+    assert_equal( ["Option 1" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
     
-    $ie.select_list(:xpath, "//select[@name='sel1']/").clearSelection
-    $ie.select_list(:xpath, "//select[@name='sel1']/").select_value(/2/)
-    assert_equal( ["Option 2" ] , $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    browser.select_list(:xpath, "//select[@name='sel1']/").select_value(/2/)
+    assert_equal( ["Option 2" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
     
-    $ie.select_list(:xpath, "//select[@name='sel2']/").clearSelection
-    $ie.select_list(:xpath, "//select[@name='sel2']/").select( /2/ )
-    $ie.select_list(:xpath, "//select[@name='sel2']/").select( /4/ )
-    assert_equal( ["Option 2" , "Option 4" ] , $ie.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel2']/").clearSelection
+    browser.select_list(:xpath, "//select[@name='sel2']/").select( /2/ )
+    browser.select_list(:xpath, "//select[@name='sel2']/").select( /4/ )
+    assert_equal( ["Option 2" , "Option 4" ] , browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
     
     # these are to test the onchange event
     # the event shouldnt get fired, as this is the selected item
-    $ie.select_list(:xpath, "//select[@name='sel3']/").select_value( /3/ )
-    assert(!$ie.text.include?("Pass") )
+    browser.select_list(:xpath, "//select[@name='sel3']/").select_value( /3/ )
+    assert_false(browser.text.include?("Pass") )
   end
   
   def test_select_list_select_using_value2
     # the event should get fired
-    $ie.select_list(:xpath, "//select[@name='sel3']/").select_value( /2/ )
-    assert($ie.text.include?("PASS") )
+    browser.select_list(:xpath, "//select[@name='sel3']/").select_value( /2/ )
+    assert(browser.text.include?("PASS") )
   end
   
 end

data/unittests/setup.rb

@@ -1,35 +1,62 @@
-# libraries used by feature tests
-require 'watir'
-END {$ie.close if $ie && $ie.exists?; Watir::IE.quit} # close ie at completion of the tests
+# watir/unittests/setup.rb
+$SETUP_LOADED = true
 
-require 'test/unit'
+$myDir = File.expand_path(File.dirname(__FILE__))
+
+def append_to_load_path path
+  $LOAD_PATH.unshift File.expand_path(path)
+end
+
+# use local development versions of watir, firewatir, watir-common if available
+topdir = File.join(File.dirname(__FILE__), '..')
+$firewatir_dev_lib = File.join(topdir, '..', 'firewatir', 'lib')
+$watir_dev_lib = File.join(topdir, 'lib')
+libs = []
+libs << File.join(topdir, '..', 'watir-common', 'lib')
+libs << File.join(topdir, '..', 'watir-common') # for the unit tests
+libs.each { |lib| append_to_load_path(lib) }
+
+require 'watir/browser'
+Watir::Browser.default = 'ie'
+require 'unittests/setup/lib'
 require 'watir/testcase'
 
-# rename goto_page to be goto_page
+# Standard Tags
+# :must_be_visible
+# :creates_windows
+# :unreliable (test fails intermittently)
 
-# Better would be to add this to a module that was included in all the tests.
-class Test::Unit::TestCase
-  # navigate the browser to the specified page in unittests/html
-  def goto_page page
-    new_url = $htmlRoot + page
-    browser.goto new_url
-  end
-  # navigate the browser to the specified page in unittests/html IF the browser is not already on that page.
-  def uses_page page
-    new_url = $htmlRoot + page
-    browser.goto new_url unless browser.url == new_url
-  end
-  def browser
-    $ie
-  end
+=begin
+Test Suites
+* all_tests -- all the tests in the unittests directory (omits "other")
+* window_tests -- window intensive tests
+=end
+
+tiptopdir = File.join topdir, '..'
+commondir = File.join topdir, '..', 'watir-common'
+append_to_load_path tiptopdir
+$all_tests = []
+Dir.chdir tiptopdir do
+  $all_tests += Dir["watir/unittests/*_test.rb"]
+end
+Dir.chdir tiptopdir do
+  $all_tests += Dir["watir-common/unittests/*_test.rb"]
 end
 
-topdir = File.join(File.dirname(__FILE__), '..')
-Dir.chdir topdir do
-  $all_tests = Dir["unittests/*_test.rb"]
-  $xpath_tests = Dir["unittests/*_xpath_test.rb"]
+# These tests won't load unless Watir is in the path
+$watir_only_tests = [
+  "images_xpath_test.rb",
+  "images_test.rb",
+  "dialog_test.rb",
+  "ie_test.rb"
+].map {|file| "watir/unittests/#{file}"}
+
+if Watir::UnitTest.options[:browser] != 'ie'
+  $all_tests -= $watir_only_tests
 end
 
+
+# not in all tests!
 $window_tests =
     [
      'attach_to_existing_window', # could actually run robustly as part of the core suite!
@@ -41,31 +68,8 @@ $window_tests =
      'js_events', # is always visible
      'jscript',
      'modal_dialog', # modal is visible
-     #new (named oddly)
+     #new 
      'open_close',
      'send_keys', # visible
     ].collect {|x| "unittests/windows/#{x}_test.rb"}
 
-$non_core_tests = 
-    ['popups', # has problems when run in a suite (is ok when run alone); 
-               # must be visible
-               # will be revised to use autoit 
-               # takes 15 seconds to run
-     'images', # save file must must be visible
-#     'screen_capture', # is always visible; takes 25 seconds
-     'filefield', # is always visible; takes 40 seconds 
-     'minmax', # becomes visible
-     'dialog' # visible
-    ].collect {|x| "unittests/#{x}_test.rb"}
-
-$core_tests = $all_tests - $non_core_tests - $window_tests - $xpath_tests
-
-$ie = Watir::IE.new
-$ie.speed = :fast
-
-$myDir = File.expand_path(File.dirname(__FILE__))
-$myDir.sub!( %r{/cygdrive/(\w)/}, '\1:/' ) # convert from cygwin to dos
-# if you run the unit tests from 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/"

data/unittests/speed_settings_test.rb

@@ -1,55 +1,66 @@
 # tests for ability to set defaults for Watir
-# revision: $Revision: 1319 $
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
-require 'test/unit'
-require 'watir'
+# revision: $Revision: 1552 $
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
 
 class TC_instance_options < Test::Unit::TestCase
+  tags :fails_on_firefox
+  
+  def setup
+    @ie4 = Watir::IE.new    
+  end
   
   def test_using_default
-    @ie1 = Watir::IE.new
-    @ie1.speed = :fast
-    assert_equal(:fast, @ie1.speed)
-    @ie1.speed = :slow
-    assert_equal(:slow, @ie1.speed)
-    assert_raise(ArgumentError){@ie1.speed = :fubar}
+    @ie4.speed = :fast
+    assert_equal(:fast, @ie4.speed)
+    @ie4.speed = :slow
+    assert_equal(:slow, @ie4.speed)
+    @ie4.speed = :zippy
+    assert_equal(:zippy, @ie4.speed)
+   
+    assert_raise(ArgumentError){@ie4.speed = :fubar}
   end
 
   def teardown
-    @ie1.close if @ie1
+    @ie4.close if @ie4.exists?
   end
 end
 
 class TC_class_options < Test::Unit::TestCase
+  tags :fails_on_firefox
 	include Watir
 	@@hide_ie = $HIDE_IE
 	def setup
-		@previous = IE.defaults
+		@previous = IE.options
 	end
 	def test_class_defaults
-		assert_equal({:speed => :slow, :visible => ! @@hide_ie}, IE.defaults)
+		assert_equal({:speed => IE.speed, :visible => IE.visible}, IE.options)
 	end
 	def test_change_defaults
-		IE.defaults = {:speed => :fast}
+		IE.set_options(:speed => :fast)
 		assert_equal(:fast, IE.speed)
-		IE.defaults = {:visible => false}
+		IE.set_options(:visible => false)
 		assert_equal(false, IE.visible)
-		IE.defaults = {:speed => :slow}
+		IE.set_options(:speed => :slow)
 		assert_equal(:slow, IE.speed)
-		IE.defaults = {:visible => true}
+		IE.set_options(:visible => true)
 		assert_equal(true, IE.visible)
 	end
 	def test_defaults_affect_on_instance
-		IE.defaults = {:speed => :fast}
+		IE.set_options(:speed => :fast)
 		@ie1 = IE.new
 		assert_equal(:fast, @ie1.speed)
-		IE.defaults = {:speed => :slow}
+		IE.set_options(:speed => :slow)
 		@ie2 = IE.new
 		assert_equal(:slow, @ie2.speed)
+    IE.set_options(:speed => :zippy)
+    @ie3 = IE.new
+    assert_equal(:zippy, @ie3.speed)
 	end
 	def teardown
-		IE.defaults = @previous
+		IE.set_options @previous
 		@ie1.close if @ie1
 		@ie2.close if @ie2
+    @ie3.close if @ie3
 	end
 end

data/unittests/table_cell_using_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for xpath table cells
-# revision: $Revision: 1348 $
+# revision: $Revision: 1544 $
 
-$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_TableCell_XPath < Test::Unit::TestCase
@@ -12,23 +12,23 @@ class TC_TableCell_XPath < Test::Unit::TestCase
   
   def testCellExists
     # There is no <image> with @src='rectangle.jpg'. So image will not be there.
-    assert(! $ie.cell(:xpath , "//img[@src='images\/rectangle.jpg']/../").exists?  )
+    assert_false( browser.cell(:xpath , "//img[@src='images\/rectangle.jpg']/../").exists?  )
     # Select the parent element of image with src='square.jpg' which is a tablecell.
-    assert(       $ie.cell(:xpath , "//img[@src='images\/square.jpg']/../").exists?  )
-    assert(       $ie.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").exists?  )
+    assert(       browser.cell(:xpath , "//img[@src='images\/square.jpg']/../").exists?  )
+    assert(       browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").exists?  )
     puts "Selected table cell with text 'Table Cell with image of triangle.'"
-    puts $ie.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").to_s
+    puts browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").to_s
   end
   
   def testCell_properties
-    assert_equal(1 , $ie.cell(:xpath , "//img[@src='images\/square.jpg']/../").colspan) 
-    assert_equal(2 , $ie.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").colspan) 
-    assert_equal(3 , $ie.cell(:xpath , "//img[@src='images\/circle.jpg']/../").colspan) 
-    assert_equal(4 , $ie.cell(:xpath , "//img[@src='images\/button.jpg']/../").colspan) 
+    assert_equal(1 , browser.cell(:xpath , "//img[@src='images\/square.jpg']/../").colspan) 
+    assert_equal(2 , browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").colspan) 
+    assert_equal(3 , browser.cell(:xpath , "//img[@src='images\/circle.jpg']/../").colspan) 
+    assert_equal(4 , browser.cell(:xpath , "//img[@src='images\/button.jpg']/../").colspan) 
     
     # to string tests -- output should be verified!
-    puts $ie.cell(:xpath , "//img[@src='images\/square.jpg']/../").to_s
-    puts $ie.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").to_s
+    puts browser.cell(:xpath , "//img[@src='images\/square.jpg']/../").to_s
+    puts browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").to_s
   end
   
 end

data/unittests/table_test.rb

@@ -1,9 +1,9 @@
 # feature tests for Tables
-# revision: $Revision: 1348 $
+# revision: $Revision: 1542 $
 
 # Why do so many of these tests call "strip"? A distinct smell...
 
-$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
@@ -27,6 +27,7 @@ class TC_Tables < Test::Unit::TestCase
     assert !browser.table(:index, 33).exists?
   end
   
+  tag_method :test_row_count_exceptions, :fails_on_firefox
   def test_row_count_exceptions
     assert_raises UnknownObjectException do
       browser.table(:id, 'missingTable').row_count
@@ -56,6 +57,14 @@ class TC_Tables < Test::Unit::TestCase
     assert_equal(2, row.column_count)        
   end
 
+  tag_method :test_row_counts, :fails_on_firefox
+  def test_row_counts
+    table = browser.table(:id => 't2')
+    assert_equal(3, table.row_count)
+    assert_equal(2, table.row_count_excluding_nested_tables)
+  end
+
+  tag_method :test_dynamic_tables, :fails_on_firefox
   def test_dynamic_tables
     @reload_page = true
     t = browser.table(:id, 't1')
@@ -108,6 +117,7 @@ class TC_Tables < Test::Unit::TestCase
     assert_equal('Row 2 Col1',  browser.row(:id, 'row1')[1].to_s.strip)
   end
 
+  tag_method :test_row_in_table, :fails_on_firefox
   def test_row_in_table
     assert_equal 'Row 2 Col1 Row 2 Col2', 
       browser.table(:id, 't1').row(:id, 'row1').text
@@ -143,12 +153,14 @@ class TC_Tables < Test::Unit::TestCase
     end
   end 
   
+  tag_method :test_cell_collection, :fails_on_firefox
   def test_cell_collection
     t = browser.table(:index,1)
     contents = t.cells.collect {|c| c.text}
     assert_equal(["Row 1 Col1","Row 1 Col2","Row 2 Col1","Row 2 Col2"], contents)
   end    
-  
+   
+  tag_method :test_table_body, :fails_on_firefox
   def test_table_body
     assert_equal(1, browser.table(:index, 1).bodies.length)
     assert_equal(3, browser.table(:id, 'body_test').bodies.length)
@@ -216,25 +228,25 @@ class TC_Tables_Buttons < Test::Unit::TestCase
   end
   
   def test_simple_table_buttons
-    table = browser.table(:index,1)
+    table = browser.table(:index, 1)
     
-    table[1][1].button(:index,1).click
-    assert(browser.textField(:name,"confirmtext").verify_contains(/CLICK1/i))
-    table[2][1].button(:index,1).click
-    assert(browser.textField(:name,"confirmtext").verify_contains(/CLICK2/i))
+    table[1][1].button(:index, 1).click
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/CLICK1/i))
+    table[2][1].button(:index, 1).click
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/CLICK2/i))
     
-    table[1][1].button(:id,'b1').click
-    assert(browser.textField(:name,"confirmtext").verify_contains(/CLICK1/i))
+    table[1][1].button(:id, 'b1').click
+    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(browser.textField(:name,"confirmtext").verify_contains(/TOO/i))
+    table[3][1].button(:index, 2).click
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/TOO/i))
     
-    table[3][1].button(:value ,"Click too").click
-    assert(browser.textField(:name,"confirmtext").verify_contains(/TOO/i))
+    table[3][1].button(:value, "Click too").click
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/TOO/i))
     
-    browser.table(:index,1)[4][1].text_field(:index,1).set("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
@@ -284,12 +296,13 @@ class TC_Tables_Buttons < Test::Unit::TestCase
     end
   end
   
+  tag_method :test_table_from_element, :fails_on_firefox
   def test_table_from_element
     button = browser.button(:id, "b1")
     table = Watir::Table.create_from_element(browser, button)
     
     table[2][1].button(:index, 1).click
-    assert(browser.textField(:name, "confirmtext").verify_contains(/CLICK2/i))
+    assert(browser.text_field(:name, "confirmtext").verify_contains(/CLICK2/i))
   end
 end
 
@@ -314,6 +327,7 @@ class TC_Table_Columns < Test::Unit::TestCase
     assert_equal(["R1C3", "R2C3", "R3C3"], browser.table(:index, 2).column_values(3))
   end
   
+  tag_method :test_get_columnvalues_with_colspan, :fails_on_firefox
   def test_get_columnvalues_with_colspan
     assert_equal(["R1C1", "R2C1", "R3C1", "R4C1", "R5C1", "R6C2"], browser.table(:index, 3).column_values(1))
      (2..4).each{|x|assert_raises(UnknownCellException){browser.table(:index, 3).column_values(x)}}