unittests/selectbox_xpath_test.rb in watir-1.5.6 vs unittests/selectbox_xpath_test.rb in watir-1.6.2

@@ -1,113 +1,113 @@
 # 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
   include Watir::Exception
   
   def setup
     goto_page "selectboxes1.html"
   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