watir 1.5.6 → 1.6.2

data/unittests/table_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Tables
-# 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_Tables_XPath < Test::Unit::TestCase
@@ -12,30 +12,30 @@ class TC_Tables_XPath < Test::Unit::TestCase
   end
   
   def test_Table_Exists
-    assert(!$ie.table(:xpath , "//table[@id='missingTable']/").exists? )
-    assert($ie.table(:xpath , "//table[@id='t1']/").exists? )
+    assert_false(browser.table(:xpath , "//table[@id='missingTable']/").exists? )
+    assert(browser.table(:xpath , "//table[@id='t1']/").exists? )
   end
   
   def test_rows
-    assert_raises( UnknownObjectException  ){ $ie.table(:xpath , "//table[@id='missingTable']/").row_count }
-    assert_equal( 5 , $ie.table(:xpath , "//table[@id='t1']/").row_count)   # 4 rows and a header 
+    assert_raises( UnknownObjectException  ){ browser.table(:xpath , "//table[@id='missingTable']/").row_count }
+    assert_equal( 5 , browser.table(:xpath , "//table[@id='t1']/").row_count)   # 4 rows and a header 
   end
   
   def test_dynamic_tables
-    t = $ie.table(:xpath , "//table[@id='t1']/")
+    t = browser.table(:xpath , "//table[@id='t1']/")
     assert_equal( 5, t.row_count)
     
-    $ie.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  ){ $ie.table(:xpath , "//table[@id='missingTable']/").column_count }
-    assert_equal( 1 , $ie.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_links_and_images_in_table
-    table = $ie.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)
     
@@ -46,33 +46,33 @@ class TC_Tables_XPath < Test::Unit::TestCase
   def test_table_from_element
     goto_page "simple_table_buttons.html"
     
-    button = $ie.button(:xpath , "//input[@id='b1']/")
-    table = Watir::Table.create_from_element($ie,button)
+    button = browser.button(:xpath , "//input[@id='b1']/")
+    table = Watir::Table.create_from_element(browser,button)
     
     table[2][1].button(:index,1).click
-    assert($ie.text_field(:name,"confirmtext").verify_contains(/CLICK2/i))
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/CLICK2/i))
   end
   
   def test_cell_directly
     
-    assert( $ie.cell(:xpath , "//td[@id='cell1']/").exists? )
-    assert(! $ie.cell(:xpath , "//td[@id='no_exist']/").exists? )
-    assert_equal( "Row 1 Col1",  $ie.cell(:xpath , "//td[@id='cell1']/").to_s.strip )
+    assert( browser.cell(:xpath , "//td[@id='cell1']/").exists? )
+    assert_false( browser.cell(:xpath , "//td[@id='no_exist']/").exists? )
+    assert_equal( "Row 1 Col1",  browser.cell(:xpath , "//td[@id='cell1']/").to_s.strip )
   end
   
   def test_row_directly
-    assert( $ie.row(:xpath , "//tr[@id='row1']/").exists? )  
-    assert(! $ie.row(:xpath , "//tr[@id='no_exist']/").exists? )
+    assert( browser.row(:xpath , "//tr[@id='row1']/").exists? )  
+    assert_false( browser.row(:xpath , "//tr[@id='no_exist']/").exists? )
     
-    assert_equal('Row 2 Col1' ,  $ie.row(:xpath , "//tr[@id='row1']/")[1].to_s.strip )
+    assert_equal('Row 2 Col1' ,  browser.row(:xpath , "//tr[@id='row1']/")[1].to_s.strip )
   end
   
   
   def test_table_body
-    assert_equal( 3, $ie.table(:xpath , "//table[@id='body_test']/").bodies.length )
+    assert_equal( 3, browser.table(:xpath , "//table[@id='body_test']/").bodies.length )
     
     count = 1
-    $ie.table(:xpath , "//table[@id='body_test']/").bodies.each do |n|
+    browser.table(:xpath , "//table[@id='body_test']/").bodies.each do |n|
       
       # do something better here!
       # n.flash # this line commented out to speed up the test
@@ -90,13 +90,13 @@ class TC_Tables_XPath < Test::Unit::TestCase
       
       count +=1
     end
-    assert_equal( count-1, $ie.table(:xpath , "//table[@id='body_test']/").bodies.length  )
+    assert_equal( count-1, browser.table(:xpath , "//table[@id='body_test']/").bodies.length  )
     
-    assert_equal( "This text is in the THIRD TBODY." ,$ie.table(:xpath , "//table[@id='body_test']/").body(:index,3)[1][1].to_s.strip ) 
+    assert_equal( "This text is in the THIRD TBODY." ,browser.table(:xpath , "//table[@id='body_test']/").body(:index,3)[1][1].to_s.strip ) 
     
     # iterate through all the rows in a table body
     count = 1
-    $ie.table(:xpath , "//table[@id='body_test']/").body(:index,2).each do | row |
+    browser.table(:xpath , "//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 )

data/unittests/test_tests.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..')
+
+require 'unittests/setup'
+require 'unittests/checkbox_test'
+
+Watir::UnitTest.filter = proc do |test|
+  !test.tagged?(:firewatir_bug)
+end
+

data/unittests/textarea_test.rb

@@ -1,7 +1,7 @@
 # tests for textarea elements
-# revision: $Revision: 1348 $
+# revision: $Revision: 1506 $
 
-$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_TextArea < Test::Unit::TestCase
@@ -12,82 +12,82 @@ class TC_TextArea < Test::Unit::TestCase
   end
   
   def test_elements_exist_or_not
-    assert($ie.text_field(:name,"txtMultiLine1").exists?)
-    assert($ie.text_field(:name,"txtMultiLine2").exists?)
-    assert($ie.text_field(:name,"txtMultiLine3").exists?)
-    assert($ie.text_field(:name,"txtReadOnly").exists?)
+    assert(browser.text_field(:name,"txtMultiLine1").exists?)
+    assert(browser.text_field(:name,"txtMultiLine2").exists?)
+    assert(browser.text_field(:name,"txtMultiLine3").exists?)
+    assert(browser.text_field(:name,"txtReadOnly").exists?)
     
-    assert($ie.text_field(:id,"txtMultiLine1").exists?)
-    assert($ie.text_field(:id,"txtMultiLine2").exists?)
-    assert($ie.text_field(:id,"txtMultiLine3").exists?)
-    assert($ie.text_field(:id,"txtReadOnly").exists?)
+    assert(browser.text_field(:id,"txtMultiLine1").exists?)
+    assert(browser.text_field(:id,"txtMultiLine2").exists?)
+    assert(browser.text_field(:id,"txtMultiLine3").exists?)
+    assert(browser.text_field(:id,"txtReadOnly").exists?)
 
-    assert(!$ie.text_field(:name, "missing").exists?)   
-    assert(!$ie.text_field(:name,"txtMultiLine4").exists?)
+    assert_false(browser.text_field(:name, "missing").exists?)   
+    assert_false(browser.text_field(:name,"txtMultiLine4").exists?)
   end
   
   def test_to_s_bug
     # from a bug reported by Zeljko Filipin
-    assert_nothing_raised { $ie.text_field(:id,"txtMultiLine3").to_s  }
+    assert_nothing_raised { browser.text_field(:id,"txtMultiLine3").to_s  }
   end
   
   def test_maxlength_bug
     # from another bug
-    assert_nothing_raised { $ie.text_field(:id,"txtMultiLine3").append('foo')} 
+    assert_nothing_raised { browser.text_field(:id,"txtMultiLine3").append('foo')} 
   end
   
   def test_readonly_and_enabled
-    assert(!$ie.text_field(:name, "txtMultiLine1").readonly? )  
-    assert($ie.text_field(:name,"txtReadOnly").readonly?)
+    assert_false(browser.text_field(:name, "txtMultiLine1").readonly? )  
+    assert(browser.text_field(:name,"txtReadOnly").readonly?)
     
-    assert(!$ie.text_field(:name, "txtDisabled").enabled? )  
-    assert($ie.text_field(:id, "txtMultiLine1").enabled? )  
+    assert_false(browser.text_field(:name, "txtDisabled").enabled? )  
+    assert(browser.text_field(:id, "txtMultiLine1").enabled? )  
   end
   
   def test_verify_contains
-    t1 = $ie.text_field(:name, "txtMultiLine1")
+    t1 = browser.text_field(:name, "txtMultiLine1")
     assert(t1.verify_contains("Hello World") )  
     assert(t1.verify_contains(/el/) )  
-    assert($ie.text_field(:name, "txtMultiLine2").verify_contains(/IE/))
+    assert(browser.text_field(:name, "txtMultiLine2").verify_contains(/IE/))
   end
   
   def test_no_such_element
     assert_raises(UnknownObjectException) do
-      $ie.text_field(:name, "NoName").verify_contains("de nada")
+      browser.text_field(:name, "NoName").verify_contains("de nada")
     end  
     assert_raises(UnknownObjectException) do
-      $ie.text_field(:id, "noID").verify_contains("de nada")
+      browser.text_field(:id, "noID").verify_contains("de nada")
     end
     assert_raises(UnknownObjectException) do
-      $ie.text_field(:name, "txtNone").append("de nada")
+      browser.text_field(:name, "txtNone").append("de nada")
     end  
   end
   def test_readonly_and_disabled_errors
     assert_raises(ObjectReadOnlyException) do
-      $ie.text_field(:id, "txtReadOnly").append("de nada")
+      browser.text_field(:id, "txtReadOnly").append("de nada")
     end  
     assert_raises(ObjectDisabledException) do
-      $ie.text_field(:name, "txtDisabled").append("de nada")
+      browser.text_field(:name, "txtDisabled").append("de nada")
     end
     assert_raises(ObjectReadOnlyException) do
-      $ie.text_field(:id, "txtReadOnly").append("Some Text")
+      browser.text_field(:id, "txtReadOnly").append("Some Text")
     end
     assert_raises(ObjectDisabledException) do
-      $ie.text_field(:name, "txtDisabled").append("Some Text")
+      browser.text_field(:name, "txtDisabled").append("Some Text")
     end
   end
 
   def test_append_set_and_clear
-    $ie.text_field(:name, "txtMultiLine1").append(" Some Text")
+    browser.text_field(:name, "txtMultiLine1").append(" Some Text")
     assert_equal("Hello World Some Text", 
-      $ie.text_field(:name, "txtMultiLine1").getContents )  
+      browser.text_field(:name, "txtMultiLine1").value )  
     
-    $ie.text_field(:name, "txtMultiLine1").set("watir IE Controller")
+    browser.text_field(:name, "txtMultiLine1").set("watir IE Controller")
     assert_equal("watir IE Controller", 
-      $ie.text_field(:name, "txtMultiLine1").getContents )  
+      browser.text_field(:name, "txtMultiLine1").value )  
     
-    $ie.text_field(:name, "txtMultiLine2").clear
-    assert_equal("" , $ie.text_field(:name, "txtMultiLine2").getContents )  
+    browser.text_field(:name, "txtMultiLine2").clear
+    assert_equal("" , browser.text_field(:name, "txtMultiLine2").value )  
   end
   
 end

data/unittests/textarea_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for TextArea Fields
-# 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_TextArea_XPath < Test::Unit::TestCase
@@ -13,66 +13,66 @@ class TC_TextArea_XPath < Test::Unit::TestCase
   
   def test_textarea_field_exists
     #test for existance of 4 text area
-    assert($ie.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").exists?)
-    assert($ie.text_field(:xpath , "//textarea[@name='txtMultiLine2']/").exists?)
-    assert($ie.text_field(:xpath , "//textarea[@name='txtMultiLine3']/").exists?)
-    assert($ie.text_field(:xpath , "//textarea[@name='txtReadOnly']/").exists?)
+    assert(browser.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").exists?)
+    assert(browser.text_field(:xpath , "//textarea[@name='txtMultiLine2']/").exists?)
+    assert(browser.text_field(:xpath , "//textarea[@name='txtMultiLine3']/").exists?)
+    assert(browser.text_field(:xpath , "//textarea[@name='txtReadOnly']/").exists?)
     
-    assert($ie.text_field(:xpath , "//textarea[@id='txtMultiLine1']/").exists?)
-    assert($ie.text_field(:xpath , "//textarea[@id='txtMultiLine2']/").exists?)
-    assert($ie.text_field(:xpath , "//textarea[@id='txtMultiLine3']/").exists?)
-    assert($ie.text_field(:xpath , "//textarea[@id='txtReadOnly']/").exists?)
+    assert(browser.text_field(:xpath , "//textarea[@id='txtMultiLine1']/").exists?)
+    assert(browser.text_field(:xpath , "//textarea[@id='txtMultiLine2']/").exists?)
+    assert(browser.text_field(:xpath , "//textarea[@id='txtMultiLine3']/").exists?)
+    assert(browser.text_field(:xpath , "//textarea[@id='txtReadOnly']/").exists?)
     #test for missing 
-    assert(!$ie.text_field(:xpath , "//textarea[@name='missing']/").exists?)   
-    assert(!$ie.text_field(:xpath , "//textarea[@name='txtMultiLine4']/").exists?)
+    assert_false(browser.text_field(:xpath , "//textarea[@name='missing']/").exists?)   
+    assert_false(browser.text_field(:xpath , "//textarea[@name='txtMultiLine4']/").exists?)
   end
   
   def xtest_textarea_to_s
     # bug reported by Zeljko Filipin
-    # assert_nothing_raised { $ie.text_field(:xpath , "//textarea[@id='txtMultiLine3']/").to_s  }
+    # assert_nothing_raised { browser.text_field(:xpath , "//textarea[@id='txtMultiLine3']/").to_s  }
     # The above assertion fails. No property or method called maxlength
   end
   
   def test_textarea_field
     # test for read only method
-    assert(!$ie.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").readonly? )  
-    assert($ie.text_field(:xpath , "//textarea[@name='txtReadOnly']/").readonly?)
+    assert_false(browser.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").readonly? )  
+    assert(browser.text_field(:xpath , "//textarea[@name='txtReadOnly']/").readonly?)
     
     # test for enabled? method
-    assert(!$ie.text_field(:xpath , "//textarea[@name='txtDisabled']/").enabled? )  
-    assert($ie.text_field(:xpath , "//textarea[@id='txtMultiLine1']/").enabled? )  
+    assert_false(browser.text_field(:xpath , "//textarea[@name='txtDisabled']/").enabled? )  
+    assert(browser.text_field(:xpath , "//textarea[@id='txtMultiLine1']/").enabled? )  
     
     
-    t1 = $ie.text_field(:xpath , "//textarea[@name='txtMultiLine1']/")
+    t1 = browser.text_field(:xpath , "//textarea[@name='txtMultiLine1']/")
     assert(t1.verify_contains("Hello World") )  
     assert(t1.verify_contains(/el/) )  
-    t2 = $ie.text_field(:xpath , "//textarea[@name='txtMultiLine2']/")
+    t2 = browser.text_field(:xpath , "//textarea[@name='txtMultiLine2']/")
     assert(t2.verify_contains(/IE/))
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@name='NoName']/").verify_contains("No field to get a value of") }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@id='noID']/").verify_contains("No field to get a value of") }  
+    assert_raises(UnknownObjectException) {   browser.text_field(:xpath , "//textarea[@name='NoName']/").verify_contains("No field to get a value of") }  
+    assert_raises(UnknownObjectException) {   browser.text_field(:xpath , "//textarea[@id='noID']/").verify_contains("No field to get a value of") }  
     
-    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@name='txtNone']/").append("Some Text") }  
+    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//textarea[@name='txtNone']/").append("Some Text") }  
     
-    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@id='txtReadOnly']/").append("Some Text") }  
-    assert_raises(ObjectDisabledException   , "ObjectDisabledException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@name='txtDisabled']/").append("Some Text") }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@name='missing_field']/").append("Some Text") }  
+    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//textarea[@id='txtReadOnly']/").append("Some Text") }  
+    assert_raises(ObjectDisabledException   , "ObjectDisabledException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//textarea[@name='txtDisabled']/").append("Some Text") }  
+    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   browser.text_field(:xpath , "//textarea[@name='missing_field']/").append("Some Text") }  
     
-    $ie.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").append(" Some Text")
-    assert_equal(  "Hello World Some Text" , $ie.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").value)  
+    browser.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").append(" Some Text")
+    assert_equal(  "Hello World Some Text" , browser.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").value)  
     
-    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@id='txtReadOnly']/").append("Some Text") }  
-    assert_raises(ObjectDisabledException   , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@name='txtDisabled']/").append("Some Text") }  
-    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@name='missing_field']/").append("Some Text") }  
+    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//textarea[@id='txtReadOnly']/").append("Some Text") }  
+    assert_raises(ObjectDisabledException   , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//textarea[@name='txtDisabled']/").append("Some Text") }  
+    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//textarea[@name='missing_field']/").append("Some Text") }  
     
-    $ie.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").set("watir IE Controller")
-    assert_equal(  "watir IE Controller" , $ie.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").value )  
+    browser.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").set("watir IE Controller")
+    assert_equal(  "watir IE Controller" , browser.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").value )  
     
-    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@id='txtReadOnly']/").append("Some Text") }  
-    assert_raises(ObjectDisabledException   , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@name='txtDisabled']/").append("Some Text") }  
-    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//textarea[@name='missing_field']/").append("Some Text") }  
+    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//textarea[@id='txtReadOnly']/").append("Some Text") }  
+    assert_raises(ObjectDisabledException   , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//textarea[@name='txtDisabled']/").append("Some Text") }  
+    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//textarea[@name='missing_field']/").append("Some Text") }  
     
-    $ie.text_field(:xpath , "//textarea[@name='txtMultiLine2']/").clear
-    assert_equal(  "" , $ie.text_field(:xpath , "//textarea[@name='txtMultiLine2']/").value )  
+    browser.text_field(:xpath , "//textarea[@name='txtMultiLine2']/").clear
+    assert_equal(  "" , browser.text_field(:xpath , "//textarea[@name='txtMultiLine2']/").value )  
   end
   
 end

data/unittests/textfield_for_ch_char_test.rb

@@ -1,4 +1,4 @@
-$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_Fields_For_Chinese_Char < Test::Unit::TestCase
@@ -8,23 +8,23 @@ class TC_Fields_For_Chinese_Char < Test::Unit::TestCase
   end
   
   def test_chinese_char_should_be_appended_to_text_field
-    $ie.text_field(:name, "text1").append(" ijij")
-    assert_equal(  "Hello World ijij" , $ie.text_field(:name, "text1").getContents )  
+    browser.text_field(:name, "text1").append(" ijij")
+    assert_equal(  "Hello World ijij" , browser.text_field(:name, "text1").value )  
   end
   
   def test_mixed_char_should_be_appended_to_text_field
-    $ie.text_field(:name, "text1").append(" ijaija")
-    assert_equal(  "Hello World ijaija" , $ie.text_field(:name, "text1").getContents )  
+    browser.text_field(:name, "text1").append(" ijaija")
+    assert_equal(  "Hello World ijaija" , browser.text_field(:name, "text1").value )  
   end
   
   def test_chinese_char_should_be_set_to_text_field
-    $ie.text_field(:name, "text1").set("ijij")
-    assert_equal(  "ijij" , $ie.text_field(:name, "text1").getContents )  
+    browser.text_field(:name, "text1").set("ijij")
+    assert_equal(  "ijij" , browser.text_field(:name, "text1").value )  
   end
   
   def test_mixed_char_should_be_set_to_text_field
-    $ie.text_field(:name, "text1").set("ijaija")
-    assert_equal(  "ijaija" , $ie.text_field(:name, "text1").getContents )  
+    browser.text_field(:name, "text1").set("ijaija")
+    assert_equal(  "ijaija" , browser.text_field(:name, "text1").value )  
   end
   
 end

data/unittests/textfields_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Text Fields & Labels
-# revision: $Revision: 1348 $
+# revision: $Revision: 1536 $
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
 class TC_Fields < Test::Unit::TestCase
@@ -11,54 +11,57 @@ class TC_Fields < Test::Unit::TestCase
     goto_page "textfields1.html"
   end
   
+  tag_method :test_text_field_exists, :fails_on_firefox
   def test_text_field_exists
-    assert($ie.text_field(:name, "text1").exists?)   
-    assert(!$ie.text_field(:name, "missing").exists?)   
+    assert(browser.text_field(:name, "text1").exists?)   
+    assert_false(browser.text_field(:name, "missing").exists?)   
     
-    assert($ie.text_field(:id, "text2").exists?)   
-    assert(!$ie.text_field(:id, "alsomissing").exists?)   
+    assert(browser.text_field(:id, "text2").exists?)   
+    assert_false(browser.text_field(:id, "alsomissing").exists?)   
     
-    assert($ie.text_field(:beforeText, "This Text After").exists? )
-    assert($ie.text_field(:afterText, "This Text Before").exists? )
+    assert(browser.text_field(:beforeText, "This Text After").exists? )
+    assert(browser.text_field(:afterText, "This Text Before").exists? )
     
-    assert($ie.text_field(:beforeText, /after/i).exists? )
-    assert($ie.text_field(:afterText, /before/i).exists? )
+    assert(browser.text_field(:beforeText, /after/i).exists? )
+    assert(browser.text_field(:afterText, /before/i).exists? )
   end
   
+  tag_method :test_text_field_dragContentsTo, :fails_on_firefox
   def test_text_field_dragContentsTo
-    $ie.text_field(:name, "text1").dragContentsTo(:id, "text2")
-    assert_equal($ie.text_field(:name, "text1").getContents, "") 
-    assert_equal($ie.text_field(:id, "text2").getContents, "goodbye allHello World") 
+    browser.text_field(:name, "text1").dragContentsTo(:id, "text2")
+    assert_equal(browser.text_field(:name, "text1").value, "") 
+    assert_equal(browser.text_field(:id, "text2").value, "goodbye allHello World") 
   end
   
   def test_text_field_verify_contains
-    assert($ie.text_field(:name, "text1").verify_contains("Hello World"))  
-    assert($ie.text_field(:name, "text1").verify_contains(/Hello\sW/))  
-    assert(!$ie.text_field(:name, "text1").verify_contains("Ruby"))  
-    assert(!$ie.text_field(:name, "text1").verify_contains(/R/))  
-    assert_raises(UnknownObjectException) { $ie.text_field(:name, "NoName").verify_contains("No field to get a value of") } 
+    assert(browser.text_field(:name, "text1").verify_contains("Hello World"))  
+    assert(browser.text_field(:name, "text1").verify_contains(/Hello\sW/))  
+    assert_false(browser.text_field(:name, "text1").verify_contains("Ruby"))  
+    assert_false(browser.text_field(:name, "text1").verify_contains(/R/))  
+    assert_raises(UnknownObjectException) { browser.text_field(:name, "NoName").verify_contains("No field to get a value of") } 
     
-    assert($ie.text_field(:id, "text2").verify_contains("goodbye all") )  
-    assert_raises(UnknownObjectException) { $ie.text_field(:id, "noID").verify_contains("No field to get a value of") }          
+    assert(browser.text_field(:id, "text2").verify_contains("goodbye all") )  
+    assert_raises(UnknownObjectException) { browser.text_field(:id, "noID").verify_contains("No field to get a value of") }          
   end
   
   def test_text_field_enabled
-    assert(!$ie.text_field(:name, "disabled").enabled? )  
-    assert($ie.text_field(:name, "text1").enabled? )  
-    assert($ie.text_field(:id, "text2").enabled? )  
+    assert_false(browser.text_field(:name, "disabled").enabled? )  
+    assert(browser.text_field(:name, "text1").enabled? )  
+    assert(browser.text_field(:id, "text2").enabled? )  
   end
   
   def test_text_field_readonly
-    assert(!$ie.text_field(:name, "disabled").readonly? )  
-    assert($ie.text_field(:name, "readOnly").readonly? )  
-    assert($ie.text_field(:id, "readOnly2").readonly? )  
+    assert_false(browser.text_field(:name, "disabled").readonly? )  
+    assert(browser.text_field(:name, "readOnly").readonly? )  
+    assert(browser.text_field(:id, "readOnly2").readonly? )  
   end
   
   def test_text_field_get_contents
-    assert_raises(UnknownObjectException) { $ie.text_field(:name, "missing_field").append("Some Text") }  
-    assert_equal("Hello World", $ie.text_field(:name, "text1").getContents)  
+    assert_raises(UnknownObjectException) { browser.text_field(:name, "missing_field").append("Some Text") }  
+    assert_equal("Hello World", browser.text_field(:name, "text1").value)  
   end
   
+  tag_method :test_text_field_to_s, :fails_on_firefox
   def test_text_field_to_s
     expected = [
     build_to_s_regex("type", "text"),
@@ -70,145 +73,147 @@ class TC_Fields < Test::Unit::TestCase
     build_to_s_regex("max length", "20"),
     build_to_s_regex("read only", "false")
     ]
-    items = $ie.text_field(:index, 1).to_s.split(/\n/)
+    items = browser.text_field(:index, 1).to_s.split(/\n/)
     expected.each_with_index{|regex, x| assert_match(regex, items[x]) }
     expected[1] = build_to_s_regex("id", "text2")
     expected[2] = build_to_s_regex("name", "")
     expected[3] = build_to_s_regex("value", "goodbye all")
     expected[6] = build_to_s_regex("max length", "2147483647")  
       
-    items = $ie.text_field(:index, 2).to_s.split(/\n/)
+    items = browser.text_field(:index, 2).to_s.split(/\n/)
     expected.each_with_index{|regex, x| assert_match(regex, items[x]) }
-    assert_raises(UnknownObjectException) { $ie.text_field(:index, 999).to_s }  
+    assert_raises(UnknownObjectException) { browser.text_field(:index, 999).to_s }  
   end
   
   def build_to_s_regex(lhs, rhs)
     Regexp.new("^#{lhs}: +#{rhs}$")
   end
   
+  tag_method :test_text_field_append, :fails_on_firefox
   def test_text_field_append
-    assert_raises(ObjectReadOnlyException) { $ie.text_field(:id, "readOnly2").append("Some Text") }  
-    assert_raises(ObjectDisabledException) { $ie.text_field(:name, "disabled").append("Some Text") }  
-    assert_raises(UnknownObjectException) { $ie.text_field(:name, "missing_field").append("Some Text") }  
+    assert_raises(ObjectReadOnlyException) { browser.text_field(:id, "readOnly2").append("Some Text") }  
+    assert_raises(ObjectDisabledException) { browser.text_field(:name, "disabled").append("Some Text") }  
+    assert_raises(UnknownObjectException) { browser.text_field(:name, "missing_field").append("Some Text") }  
     
-    $ie.text_field(:name, "text1").append(" Some Text")
-    assert_equal("Hello World Some Text", $ie.text_field(:name, "text1").getContents)  
+    browser.text_field(:name, "text1").append(" Some Text")
+    assert_equal("Hello World Some Text", browser.text_field(:name, "text1").value)  
   end
   
   def test_text_field_clear
-    $ie.text_field(:name, "text1").clear
-    assert_equal("", $ie.text_field(:name, "text1").getContents)  
+    browser.text_field(:name, "text1").clear
+    assert_equal("", browser.text_field(:name, "text1").value)  
   end
   
   def test_text_field_set
-    $ie.text_field(:name, "text1").set("watir IE Controller")
-    assert_equal("watir IE Controller" , $ie.text_field(:name, "text1").getContents)  
+    browser.text_field(:name, "text1").set("watir IE Controller")
+    assert_equal("watir IE Controller", browser.text_field(:name, "text1").value)  
     # adding for issue: http://jira.openqa.org/browse/WTR-89
-    $ie.text_field(:name, /reGex/i).set("pass")
-    assert_equal("pass", $ie.text_field(:name, /REgEx/i).getContents)
+    browser.text_field(:name, /reGex/i).set("pass")
+    assert_equal("pass", browser.text_field(:name, /REgEx/i).value)
   end
   
   def test_text_field_properties
-    assert_raises(UnknownObjectException) { $ie.text_field(:index, 199).value }  
-    assert_raises(UnknownObjectException) { $ie.text_field(:index, 199).name }  
-    assert_raises(UnknownObjectException) { $ie.text_field(:index, 199).id }  
-    assert_raises(UnknownObjectException) { $ie.text_field(:index, 199).disabled }  
-    assert_raises(UnknownObjectException) { $ie.text_field(:index, 199).type }  
+    assert_raises(UnknownObjectException) { browser.text_field(:index, 199).value }  
+    assert_raises(UnknownObjectException) { browser.text_field(:index, 199).name }  
+    assert_raises(UnknownObjectException) { browser.text_field(:index, 199).id }  
+    assert_raises(UnknownObjectException) { browser.text_field(:index, 199).disabled }  
+    assert_raises(UnknownObjectException) { browser.text_field(:index, 199).type }  
     
-    assert_equal("Hello World" , $ie.text_field(:index, 1).value) 
-    assert_equal("text"        , $ie.text_field(:index, 1).type)
-    assert_equal("text1"       , $ie.text_field(:index, 1).name)
-    assert_equal(""            , $ie.text_field(:index, 1).id)
-    assert_equal(false         , $ie.text_field(:index, 1).disabled)
+    assert_equal("Hello World" , browser.text_field(:index, 1).value) 
+    assert_equal("text"        , browser.text_field(:index, 1).type)
+    assert_equal("text1"       , browser.text_field(:index, 1).name)
+    assert_equal(""            , browser.text_field(:index, 1).id)
+    assert_equal(false         , browser.text_field(:index, 1).disabled)
     
-    assert_equal(""            , $ie.text_field(:index, 2).name)
-    assert_equal("text2"       , $ie.text_field(:index, 2).id)
+    assert_equal(""            , browser.text_field(:index, 2).name)
+    assert_equal("text2"       , browser.text_field(:index, 2).id)
     
-    assert($ie.text_field(:index, 4).disabled)
+    assert(browser.text_field(:index, 4).disabled)
     
-    assert_equal("This used to test :afterText", $ie.text_field(:name, "aftertest").title)
-    assert_equal("", $ie.text_field(:index, 1).title)
+    assert_equal("This used to test :afterText", browser.text_field(:name, "aftertest").title)
+    assert_equal("", browser.text_field(:index, 1).title)
     # adding for issue: http://jira.openqa.org/browse/WTR-89
-    assert_equal("RegEx test", $ie.text_field(:name, /REgEx/i).value)
+    assert_equal("RegEx test", browser.text_field(:name, /REgEx/i).value)
   end
   
   def test_text_field_iterators
-    assert_equal(13, $ie.text_fields.length)
+    assert_equal(13, browser.text_fields.length)
     
     # watir is 1 based, so this is the first text field
-    assert_equal("Hello World" , $ie.text_fields[1].value)
-    assert_equal("text1" , $ie.text_fields[1].name)
-    assert_equal("password" , $ie.text_fields[$ie.text_fields.length].type)
+    assert_equal("Hello World", browser.text_fields[1].value)
+    assert_equal("text1", browser.text_fields[1].name)
+    assert_equal("password", browser.text_fields[browser.text_fields.length].type)
     
     index = 1
-    $ie.text_fields.each do |t|
-      assert_equal($ie.text_field(:index, index).value, t.value) 
-      assert_equal($ie.text_field(:index, index).id,    t.id)
-      assert_equal($ie.text_field(:index, index).name,  t.name)
+    browser.text_fields.each do |t|
+      assert_equal(browser.text_field(:index, index).value, t.value) 
+      assert_equal(browser.text_field(:index, index).id,    t.id)
+      assert_equal(browser.text_field(:index, index).name,  t.name)
       index += 1
     end
-    assert_equal(index - 1, $ie.text_fields.length)         
+    assert_equal(index - 1, browser.text_fields.length)         
   end
   
+  tag_method :test_JS_Events, :fails_on_firefox
   def test_JS_Events
-    $ie.text_field(:name, 'events_tester').requires_typing.set('p')
+    browser.text_field(:name, 'events_tester').requires_typing.set('p')
     
     # the following line has an extra keypress at the begining, as we mimic the delete key being pressed
-    assert_equal( "keypresskeydownkeypresskeyup" , $ie.text_field(:name , 'events_text').value.gsub("\r\n" , "")  )
-    $ie.button(:value , "Clear Events Box").click
-    $ie.text_field(:name , 'events_tester').requires_typing.set('ab')
+    assert_equal( "keypresskeydownkeypresskeyup" , browser.text_field(:name, 'events_text').value.gsub("\r\n" , "")  )
+    browser.button(:value, "Clear Events Box").click
+    browser.text_field(:name, 'events_tester').requires_typing.set('ab')
     
     # the following line has an extra keypress at the begining, as we mimic the delete key being pressed
-    assert_equal( "keypresskeydownkeypresskeyupkeydownkeypresskeyup" , $ie.text_field(:name , 'events_text').value.gsub("\r\n" , "") )
+    assert_equal( "keypresskeydownkeypresskeyupkeydownkeypresskeyup", browser.text_field(:name , 'events_text').value.gsub("\r\n" , "") )
   end
   
   def test_password
-    $ie.text_field(:name , "password1").set("secret")
-    assert( 'secret' , $ie.text_field(:name , "password1").value )
+    browser.text_field(:name, "password1").set("secret")
+    assert( 'secret' , browser.text_field(:name, "password1").value )
     
-    $ie.text_field(:id , "password1").set("top_secret")
-    assert( 'top_secret' , $ie.text_field(:id, "password1").value )
+    browser.text_field(:id, "password1").set("top_secret")
+    assert('top_secret', browser.text_field(:id, "password1").value )
   end
   
   def test_labels_iterator
-    assert_equal(3, $ie.labels.length)
-    assert_equal('Label For this Field' , $ie.labels[1].innerText.strip )
-    assert_equal('Password With ID ( the text here is a label for it )' , $ie.labels[3].innerText )
+    assert_equal(3, browser.labels.length)
+    assert_equal('Label For this Field' , browser.labels[1].innerText.strip )
+    assert_equal('Password With ID ( the text here is a label for it )' , browser.labels[3].innerText )
     
     count=0
-    $ie.labels.each do |l|
+    browser.labels.each do |l|
       count +=1
     end
-    assert_equal(count, $ie.labels.length)
+    assert_equal(count, browser.labels.length)
   end
   
   def test_label_properties
-    assert_raises(UnknownObjectException) { $ie.label(:index,20).innerText } 
-    assert_raises(UnknownObjectException) { $ie.label(:index,20).for } 
-    assert_raises(UnknownObjectException) { $ie.label(:index,20).name } 
-    assert_raises(UnknownObjectException) { $ie.label(:index,20).type } 
-    assert_raises(UnknownObjectException) { $ie.label(:index,20).id } 
+    assert_raises(UnknownObjectException) { browser.label(:index,20).innerText } 
+    assert_raises(UnknownObjectException) { browser.label(:index,20).for } 
+    assert_raises(UnknownObjectException) { browser.label(:index,20).name } 
+    assert_raises(UnknownObjectException) { browser.label(:index,20).type } 
+    assert_raises(UnknownObjectException) { browser.label(:index,20).id } 
     
-    assert(!$ie.label(:index,10).exists?) 
-    assert(!$ie.label(:id,'missing').exists?) 
-    assert($ie.label(:index,1).exists?) 
+    assert_false(browser.label(:index,10).exists?) 
+    assert_false(browser.label(:id,'missing').exists?) 
+    assert(browser.label(:index,1).exists?) 
     
-    assert_equal("", $ie.label(:index,1).id)
-    assert(!    $ie.label(:index,1).disabled?) 
-    assert(          $ie.label(:index,1).enabled?)
+    assert_equal("", browser.label(:index,1).id)
+    assert_false(browser.label(:index,1).disabled?) 
+    assert(browser.label(:index,1).enabled?)
     
-    assert_equal("label2", $ie.label(:index,2).id )
+    assert_equal("label2", browser.label(:index,2).id )
     
-    assert_equal("Password With ID ( the text here is a label for it )" , $ie.label(:index,3).innerText)
-    assert_equal("password1", $ie.label(:index,3).for)
+    assert_equal("Password With ID ( the text here is a label for it )" , browser.label(:index,3).innerText)
+    assert_equal("password1", browser.label(:index,3).for)
   end
 
   def test_max_length_is_not_exceeded
-    $ie.text_field(:name , 'text1').set("abcdefghijklmnopqrstuv")
-    assert_equal("abcdefghijklmnopqrst", $ie.text_field(:name , 'text1').value )
+    browser.text_field(:name, 'text1').set("abcdefghijklmnopqrstuv")
+    assert_equal("abcdefghijklmnopqrst", browser.text_field(:name, 'text1').value )
   end
 
   def test_max_length
-    assert_equal(20, $ie.text_field(:name , 'text1').maxLength )
+    assert_equal(20, browser.text_field(:name, 'text1').maxlength)
   end
 end