watir 1.5.6 → 1.6.2

data/unittests/radios_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Radio Buttons
-# 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_Radios_XPath < Test::Unit::TestCase
@@ -12,89 +12,89 @@ class TC_Radios_XPath < Test::Unit::TestCase
   end
   
   def test_Radio_Exists
-    assert($ie.radio(:xpath, "//input[@name='box1']/").exists?)   
-    assert($ie.radio(:xpath, "//input[@id='box5']/").exists?)   
+    assert(browser.radio(:xpath, "//input[@name='box1']/").exists?)   
+    assert(browser.radio(:xpath, "//input[@id='box5']/").exists?)   
     
-    assert(!$ie.radio(:xpath, "//input[@name='missingname']/").exists?)   
-    assert(!$ie.radio(:xpath, "//input[@id='missingid']/").exists?)   
+    assert_false(browser.radio(:xpath, "//input[@name='missingname']/").exists?)   
+    assert_false(browser.radio(:xpath, "//input[@id='missingid']/").exists?)   
   end
   
   def test_Radio_Enabled
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='noName']/").enabled?  }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@id='noName']/").enabled?  }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='box4' and @value='6']/").enabled?  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']/").enabled?  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@id='noName']/").enabled?  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='box4' and @value='6']/").enabled?  }  
     
-    assert(!$ie.radio(:xpath, "//input[@name='box2']/").enabled?)   
-    assert($ie.radio(:xpath, "//input[@id='box5']/").enabled?)   
-    assert($ie.radio(:xpath, "//input[@name='box1']/").enabled?)   
+    assert_false(browser.radio(:xpath, "//input[@name='box2']/").enabled?)   
+    assert(browser.radio(:xpath, "//input[@id='box5']/").enabled?)   
+    assert(browser.radio(:xpath, "//input[@name='box1']/").enabled?)   
   end
   
   def test_little
-    assert(!$ie.button(:xpath,"//input[@name='foo']/").enabled?)
+    assert_false(browser.button(:xpath,"//input[@name='foo']/").enabled?)
   end
   
   def test_onClick
-    assert(!$ie.button(:xpath,"//input[@name='foo']/").enabled?)          
-    $ie.radio(:xpath, "//input[@name='box5' and @value='1']/").set
-    assert($ie.button(:xpath,"//input[@name='foo']/").enabled?)        
+    assert_false(browser.button(:xpath,"//input[@name='foo']/").enabled?)          
+    browser.radio(:xpath, "//input[@name='box5' and @value='1']/").set
+    assert(browser.button(:xpath,"//input[@name='foo']/").enabled?)        
     
-    $ie.radio(:xpath, "//input[@name='box5' and @value='2']/").set
-    assert(!$ie.button(:xpath,"//input[@name='foo']/").enabled?)
+    browser.radio(:xpath, "//input[@name='box5' and @value='2']/").set
+    assert_false(browser.button(:xpath,"//input[@name='foo']/").enabled?)
   end
   
   def test_Radio_isSet
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='noName']/").isSet?  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']/").isSet?  }  
     
-    puts "radio 1 is set : #{ $ie.radio(:xpath, "//input[@name='box1']/").isSet? } "
-    assert(!$ie.radio(:xpath, "//input[@name='box1']/").isSet?)   
+    puts "radio 1 is set : #{ browser.radio(:xpath, "//input[@name='box1']/").isSet? } "
+    assert_false(browser.radio(:xpath, "//input[@name='box1']/").isSet?)   
     
-    assert($ie.radio(:xpath, "//input[@name='box3']/").isSet?)   
-    assert(!$ie.radio(:xpath, "//input[@name='box2']/").isSet?)   
+    assert(browser.radio(:xpath, "//input[@name='box3']/").isSet?)   
+    assert_false(browser.radio(:xpath, "//input[@name='box2']/").isSet?)   
     
-    assert( $ie.radio(:xpath, "//input[@name='box4' and @value='1']/").isSet?)   
-    assert(!$ie.radio(:xpath, "//input[@name='box4' and @value='2']/").isSet?)   
+    assert( browser.radio(:xpath, "//input[@name='box4' and @value='1']/").isSet?)   
+    assert_false(browser.radio(:xpath, "//input[@name='box4' and @value='2']/").isSet?)   
   end
   
   def test_radio_clear
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='noName']/").clear  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']/").clear  }  
     
-    $ie.radio(:xpath, "//input[@name='box1']/").clear
-    assert(!$ie.radio(:xpath, "//input[@name='box1']/").isSet?)   
+    browser.radio(:xpath, "//input[@name='box1']/").clear
+    assert_false(browser.radio(:xpath, "//input[@name='box1']/").isSet?)   
     
-    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='box2']/").clear  } 
-    assert(!$ie.radio(:xpath, "//input[@name='box2']/").isSet?)   
+    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   browser.radio(:xpath, "//input[@name='box2']/").clear  } 
+    assert_false(browser.radio(:xpath, "//input[@name='box2']/").isSet?)   
     
-    $ie.radio(:xpath, "//input[@name='box3']/").clear
-    assert(!$ie.radio(:xpath, "//input[@name='box3']/").isSet?)   
+    browser.radio(:xpath, "//input[@name='box3']/").clear
+    assert_false(browser.radio(:xpath, "//input[@name='box3']/").isSet?)   
     
-    $ie.radio(:xpath, "//input[@name='box4' and @value='1']/").clear
-    assert(!$ie.radio(:xpath, "//input[@name='box4' and @value='1']/").isSet?)   
+    browser.radio(:xpath, "//input[@name='box4' and @value='1']/").clear
+    assert_false(browser.radio(:xpath, "//input[@name='box4' and @value='1']/").isSet?)   
   end
   
   def test_radio_getState
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='noName']/").getState  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']/").getState  }  
     
-    assert_equal( false , $ie.radio(:xpath, "//input[@name='box1']/").getState )   
-    assert_equal( true , $ie.radio(:xpath, "//input[@name='box3']/").getState)   
+    assert_equal( false , browser.radio(:xpath, "//input[@name='box1']/").getState )   
+    assert_equal( true , browser.radio(:xpath, "//input[@name='box3']/").getState)   
     
     # radioes that have the same name but different values
-    assert_equal( false , $ie.radio(:xpath, "//input[@name='box4' and @value='2']/").getState )   
-    assert_equal( true , $ie.radio(:xpath, "//input[@name='box4' and @value='1']/").getState)   
+    assert_equal( false , browser.radio(:xpath, "//input[@name='box4' and @value='2']/").getState )   
+    assert_equal( true , browser.radio(:xpath, "//input[@name='box4' and @value='1']/").getState)   
   end
   
   def test_radio_set
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='noName']/").set  }  
-    $ie.radio(:xpath, "//input[@name='box1']/").set
-    assert($ie.radio(:xpath, "//input[@name='box1']/").isSet?)   
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']/").set  }  
+    browser.radio(:xpath, "//input[@name='box1']/").set
+    assert(browser.radio(:xpath, "//input[@name='box1']/").isSet?)   
     
-    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='box2']/").set  }  
+    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   browser.radio(:xpath, "//input[@name='box2']/").set  }  
     
-    $ie.radio(:xpath, "//input[@name='box3']/").set
-    assert($ie.radio(:xpath, "//input[@name='box3']/").isSet?)   
+    browser.radio(:xpath, "//input[@name='box3']/").set
+    assert(browser.radio(:xpath, "//input[@name='box3']/").isSet?)   
     
     # radioes that have the same name but different values
-    $ie.radio(:xpath, "//input[@name='box4' and @value='3']/").set
-    assert($ie.radio(:xpath, "//input[@name='box4' and @value='3']/").isSet?)   
+    browser.radio(:xpath, "//input[@name='box4' and @value='3']/").set
+    assert(browser.radio(:xpath, "//input[@name='box4' and @value='3']/").isSet?)   
   end
   
 end

data/unittests/security_setting_test.rb

@@ -0,0 +1,24 @@
+# The purpose of this test is to verify that IE has been manually
+# configured to allow active content from local files.
+# This setting is not really required for normal use of Watir, but
+# it is essential for many of our unit tests.
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_AAA_Security_Settings < Test::Unit::TestCase
+  def setup
+    uses_page "div.html"
+  end
+
+  @@security_instructions = "\
+You must change your IE security settings to run these tests.
+Tools -> Internet Options -> Advanced -> Security -> 
+'Allow active content to run in files on My Computer'"
+
+  def test_active_content
+    browser.span(:id, "span3").click
+    value = browser.text_field(:name, "text2").value
+    fail(@@security_instructions) if value == '0' 
+  end
+end

data/unittests/selectbox_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Select Boxes
-# revision: $Revision: 1348 $
+# revision: $Revision: 1531 $
 
-$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_SelectList < Test::Unit::TestCase
@@ -12,208 +12,116 @@ class TC_SelectList < Test::Unit::TestCase
   end
   
   def test_SelectList_exists
-    assert($ie.select_list(:name, "sel1").exists?)   
-    assert(!$ie.select_list(:name, "missing").exists?)   
-    assert(!$ie.select_list(:id, "missing").exists?)   
+    assert(browser.select_list(:name, "sel1").exists?)   
+    assert_false(browser.select_list(:name, "missing").exists?)   
+    assert_false(browser.select_list(:id, "missing").exists?)   
   end
   
   def test_SelectList_enabled
-    assert($ie.select_list(:name, "sel1").enabled?)   
-    assert_raises(UnknownObjectException) { $ie.selectBox(:name, "NoName").enabled? }  
-    assert(!$ie.select_list(:id, 'selectbox_4').enabled?)
+    assert(browser.select_list(:name, "sel1").enabled?)   
+    assert_raises(UnknownObjectException) { browser.select_list(:name, "NoName").enabled? }  
+    assert_false(browser.select_list(:id, 'selectbox_4').enabled?)
   end
   
   def test_SelectList_class_name
-    assert_raises(UnknownObjectException) { $ie.select_list(:name, "missing").class_name }  
-    assert_equal("list_style" , $ie.select_list(:name, "sel1").class_name)   
-    assert_equal("" , $ie.selectBox(:name, "sel2").class_name  )
+    assert_raises(UnknownObjectException) { browser.select_list(:name, "missing").class_name }  
+    assert_equal("list_style" , browser.select_list(:name, "sel1").class_name)   
+    assert_equal("" , browser.select_list(:name, "sel2").class_name  )
   end
   
   def test_Option_text_select
-    assert_raises(UnknownObjectException) { $ie.select_list(:name, "sel1").option(:text, "missing item").select }  
-    assert_raises(UnknownObjectException) { $ie.select_list(:name, "sel1").option(:text, /missing/).select }  
-    assert_raises(MissingWayOfFindingObjectException) { $ie.select_list(:name, "sel1").option(:missing, "Option 1").select }
+    assert_raises(UnknownObjectException) { browser.select_list(:name, "sel1").option(:text, "missing item").select }  
+    assert_raises(UnknownObjectException) { browser.select_list(:name, "sel1").option(:text, /missing/).select }  
+    assert_raises(MissingWayOfFindingObjectException) { browser.select_list(:name, "sel1").option(:missing, "Option 1").select }
     
     # the select method keeps any currently selected items - use the clear selection method first
-    $ie.select_list( :name , "sel1").clearSelection
-    $ie.select_list( :name , "sel1").option(:text, "Option 1").select
-    assert_equal( ["Option 1" ] , $ie.select_list(:name, "sel1").getSelectedItems)   
+    browser.select_list( :name , "sel1").clearSelection
+    browser.select_list( :name , "sel1").option(:text, "Option 1").select
+    assert_equal( ["Option 1" ] , browser.select_list(:name, "sel1").getSelectedItems)   
   end    
   
   def xtest_option_class_name
     # the option object doesnt inherit from element, so this doesnt work
-    assert_raises(UnknownObjectException) { $ie.select_list(:name, "sel1").option(:text, "missing item").class_name }  
-    assert_equal("list_style" , $ie.select_list(:name, "sel2").option(:value , 'o2').class_name)   
-    assert_equal("" , $ie.select_list(:name, "sel2").option(:value , 'o1').class_name)   
+    assert_raises(UnknownObjectException) { browser.select_list(:name, "sel1").option(:text, "missing item").class_name }  
+    assert_equal("list_style" , browser.select_list(:name, "sel2").option(:value , 'o2').class_name)   
+    assert_equal("" , browser.select_list(:name, "sel2").option(:value , 'o1').class_name)   
   end
-  
+    
+  tag_method :test_includes, :fails_on_firefox
   def test_includes
-    assert $ie.select_list(:name, 'sel1').includes?('Option 1')
-    assert ! $ie.select_list(:name, 'sel1').includes?('Option 6')
+    assert browser.select_list(:name, 'sel1').includes?('Option 1')
+    assert browser.select_list(:name, 'sel1').includes?(/option/i)
+    assert ! browser.select_list(:name, 'sel1').includes?('Option 6')
+    assert ! browser.select_list(:name, 'sel1').includes?(/foobar/)
   end  
   
+  tag_method :test_selected, :fails_on_firefox
   def test_selected
-    assert ! $ie.select_list(:name, 'sel1').selected?('Option 1')
-    assert $ie.select_list(:name, 'sel1').selected?('Option 3')
+    assert browser.select_list(:name, 'sel1').selected?('Option 3')
+    assert browser.select_list(:name, 'sel1').selected?(/option/i)
+    assert ! browser.select_list(:name, 'sel1').selected?('Option 1')
+    assert ! browser.select_list(:name, 'sel1').selected?(/option 1/i)
   end
   
+  tag_method :test_selected_not_found, :fails_on_firefox
   def test_selected_not_found
-    selectbox = $ie.select_list(:name, 'sel1')
-    assert_raises(Watir::Exception::UnknownObjectException) {selectbox.selected?('Option Not Exists')}
+    selectbox = browser.select_list(:name, 'sel1')
+    assert_raises(Watir::Exception::UnknownObjectException) {selectbox.selected?("option doesn't exist")}
+    assert_raises(Watir::Exception::UnknownObjectException) {selectbox.selected?(/option doesn't exist/)}
   end
     
 end
 
-# Tests for the old interface
 class TC_Selectbox < Test::Unit::TestCase
   include Watir::Exception
   
   def setup
     goto_page "selectboxes1.html"
   end
-  
-  def test_selectBox_Exists
-    assert($ie.selectBox(:name, "sel1").exists?)   
-    assert(!$ie.selectBox(:name, "missing").exists?)   
-    assert(!$ie.selectBox(:id, "missing").exists?)   
-  end
-  
-  def test_selectBox_enabled
-    assert($ie.selectBox(:name, "sel1").enabled?)   
-    assert_raises(UnknownObjectException) { $ie.selectBox(:name, "NoName").enabled? }  
-  end
-  
-  def test_SelectList_class_name
-    assert_raises(UnknownObjectException) { $ie.select_list(:name, "missing").class_name }  
-    assert_equal("list_style" , $ie.select_list(:name, "sel1").class_name)   
-    assert_equal("" , $ie.selectBox(:name, "sel2").class_name  )
-  end
-  
-  def test_selectBox_getAllContents
-    assert_raises(UnknownObjectException) { $ie.selectBox(:name, "NoName").getAllContents }  
-    assert_equal( ["Option 1" ,"Option 2" , "Option 3" , "Option 4"] , 
-    $ie.selectBox(:name, "sel1").getAllContents)   
-  end
-  
-  def test_selectBox_getSelectedItems
-    assert_raises(UnknownObjectException) { $ie.selectBox(:name, "NoName").getSelectedItems }  
-    assert_equal( ["Option 3" ] , 
-    $ie.selectBox(:name, "sel1").getSelectedItems)   
-    assert_equal( ["Option 3" , "Option 6" ] , 
-    $ie.selectBox(:name, "sel2").getSelectedItems)   
-  end
-  
-  def test_clearSelection
-    assert_raises(UnknownObjectException) { $ie.selectBox(:name, "NoName").clearSelection }  
-    $ie.selectBox( :name , "sel1").clearSelection
-    
-    # the box sel1 has no ability to have a de-selected item
-    assert_equal( ["Option 3" ] , $ie.selectBox(:name, "sel1").getSelectedItems)   
-    
-    $ie.selectBox( :name , "sel2").clearSelection
-    assert_equal( [ ] , $ie.selectBox(:name, "sel2").getSelectedItems)   
-  end
-  
-  def test_selectBox_select
-    assert_raises(NoValueFoundException) { $ie.selectBox(:name, "sel1").select("missing item") }  
-    assert_raises(NoValueFoundException) { $ie.selectBox(:name, "sel1").select(/missing/) }  
-    
-    # the select method keeps any currently selected items - use the clear selectcion method first
-    $ie.selectBox( :name , "sel1").clearSelection
-    $ie.selectBox( :name , "sel1").select("Option 1")
-    assert_equal( ["Option 1" ] , $ie.selectBox(:name, "sel1").getSelectedItems)   
-    
-    $ie.selectBox( :name , "sel1").clearSelection
-    $ie.selectBox( :name , "sel1").select(/2/)
-    assert_equal( ["Option 2" ] , $ie.selectBox(:name, "sel1").getSelectedItems)   
-    
-    $ie.selectBox( :name , "sel2").clearSelection
-    $ie.selectBox( :name , "sel2").select(/2/)
-    $ie.selectBox( :name , "sel2").select(/4/)
-    assert_equal( ["Option 2" , "Option 4" ] , 
-    $ie.selectBox(:name, "sel2").getSelectedItems)   
-    
-    # these are to test the onchange event
-    # the event shouldnt get fired, as this is the selected item
-    $ie.selectBox( :name , "sel3").select( /3/ )
-    assert(!$ie.text.include?("Pass") )
-  end
-  
-  def test_selectBox_select2
-    # the event should get fired
-    $ie.selectBox( :name , "sel3").select( /2/ )
-    assert($ie.text.include?("PASS") )
-  end
-  
-  def test_selectBox_select_using_value
-    assert_raises(UnknownObjectException) { $ie.select_list(:name, "NoName").getSelectedItems }  
-    assert_raises(NoValueFoundException) { $ie.select_list(:name, "sel1").select_value("missing item") }  
-    assert_raises(NoValueFoundException) { $ie.select_list(:name, "sel1").select_value(/missing/) }  
-    
-    # the select method keeps any currently selected items - use the clear selectcion method first
-    $ie.select_list( :name , "sel1").clearSelection
-    $ie.select_list( :name , "sel1").select_value("o1")
-    assert_equal( ["Option 1" ] , $ie.select_list(:name, "sel1").getSelectedItems)   
     
-    $ie.select_list( :name , "sel1").clearSelection
-    $ie.select_list( :name , "sel1").select_value(/2/)
-    assert_equal( ["Option 2" ] , $ie.select_list(:name, "sel1").getSelectedItems)   
-    
-    $ie.select_list( :name , "sel2").clearSelection
-    $ie.select_list( :name , "sel2").select_value(/4/)
-    $ie.select_list( :name , "sel2").select_value(/2/)
-    assert_equal( ["Option 2" , "Option 4" ] , 
-    $ie.select_list(:name, "sel2").getSelectedItems)   
-    
-    # these are to test the onchange event
-    # the event shouldnt get fired, as this is the selected item
-    $ie.select_list( :name , "sel3").select_value( /3/ )
-    assert(!$ie.text.include?("Pass") )
-  end
-  
   def test_select_list_select_using_value2
     # the event should get fired
-    $ie.select_list( :name , "sel3").select_value( /2/ )
-    assert($ie.text.include?("PASS") )
+    browser.select_list( :name , "sel3").select_value( /2/ )
+    assert(browser.text.include?("PASS") )
   end
   
   def test_select_list_properties
-    assert_raises(UnknownObjectException) { $ie.select_list(:index, 199).value }  
-    assert_raises(UnknownObjectException) { $ie.select_list(:index, 199).name }  
-    assert_raises(UnknownObjectException) { $ie.select_list(:index, 199).id }  
-    assert_raises(UnknownObjectException) { $ie.select_list(:index, 199).disabled }  
-    assert_raises(UnknownObjectException) { $ie.select_list(:index, 199).type }  
+    assert_raises(UnknownObjectException) { browser.select_list(:index, 199).value }  
+    assert_raises(UnknownObjectException) { browser.select_list(:index, 199).name }  
+    assert_raises(UnknownObjectException) { browser.select_list(:index, 199).id }  
+    assert_raises(UnknownObjectException) { browser.select_list(:index, 199).disabled }  
+    assert_raises(UnknownObjectException) { browser.select_list(:index, 199).type }  
     
-    assert_equal("o3"   ,    $ie.select_list(:index, 1).value)  
-    assert_equal("sel1" ,    $ie.select_list(:index, 1).name )  
-    assert_equal(""     ,    $ie.select_list(:index, 1).id )  
-    assert_equal("select-one",         $ie.select_list(:index, 1).type )  
-    assert_equal("select-multiple",    $ie.select_list(:index, 2).type )  
+    assert_equal("o3"   ,    browser.select_list(:index, 1).value)  
+    assert_equal("sel1" ,    browser.select_list(:index, 1).name )  
+    assert_equal(""     ,    browser.select_list(:index, 1).id )  
+    assert_equal("select-one",         browser.select_list(:index, 1).type )  
+    assert_equal("select-multiple",    browser.select_list(:index, 2).type )  
     
-    $ie.select_list(:index,1).select(/1/)
-    assert_equal("o1"   ,    $ie.select_list(:index, 1).value)  
+    browser.select_list(:index,1).select(/1/)
+    assert_equal("o1"   ,    browser.select_list(:index, 1).value)  
     
-    assert(! $ie.select_list(:index, 1).disabled )
-    assert( $ie.select_list(:index, 4).disabled )
-    assert( $ie.select_list(:id, 'selectbox_4').disabled )
+    assert_false( browser.select_list(:index, 1).disabled )
+    assert( browser.select_list(:index, 4).disabled )
+    assert( browser.select_list(:id, 'selectbox_4').disabled )
   end
   
   def test_select_list_iterator
-    assert_equal(4, $ie.select_lists.length)
-    assert_equal("o3"   ,    $ie.select_lists[1].value)  
-    assert_equal("sel1" ,    $ie.select_lists[1].name )  
-    assert_equal("select-one",         $ie.select_lists[1].type )  
-    assert_equal("select-multiple" ,   $ie.select_lists[2].type )  
+    assert_equal(4, browser.select_lists.length)
+    assert_equal("o3"   ,    browser.select_lists[1].value)  
+    assert_equal("sel1" ,    browser.select_lists[1].name )  
+    assert_equal("select-one",         browser.select_lists[1].type )  
+    assert_equal("select-multiple" ,   browser.select_lists[2].type )  
     
     index=1
-    $ie.select_lists.each do |l|
-      assert_equal( $ie.select_list(:index, index).name , l.name )
-      assert_equal( $ie.select_list(:index, index).id , l.id )
-      assert_equal( $ie.select_list(:index, index).type , l.type )
-      assert_equal( $ie.select_list(:index, index).value , l.value )
+    browser.select_lists.each do |l|
+      assert_equal( browser.select_list(:index, index).name , l.name )
+      assert_equal( browser.select_list(:index, index).id , l.id )
+      assert_equal( browser.select_list(:index, index).type , l.type )
+      assert_equal( browser.select_list(:index, index).value , l.value )
       index+=1
     end
-    assert_equal( index-1, $ie.select_lists.length)
+    assert_equal( index-1, browser.select_lists.length)
   end
 end
 
@@ -224,8 +132,8 @@ class TC_Select_Options < Test::Unit::TestCase
   end
   
   def test_options_text
-    $ie.select_list(:name, 'op_numhits').option(:text, '>=').select
-    assert($ie.select_list(:name, 'op_numhits').option(:text, '>=').selected)
+    browser.select_list(:name, 'op_numhits').option(:text, '>=').select
+    assert(browser.select_list(:name, 'op_numhits').option(:text, '>=').selected)
   end
 end