watir 1.5.6 → 1.6.2

data/unittests/other/testcase_method_order_test.rb

@@ -5,7 +5,7 @@
 #   1) Failure:
 # default_test(TC4_No_Test_Methods)
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
 
 require 'watir/testcase'
 

data/unittests/pagecontainstext_test.rb

@@ -1,7 +1,7 @@
 # feature tests for IE::contains_text
-# revision: $Revision: 1348 $
+# revision: $Revision: 1579 $
 
-$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_contains_text < Test::Unit::TestCase
@@ -11,49 +11,52 @@ class TC_contains_text < Test::Unit::TestCase
   end        
   
   def test_text_found
-    assert($ie.contains_text('slings and arrows of outrageous fortune'))
+    assert(browser.contains_text('slings and arrows of outrageous fortune'))
   end
   
   def test_text_not_found
-    assert(!$ie.contains_text('So are they all, all honourable men'))
+    assert_false(browser.contains_text('So are they all, all honourable men'))
   end
   
   def test_regexp_found
-    assert($ie.contains_text(/bodkin.*fardels/))
+    assert(browser.contains_text(/bodkin.*fardels/))
   end
   
   def test_regexp_not_found
-    assert(!$ie.contains_text(/winding.*watch.*wit/))
+    assert_false(browser.contains_text(/winding.*watch.*wit/))
   end
   
   def test_match_regexp_found
-    $~ = $ie.contains_text(/Messages ([0-9]+)/)
+    $~ = browser.contains_text(/Messages ([0-9]+)/)
     assert_equal('42', $1)
   end
   
   def test_bad_search_argument
     assert_raises(ArgumentError) do
-      $ie.contains_text
+      browser.contains_text
     end
     assert_raises(ArgumentError) do
-      $ie.contains_text(nil)
+      browser.contains_text(nil)
     end
     assert_raises(ArgumentError) do
-      $ie.contains_text(42)
+      browser.contains_text(42)
     end
   end
   
 end
 
 class TC_contains_text_in_new_ie < Test::Unit::TestCase
+  tags :fails_on_firefox
+  # Doesn't actually raise an error, but fails to close the window afterwards
+  # http://jira.openqa.org/browse/WTR-265
   def setup
-    @ie = Watir::IE.new
+    @new_browser = Watir::Browser.new
   end
   def test_nothing_raised
-    assert_nothing_raised {@ie.contains_text ''}
+    assert_nothing_raised {@new_browser.text.include? ''}
   end
   def teardown
-    @ie.close
+    @new_browser.close
   end
 end
 
@@ -62,6 +65,6 @@ class TC_contains_text_in_frame < Test::Unit::TestCase
     goto_page "frame_links.html"
   end        
   def test_in_frame
-    assert $ie.frame('linkFrame').contains_text('The button is really a link')
+    assert browser.frame('linkFrame').contains_text('The button is really a link')
   end
 end

data/unittests/parent_child_test.rb

@@ -1,15 +1,16 @@
 # feature tests for relative navigation/specification
 
-$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_Relative < Test::Unit::TestCase
   
   def setup
     goto_page "depot_store.html"
-    @headline = $ie.h3(:text, 'Pragmatic Version Control')
+    @headline = browser.h3(:text, 'Pragmatic Version Control')
   end
-  
+    
+  tag_method :test_parent, :fails_on_firefox
   def test_parent
     catalog_entry = @headline.parent
     link = catalog_entry.link(:class, 'addtocart')
@@ -17,13 +18,15 @@ class TC_Relative < Test::Unit::TestCase
     assert_nothing_raised{link.click}
   end
   
+  tag_method :test_parent_page_container, :fails_on_firefox
   def test_parent_page_container
     catalog_entry = @headline.parent
     assert_not_nil catalog_entry.page_container
   end
-  
+    
+  tag_method :test_before_and_after, :fails_on_firefox
   def test_before_and_after
-    link = $ie.link(:class => 'addtocart', :index => 2)
+    link = browser.link(:class => 'addtocart', :index => 2)
     assert_equal 'http://localhost:3000/store/add_to_cart/12', link.href  
     assert(link.after?(@headline))
     assert(@headline.before?(link))
@@ -31,9 +34,10 @@ class TC_Relative < Test::Unit::TestCase
     assert !(@headline.after? link)
     assert !(link.after? link)
   end   
-  
+    
+  tag_method :test_find_after, :fails_on_firefox
   def test_find_after
-    link = $ie.link(:class => 'addtocart', :after? => @headline)
+    link = browser.link(:class => 'addtocart', :after? => @headline)
     assert_equal 'http://localhost:3000/store/add_to_cart/12', link.href  
   end
     

data/unittests/perf_test.rb

@@ -0,0 +1,20 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_Performance < Test::Unit::TestCase
+  def setup
+    uses_page 'wallofcheckboxes.html'
+  end
+  
+  # http://jira.openqa.org/browse/WTR-216
+  # This should take about a quarter of a second. When the bug showed up (because the
+  # fast_locate method was broken), it took nearly 10 seconds.
+  def test_access_checkbox
+    start_time = Time.now
+    browser.checkbox(:name, 'custom_monetary_value10:config.admin.required999').set    
+    elapsed_time = Time.now - start_time
+    assert(elapsed_time < 1.5, 
+      "Elapsed time is #{elapsed_time}, should be less than 1.5 seconds.")
+  end
+  
+end

data/unittests/popups_test.rb

@@ -1,44 +1,43 @@
+# revision: $Revision: 1431 $
 
-# revision: $Revision: 958 $
-
-$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_PopUps < Test::Unit::TestCase
-  include Watir
-  
+  tags :must_be_visible, :creates_windows, :unreliable
+
   def setup
-    $ie.goto("file://#{$myDir}/html/popups1.html")
+    browser.goto("file://#{$myDir}/html/popups1.html")
   end
   
   def startClicker( button , waitTime = 0.5)
     w = WinClicker.new
-    longName = $ie.dir.gsub("/" , "\\" )
+    longName = browser.dir.gsub("/" , "\\" )
     shortName = w.getShortFileName(longName)
     c = "start rubyw #{shortName }\\watir\\clickJSDialog.rb #{button } #{ waitTime} "
     puts "Starting #{c}"
     w.winsystem(c )   
-    w=nil
+    w = nil
   end
   
   def test_simple
     startClicker("OK")
-    $ie.button("Alert").click
+    browser.button("Alert").click
   end
   
   def test_confirm
     startClicker("OK")
-    $ie.button("Confirm").click
-    assert( $ie.text_field(:name , "confirmtext").verify_contains("OK") )
+    browser.button("Confirm").click
+    assert( browser.text_field(:name , "confirmtext").verify_contains("OK") )
     
     startClicker("Cancel")
-    $ie.button("Confirm").click
-    assert( $ie.text_field(:name , "confirmtext").verify_contains("Cancel") )
+    browser.button("Confirm").click
+    assert( browser.text_field(:name , "confirmtext").verify_contains("Cancel") )
   end
   
   def xtest_Prompt
     startClicker("OK")
-    $ie.button("Prompt").click
+    browser.button("Prompt").click
   end
 end
 

data/unittests/pre_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Pre
-# revision: $Revision: 1348 $
+# revision: $Revision: 1595 $
 
-$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_Pre < Test::Unit::TestCase
@@ -11,41 +11,43 @@ class TC_Pre < Test::Unit::TestCase
   end
   
   def test_Pre_Count
-    assert( $ie.pres.length == 3 )
+    assert( browser.pres.length == 3 )
   end
   
   def test_Pre_Exists
-    assert(! $ie.pre( :id, 'missingPre' ).exists? )
-    assert(! $ie.pre( :index, 33 ).exists? )
-    
-    assert( $ie.pre( :id, '1' ).exists? )
-    assert( $ie.pre( :id, /[3-9]/ ).exists? )
-    
-    assert(! $ie.pre( :id, /missing_pre/ ).exists? )
-    
-    assert( $ie.pre( :index, 1 ).exists? )
-    assert( $ie.pre( :index, 2 ).exists? )
-    assert( $ie.pre( :index, 3 ).exists? )
-    
-    assert( $ie.pre( :name, '3' ).exists? )
-    assert(! $ie.pre( :name, "name_missing" ).exists? )
+    assert_false( browser.pre( :index, 33 ).exists? )
+    assert( browser.pre( :index, 3 ).exists? )
+    
+    assert( browser.pre( :id, '1' ).exists? )
+    assert( browser.pre( :id, /[3-9]/ ).exists? )
+    assert_false( browser.pre( :id, /missing_pre/ ).exists? )
+    assert_false( browser.pre( :id, 'missingPre' ).exists? )
+        
+    assert( browser.pre( :name, '3' ).exists? )
+    assert_false( browser.pre( :name, "name_missing" ).exists? )
   end
-  
+    
   def test_simple_access
-    pre = $ie.pre( :index, 1 )
+    pre = browser.pre( :index, 1 )
     assert( pre.text.include?( "simple pre space" ) )
-    assert(! pre.text.include?( "A second block" ) )
-    
-    assert( pre.html.include?( "id=1 name=\"1\"" ) )
+    assert_false( pre.text.include?( "A second block" ) )
     
-    pre = $ie.pre( :index, 2 )
+    pre = browser.pre( :index, 2 )
     assert( pre.text.include?( "A second block" ) )
-    assert(! pre.text.include?( "this is the last block" ) )
-    
-    pre = $ie.pre( :index, 3 )
+    assert_false( pre.text.include?( "this is the last block" ) )
+  end
+
+  tag_method :test_embedded_spaces, :fails_on_firefox # http://jira.openqa.org/browse/WTR-267
+  def test_embedded_spaces
+    pre = browser.pre( :index, 3 )
     assert( pre.text.include?( "continue    to work" ) )
-    assert(! pre.text.include?( "Pre Tag Test" ) )
-    
+    assert_false( pre.text.include?( "Pre Tag Test" ) )
+  end
+
+  tag_method :test_html, :fails_on_firefox # http://jira.openqa.org/browse/WTR-260
+  def test_html
+    pre = browser.pre(:index, 1)
+    assert( pre.html.include?( "id=1 name=\"1\"" ) )
   end
   
 end

data/unittests/radios_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Radio Buttons
-# revision: $Revision: 1348 $
+# revision: $Revision: 1505 $
 
-$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 < Test::Unit::TestCase
@@ -12,179 +12,200 @@ class TC_Radios < Test::Unit::TestCase
   end
   
   def test_Radio_Exists
-    assert($ie.radio(:name, "box1").exists?)   
-    assert($ie.radio(:id, "box5").exists?)   
+    assert(browser.radio(:name, "box1").exists?)   
+    assert(browser.radio(:id, "box5").exists?)   
     
-    assert(!$ie.radio(:name, "missingname").exists?)   
-    assert(!$ie.radio(:id, "missingid").exists?)   
+    assert_false(browser.radio(:name, "missingname").exists?)   
+    assert_false(browser.radio(:id, "missingid").exists?)   
   end
   
   def test_radio_class
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").class_name }  
-    assert_equal("radio_style" , $ie.radio(:name, "box1").class_name)   
-    assert_equal("" , $ie.radio(:id, "box5").class_name)   
+    assert_raises(UnknownObjectException) { browser.radio(:name, "noName").class_name }  
+    assert_equal("radio_style", browser.radio(:name, "box1").class_name)   
+    assert_equal("", browser.radio(:id, "box5").class_name)   
   end
   
   def test_Radio_Enabled
-    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").enabled?  }  
-    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:id, "noName").enabled?  }  
-    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "box4" , 6).enabled?  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   browser.radio(:name, "noName").enabled?  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   browser.radio(:id, "noName").enabled?  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   browser.radio(:name, "box4" , 6).enabled?  }  
     
-    assert(!$ie.radio(:name, "box2").enabled?)   
-    assert($ie.radio(:id, "box5").enabled?)   
-    assert($ie.radio(:name, "box1").enabled?)   
+    assert_false(browser.radio(:name, "box2").enabled?)   
+    assert(browser.radio(:id, "box5").enabled?)   
+    assert(browser.radio(:name, "box1").enabled?)   
   end
   
   def test_little
-    assert(!$ie.button(:value , "foo").enabled?)
+    assert_false(browser.button(:value, "foo").enabled?)
   end
   
   def test_onClick
     
-    assert(!$ie.radio(:name, "box5").isSet?)
-    assert(!$ie.button(:value , "foo").enabled?)
+    assert_false(browser.radio(:name, "box5").isSet?)
+    assert_false(browser.button(:value , "foo").enabled?)
     
     # first click the button is enabled and the radio is set
-    $ie.radio(:name, "box5" , 1).set
-    assert($ie.radio(:name, "box5",1).isSet?)
-    assert($ie.radio(:name, "box5",1).checked?)    
-    assert($ie.button(:value , "foo").enabled?)
+    browser.radio(:name, "box5", 1).set
+    assert(browser.radio(:name, "box5",1).isSet?)
+    assert(browser.radio(:name, "box5",1).checked?)    
+    assert(browser.button(:value, "foo").enabled?)
     
     # second click the button is disabled and the radio is still set
-    $ie.radio(:name, "box5", 1).set
-    assert($ie.radio(:name, "box5",1).isSet?)
-    assert($ie.radio(:name, "box5",1).checked?)    
-    assert(!$ie.button(:value , "foo").enabled?)
+    browser.radio(:name, "box5", 1).set
+    assert(browser.radio(:name, "box5",1).isSet?)
+    assert(browser.radio(:name, "box5",1).checked?)    
+    assert_false(browser.button(:value, "foo").enabled?)
     
     # third click the button is enabled and the radio is still set
-    $ie.radio(:name, "box5", 1).set
-    assert($ie.radio(:name, "box5",1 ).isSet?)
-    assert($ie.radio(:name, "box5",1 ).checked?)
-    assert($ie.button(:value , "foo").enabled?)
+    browser.radio(:name, "box5", 1).set
+    assert(browser.radio(:name, "box5", 1).isSet?)
+    assert(browser.radio(:name, "box5", 1).checked?)
+    assert(browser.button(:value, "foo").enabled?)
     
     # click the radio with a value of 2 , button is disabled and the radio is still set
-    $ie.radio(:name, "box5", 2).set
-    assert(!$ie.radio(:name, "box5" ,1).isSet?)
-    assert(!$ie.radio(:name, "box5" ,1).checked?)    
-    assert($ie.radio(:name, "box5" ,2).isSet?)
-    assert($ie.radio(:name, "box5" ,2).checked?)    
-    assert(!$ie.button(:value , "foo").enabled?)
+    browser.radio(:name, "box5", 2).set
+    assert_false(browser.radio(:name, "box5", 1).isSet?)
+    assert_false(browser.radio(:name, "box5", 1).checked?)    
+    assert(browser.radio(:name, "box5", 2).isSet?)
+    assert(browser.radio(:name, "box5", 2).checked?)    
+    assert_false(browser.button(:value, "foo").enabled?)
   end
   
   def test_Radio_isSet
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").isSet?  }  
+    assert_raises(UnknownObjectException) { browser.radio(:name, "noName").isSet?  }  
     
-    assert(!$ie.radio(:name, "box1").isSet?)   
-    assert( $ie.radio(:name, "box3").isSet?)   
-    assert(!$ie.radio(:name, "box2").isSet?)   
-    assert( $ie.radio(:name, "box4" , 1 ).isSet?)   
-    assert(!$ie.radio(:name, "box4" , 2 ).isSet?)   
+    assert_false(browser.radio(:name, "box1").isSet?)   
+    assert( browser.radio(:name, "box3").isSet?)   
+    assert_false(browser.radio(:name, "box2").isSet?)   
+    assert( browser.radio(:name, "box4", 1).isSet?)   
+    assert_false(browser.radio(:name, "box4", 2).isSet?)  
 
-    assert(!$ie.radio(:name, "box1").checked?)   
-    assert( $ie.radio(:name, "box3").checked?)   
-    assert(!$ie.radio(:name, "box2").checked?)   
-    assert( $ie.radio(:name, "box4" , 1 ).checked?)   
-    assert(!$ie.radio(:name, "box4" , 2 ).checked?)   
+    assert_false(browser.radio(:name, "box1").checked?)   
+    assert( browser.radio(:name, "box3").checked?)   
+    assert_false(browser.radio(:name, "box2").checked?)   
+    assert( browser.radio(:name, "box4", 1).checked?)   
+    assert_false(browser.radio(:name, "box4", 2).checked?)   
   end
   
   def test_radio_clear
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").clear  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:name, "noName").clear  }  
     
-    $ie.radio(:name, "box1").clear
-    assert(!$ie.radio(:name, "box1").isSet?)   
+    browser.radio(:name, "box1").clear
+    assert_false(browser.radio(:name, "box1").isSet?)   
     
-    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   $ie.radio(:name, "box2").clear  } 
-    assert(!$ie.radio(:name, "box2").isSet?)   
+    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   browser.radio(:name, "box2").clear  } 
+    assert_false(browser.radio(:name, "box2").isSet?)   
     
-    $ie.radio(:name, "box3").clear
-    assert(!$ie.radio(:name, "box3").isSet?)   
+    browser.radio(:name, "box3").clear
+    assert_false(browser.radio(:name, "box3").isSet?)   
     
-    $ie.radio(:name, "box4" , 1).clear
-    assert(!$ie.radio(:name, "box4" , 1).isSet?)   
+    browser.radio(:name, "box4" , 1).clear
+    assert_false(browser.radio(:name, "box4" , 1).isSet?)   
   end
   
   def test_radio_getState
-    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").getState  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   browser.radio(:name, "noName").getState  }  
     
-    assert_equal( false , $ie.radio(:name, "box1").getState )   
-    assert_equal( true , $ie.radio(:name, "box3").getState)   
+    assert_equal( false , browser.radio(:name, "box1").getState )   
+    assert_equal( true , browser.radio(:name, "box3").getState)   
     
     # radioes that have the same name but different values
-    assert_equal( false , $ie.radio(:name, "box4" , 2).getState )   
-    assert_equal( true , $ie.radio(:name, "box4" , 1).getState)   
+    assert_equal( false , browser.radio(:name, "box4" , 2).getState )   
+    assert_equal( true , browser.radio(:name, "box4" , 1).getState)   
   end
   
   def test_radio_set
-    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").set  }  
-    $ie.radio(:name, "box1").set
-    assert($ie.radio(:name, "box1").isSet?)   
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   browser.radio(:name, "noName").set  }  
+    browser.radio(:name, "box1").set
+    assert(browser.radio(:name, "box1").isSet?)   
     
-    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   $ie.radio(:name, "box2").set  }  
+    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   browser.radio(:name, "box2").set  }  
     
-    $ie.radio(:name, "box3").set
-    assert($ie.radio(:name, "box3").isSet?)   
+    browser.radio(:name, "box3").set
+    assert(browser.radio(:name, "box3").isSet?)   
     
     # radioes that have the same name but different values
-    $ie.radio(:name, "box4" , 3).set
-    assert($ie.radio(:name, "box4" , 3).isSet?)   
+    browser.radio(:name, "box4" , 3).set
+    assert(browser.radio(:name, "box4" , 3).isSet?)   
   end
   
   def test_radio_properties
     
-    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).value}  
-    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).name }  
-    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).id }  
-    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).disabled }  
-    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).type }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).value}  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).name }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).id }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).disabled }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).type }  
     
-    assert_equal("on"   ,    $ie.radio(:index, 1).value)  
-    assert_equal("box1" ,    $ie.radio(:index, 1).name )  
-    assert_equal(""     ,    $ie.radio(:index, 1).id )  
-    assert_equal("radio",    $ie.radio(:index, 1).type )  
+    assert_equal("on"   ,    browser.radio(:index, 1).value)  
+    assert_equal("box1" ,    browser.radio(:index, 1).name )  
+    assert_equal(""     ,    browser.radio(:index, 1).id )  
+    assert_equal("radio",    browser.radio(:index, 1).type )  
     
-    assert_equal( false, $ie.radio(:index, 1).disabled )
-    assert_equal( true,  $ie.radio(:index, 3).disabled )
-    
-    assert_equal("box5"  ,    $ie.radio(:index, 2).id )  
-    assert_equal(""      ,    $ie.radio(:index, 2).name )  
-    
-    assert_equal("box4-value5", $ie.radio(:name , "box4" , 5 ).title  )
-    assert_equal("", $ie.radio(:name , "box4" , 4 ).title  )
+    assert_equal( false, browser.radio(:index, 1).disabled )
+    assert_equal( true,  browser.radio(:index, 3).disabled )
     
+    assert_equal("box5"  ,    browser.radio(:index, 2).id )  
+    assert_equal(""      ,    browser.radio(:index, 2).name )  
     
+    assert_equal("box4-value5", browser.radio(:name , "box4" , 5 ).title  )
+    assert_equal("", browser.radio(:name , "box4" , 4 ).title  )
   end
   
   def test_radio_iterators
-    
-    assert_equal(13, $ie.radios.length)
-    assert_equal("box5" , $ie.radios[2].id )
-    assert_equal(true ,  $ie.radios[3].disabled )
-    assert_equal(false ,  $ie.radios[1].disabled )
+    assert_equal(13, browser.radios.length)
+    assert_equal("box5" , browser.radios[2].id )
+    assert_equal(true ,  browser.radios[3].disabled )
+    assert_equal(false ,  browser.radios[1].disabled )
     
     index = 1
-    $ie.radios.each do |r|
-      assert_equal( $ie.radio(:index, index).name , r.name )
-      assert_equal( $ie.radio(:index, index).id , r.id )
-      assert_equal( $ie.radio(:index, index).value, r.value)
-      assert_equal( $ie.radio(:index, index).disabled , r.disabled )
+    browser.radios.each do |r|
+      assert_equal( browser.radio(:index, index).name , r.name )
+      assert_equal( browser.radio(:index, index).id , r.id )
+      assert_equal( browser.radio(:index, index).value, r.value)
+      assert_equal( browser.radio(:index, index).disabled , r.disabled )
       index+=1
     end
-    assert_equal(index -1, $ie.radios.length)
+    assert_equal(index -1, browser.radios.length)
   end
   
   # test radio buttons that have a string as a value
   def test_value_string
-    assert($ie.radio(:name, 'box6', 'Tea').exists?)
-    assert($ie.radio(:name, 'box6', 'Milk').exists?)
-    $ie.radio(:name, "box6" , 'Milk').set
-    assert($ie.radio(:name, "box6" , 'Milk').isSet?)   
-    assert(!$ie.radio(:name, "box6" , 'Tea').isSet?)   
+    tea = browser.radio(:name, 'box6', 'Tea')
+    milk = browser.radio(:name, 'box6', 'Milk')
+    
+    assert(tea.exists?)
+    assert(milk.exists?)
+
+    milk.set
+    assert(milk.isSet?)   
+    assert_false(tea.isSet?)   
+
+    tea.set
+    assert_false(milk.isSet?)   
+    assert(tea.isSet?)   
+
+    tea.clear
+    assert_false(tea.isSet?)
+  end
+
+  def test_value_specified
+    tea = browser.radio(:name => 'box6', :value => 'Tea')
+    milk = browser.radio(:name => 'box6', :value => 'Milk')
+    
+    assert(tea.exists?)
+    assert(milk.exists?)
+
+    milk.set
+    assert(milk.isSet?)   
+    assert_false(tea.isSet?)   
+
+    tea.set
+    assert_false(milk.isSet?)   
+    assert(tea.isSet?)   
 
-    $ie.radio(:name, "box6" , 'Tea').set
-    assert(!$ie.radio(:name, "box6" , 'Milk').isSet?)   
-    assert($ie.radio(:name, "box6" , 'Tea').isSet?)   
-    $ie.radio(:name, "box6", 'Tea').clear
-    assert(!$ie.radio(:name, "box6" , 'Tea').isSet?)   
+    tea.clear
+    assert_false(tea.isSet?)
   end
   
 end