watir 1.5.4 → 1.5.5

data/bin/watir-console

@@ -1 +1,2 @@
+#!/usr/bin/env ruby
 exec 'irb.bat -r irb/completion -r watir/irb-history -r watir --simple-prompt --readline'

data/changes.rb

@@ -1,4 +1,18 @@
 =begin rdoc
+== Version 1.5.4
+New Features
+* Add new speed, :zippy. This is like fast, but, in effect, it does a TextField#value= instead of a TextField#set. If you have specific text fields that you never want this to happen to, use ie.text_field(:how, what).requires_typing.set instead.
+  http://svn.openqa.org/fisheye/changelog/watir/?cs=1295
+* Add support for Chinese input as supplied by Vincent Xu. 
+  http://jira.openqa.org/browse/WTR-71.
+
+Bug Fixes
+* Add dependency on windows-pr 0.6.6, which seems to be necessary on Vista.
+* Fix for bug in IE.close_others provided by Paul Taylor.
+  http://jira.openqa.org/browse/WTR-194
+* Fix for error when using verify_equal with ci_reporter, provided by Marcog.
+  http://svn.openqa.org/fisheye/changelog/watir/?cs=1301
+
 == Version 1.5.3
 Bug fixes and minor cleanup.
 
@@ -10,7 +24,7 @@ Bug fixes and minor cleanup.
 * Fix tests.
 * Update documentation.
 
-Major Changes in 1.5.1
+Major Changes in 1.5.2
     Support for IE's Modal Dialogs. 
       showModalDialog() 
     Any method can be used to specify an element (:text, :class, etc.). 
@@ -20,7 +34,7 @@ Major Changes in 1.5.1
     One can now use multiple attributes to specify an element.
       ie.span(:class =>'Label', :text => 'Add new').click
       
-Other Changes in 1.5.1
+Other Changes in 1.5.2
     * Migrated IE.new_process from watir/contrib and improved its reliability. We now recommend IE.new_process over IE.new as a way to avoid numerous errors detailed in http://jira.openqa.org/browse/WTR-150.
     * Added IE.start_process. This works like IE.start, but uses the new_process mechanism to start IE.
     * Added IE.new_window and IE.start_window. This are synonyms for IE.new and IE.start.

data/readme.rb

@@ -66,21 +66,6 @@ Typical Usage
 
    * :id and :name are the quickest of these to process, and so should be used when possible to speed up scripts.
 
-  The objects that are currently supported include
-   Button
-   Radio
-   CheckBox
-   TextField (Including TextArea and Password)
-   Hidden
-   SelectList
-   Label
-   Span
-   Div
-   P
-   Link
-   Table 
-   Image
-
  These 2 web sites provide info on Internet Explorer and on the DOM as implemented by Internet Explorer
  http://msdn.microsoft.com/library/default.asp?url=/workshop/browser/webbrowser/webbrowser.asp
  http://msdn.microsoft.com/library/default.asp?url=/workshop/browser/overview/overview.asp
@@ -98,9 +83,9 @@ Javascript Pop Up Support
    This is the prefered method for dealing wth pop ups, file requesters etc. Support for Winclickers will be removed.
 
 Contacts:
-   Paul Rogers (paul.rogers@shaw.ca)
    Bret Pettichord (bret@pettichord.com)
    Charley Baker (charley.baker@gmail.com)
+   Paul Rogers (paul.rogers@shaw.ca)
    The mailing list: http://groups.google.com/group/watir-general
 
 Contributors:
@@ -141,6 +126,7 @@ Contributors:
    Zeljko Filipin
    Paul Taylor - Bug fix 194
    Vincent Xu - Chinese input support
+   Tomislav Car - Filefield fix (210)
 
 Acknowledgements:
    Chris Morris

data/unittests/buttons_test.rb

@@ -1,133 +1,106 @@
 # feature tests for Buttons
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
-class TC_Buttons < Test::Unit::TestCase
-  include Watir
-  
+class TC_Button < Test::Unit::TestCase
+  include Watir::Exception
   def setup
-    $ie.goto($htmlRoot + "buttons1.html")
-  end
-  
-  def goto_frames_page
-    $ie.goto($htmlRoot + "frame_buttons.html")
+    goto_page "buttons1.html"
   end
   
-  def aatest_Spinner
-    s = Spinner.new
-    i = 0
-    while(i < 100)
-      sleep 0.05
-      print s.next
-      i+=1
-    end
-    s = nil
-  end
-  
-  def aaatest_Button_to_s
-    # i think the tests for to_s should be dropped. The output is not in a nice format to be tested, and the
-    # individual properties are tested in the test_properties method
-    
-    b4 = ['name              b4',
-        'type              button',
-        'id                b5',
-        'value             Disabled Button',
-        'disabled          true']
-    b1 = ['name              b1',
-        'type              button',
-        'id                b2',
-        'value             Click Me',
-        'disabled          false']
-    
-    assert_equal(b4, $ie.button(:name, "b4").to_s)
-    assert_equal(b1, $ie.button(:caption, "Click Me").to_s)
-    assert_equal(b1, $ie.button(:index, 1).to_s)
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:name, "noName").to_s   }  
+  def test_to_s
+    b4 = [
+        'type:     *button',
+        'id:       *b5',
+        'name:     *b4',
+        'value:    *Disabled Button',
+        'disabled: *true']
+    b1 = [
+        'type:     *button',
+        'id:       *b2',
+        'name:     *b1',
+        'value:    *Click Me',
+        'disabled: *false']
+    assert_match(Regexp.new(b4.join("\n")), browser.button(:name, "b4").to_s)
+    assert_match(Regexp.new(b1.join("\n")), browser.button(:caption, "Click Me").to_s)
+    assert_match(Regexp.new(b1.join("\n")), browser.button(:index, 1).to_s)
+    assert_raises(UnknownObjectException) { browser.button(:name, "noName").to_s }  
   end
   
   def test_properties
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:name, "noName").id   }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:name, "noName").name   }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:name, "noName").disabled   }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:name, "noName").type   }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:name, "noName").value   }  
+    assert_raises(UnknownObjectException) { browser.button(:name, "noName").id }  
+    assert_raises(UnknownObjectException) { browser.button(:name, "noName").name }  
+    assert_raises(UnknownObjectException) { browser.button(:name, "noName").disabled }  
+    assert_raises(UnknownObjectException) { browser.button(:name, "noName").type }  
+    assert_raises(UnknownObjectException) { browser.button(:name, "noName").value }  
     
-    assert_equal("b1"  , $ie.button(:index, 1).name ) 
-    assert_equal("b2"  , $ie.button(:index, 1).id ) 
-    assert_equal("button"  , $ie.button(:index, 1).type  ) 
-    assert_equal("Click Me"  , $ie.button(:index, 1).value  ) 
-    assert_equal(false  , $ie.button(:index, 1).disabled  ) 
-    assert_equal("italic_button"  , $ie.button(:name, "b1").class_name  ) 
-    assert_equal(""  , $ie.button(:name , "b4").class_name  ) 
+    assert_equal("b1", browser.button(:index, 1).name) 
+    assert_equal("b2", browser.button(:index, 1).id) 
+    assert_equal("button", browser.button(:index, 1).type) 
+    assert_equal("Click Me", browser.button(:index, 1).value) 
+    assert_equal(false, browser.button(:index, 1).disabled) 
+    assert_equal("italic_button", browser.button(:name, "b1").class_name) 
+    assert_equal("", browser.button(:name , "b4").class_name) 
+        
+    assert_equal("b1"  , browser.button(:id, "b2").name  ) 
+    assert_equal("b2"  , browser.button(:id, "b2").id  ) 
+    assert_equal("button"  , browser.button(:id, "b2").type  ) 
     
+    assert_equal("b4"  , browser.button(:index, 2).name  ) 
+    assert_equal("b5"  , browser.button(:index, 2).id  ) 
+    assert_equal("button"  , browser.button(:index, 2).type  ) 
+    assert_equal("Disabled Button"  , browser.button(:index, 2).value  ) 
+    assert_equal(true  , browser.button(:index, 2).disabled  ) 
     
-    assert_equal("b1"  , $ie.button(:id, "b2").name  ) 
-    assert_equal("b2"  , $ie.button(:id, "b2").id  ) 
-    assert_equal("button"  , $ie.button(:id, "b2").type  ) 
-    
-    assert_equal("b4"  , $ie.button(:index, 2).name  ) 
-    assert_equal("b5"  , $ie.button(:index, 2).id  ) 
-    assert_equal("button"  , $ie.button(:index, 2).type  ) 
-    assert_equal("Disabled Button"  , $ie.button(:index, 2).value  ) 
-    assert_equal(true  , $ie.button(:index, 2).disabled  ) 
-    
-    assert_equal( "" , $ie.button(:index, 2).title )
-    assert_equal( "this is button1" , $ie.button(:index, 1).title )
+    assert_equal( "" , browser.button(:index, 2).title )
+    assert_equal( "this is button1" , browser.button(:index, 1).title )
   end
   
-  
-  def test_button_using_default
-    # since most of the time, a button will be accessed based on its caption, there is a default way of accessing it....
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button( "Missing Caption").click   }  
+  def test_default_how
+    assert_raises(UnknownObjectException) { browser.button( "Missing Caption").click }  
     
-    $ie.button("Click Me").click
-    assert($ie.text.include?("PASS") )
+    browser.button("Click Me").click
+    assert(browser.text.include?("PASS") )
   end
   
-  def test_Button_click_only
-    $ie.button(:caption, "Click Me").click
-    assert($ie.text.include?("PASS") )
-  end
-  
-  def test_button_click
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:caption, "Missing Caption").click   }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:id, "missingID").click   }  
-    
-    assert_raises(ObjectDisabledException , "ObjectDisabledException was supposed to be thrown" ) {   $ie.button(:caption, "Disabled Button").click   }  
+  def test_click
+    assert_raises(UnknownObjectException)  { browser.button(:caption, "Missing Caption").click }  
+    assert_raises(UnknownObjectException)  { browser.button(:id, "missingID").click }  
+    assert_raises(ObjectDisabledException) { browser.button(:caption, "Disabled Button").click }  
     
-    $ie.button(:caption, "Click Me").click
-    assert($ie.text.include?("PASS") )
+    browser.button(:caption, "Click Me").click
+    assert(browser.text.include?("PASS"))
   end
   
-  def test_Button_Exists
-    assert($ie.button(:caption, "Click Me").exists?)   
-    assert($ie.button(:caption, "Submit").exists?)   
-    assert($ie.button(:name, "b1").exists?)   
-    assert($ie.button(:id, "b2").exists?)   
-    assert($ie.button(:caption, /sub/i).exists?)   
+  def test_exists
+    assert(browser.button(:caption, "Click Me").exists?)   
+    assert(browser.button(:caption, "Submit").exists?)   
+    assert(browser.button(:name, "b1").exists?)   
+    assert(browser.button(:id, "b2").exists?)   
+    assert(browser.button(:caption, /sub/i).exists?)   
     
-    assert(!$ie.button(:caption, "missingcaption").exists?)   
-    assert(!$ie.button(:name, "missingname").exists?)   
-    assert(!$ie.button(:id, "missingid").exists?)   
-    assert(!$ie.button(:caption, /missing/i).exists?)   
+    assert(!browser.button(:caption, "missingcaption").exists?)   
+    assert(!browser.button(:name, "missingname").exists?)   
+    assert(!browser.button(:id, "missingid").exists?)   
+    assert(!browser.button(:caption, /missing/i).exists?)   
   end
   
-  def test_Button_Enabled
+  def test_enabled
     assert($ie.button(:caption, "Click Me").enabled?)   
-    assert(!$ie.button(:caption, "Disabled Button").enabled?)   
-    assert(!$ie.button(:name, "b4").enabled?)   
-    assert(!$ie.button(:id, "b5").enabled?)   
+    assert(!browser.button(:caption, "Disabled Button").enabled?)   
+    assert(!browser.button(:name, "b4").enabled?)   
+    assert(!browser.button(:id, "b5").enabled?)   
     
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:name, "noName").enabled?  }  
+    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   browser.button(:name, "noName").enabled?  }  
   end
   
-  def test_frame
-    goto_frames_page
-    
-    assert($ie.frame("buttonFrame").button(:caption, "Click Me").enabled?)   
-    assert_raises(  UnknownObjectException , "UnknownObjectException was supposed to be thrown ( no frame name supplied) " ) { $ie.button(:caption, "Disabled Button").enabled?}  
+  def test_in_frame
+    goto_page "frame_buttons.html"
+    assert(browser.frame("buttonFrame").button(:caption, "Click Me").enabled?)
+    # frame must be specified
+    assert_raises(UnknownObjectException) { browser.button(:caption, "Disabled Button").enabled?}  
   end
   
 end

data/unittests/buttons_xpath_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Buttons
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Buttons_XPath < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "buttons1.html")
+    goto_page "buttons1.html"
   end
   
   def test_properties

data/unittests/checkbox_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Check Boxes
-# revision: $Revision: 1164 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_CheckBox < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "checkboxes1.html")
+    goto_page "checkboxes1.html"
   end
   
   def test_checkbox_properties

data/unittests/checkbox_xpath_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Check Boxes
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_CheckBox_XPath < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "checkboxes1.html")
+    goto_page "checkboxes1.html"
   end
   
   def test_checkbox_properties

data/unittests/core_tests.rb

@@ -7,7 +7,7 @@ require 'watir'
 
 $HIDE_IE = true
 
-require 'unittests/setup.rb'
+require 'unittests/setup'
 
 Dir.chdir TOPDIR
 $core_tests.each {|x| require x}

data/unittests/css_test.rb

@@ -1,11 +1,10 @@
 # feature tests for css
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_CSS < Test::Unit::TestCase
-  include Watir
   
   def divTester( message )
     
@@ -40,12 +39,8 @@ class TC_CSS < Test::Unit::TestCase
     return s
   end
   
-  def gotoCSSPage
-    $ie.goto($htmlRoot + "cssTest.html")
-  end
-  
   def test_SuccessMessage
-    gotoCSSPage
+    goto_page "cssTest.html"
     $ie.button( :caption , "Success").click
     
     #isMessageDisplayed( "Success" )

data/unittests/defer_test.rb

@@ -1,6 +1,6 @@
 # tests of deferring when a Watir object is bound to a com object (lazy evaluation)
 
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
@@ -22,7 +22,7 @@ class TC_Defer < Test::Unit::TestCase
     assert_equal('Div Text', div.text)
   end
   def test_binding_to_refreshed_page
-    $ie.goto($htmlRoot + "textfields1.html")
+    goto_page "textfields1.html"
     text_field = $ie.text_field(:name, 'text1')
     button = $ie.button(:value, 'Clear Events Box')
     div = $ie.div(:name, 'divvy')

data/unittests/dialog_test.rb

@@ -1,5 +1,5 @@
 # Feature tests for Dialog class
-# revision: $Revision: 1156 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
@@ -9,7 +9,7 @@ class TC_Dialog_Test < Test::Unit::TestCase
   include Watir
   
   def setup
-    $ie.goto($htmlRoot  + 'JavascriptClick.html')
+    goto_page 'JavascriptClick.html'
   end    
   def teardown
     begin 

data/unittests/div2_xpath_test.rb

@@ -6,7 +6,7 @@ require 'unittests/setup'
 
 class TC_Divs_XPath2 < Test::Unit::TestCase
   def setup
-    $ie.goto($htmlRoot + "list_matters.html")
+    goto_page "list_matters.html"
   end
   def test_div_with_text
     # Note: this test fails, probably because of bad html to xml translation.

data/unittests/div_test.rb

@@ -1,179 +1,180 @@
 # feature tests for Divs, Spans and P's
-# revision: $Revision: 1086 $
+# revision: $Revision: 1354 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Divs < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "div.html")
+    uses_page "div.html"
   end
   
   def test_divs
-    assert_raises(UnknownObjectException) {$ie.div(:id , "div77").click }
-    assert_raises(UnknownObjectException) {$ie.div(:title , "div77").click }
-    
-    assert($ie.text_field(:name, "text1").verify_contains("0") )  
-    $ie.div(:id , "div3").click
-    assert($ie.text_field(:name, "text1").verify_contains("1") )  
-    $ie.div(:id , "div4").click
-    assert($ie.text_field(:name, "text1").verify_contains("0") )  
+    assert_raises(UnknownObjectException) { browser.div(:id, "div77").click }
+    assert_raises(UnknownObjectException) { browser.div(:title, "div77").click }
+    
+    assert browser.text_field(:name, "text1").verify_contains("0")  
+    browser.div(:id, "div3").click
+    assert browser.text_field(:name, "text1").verify_contains("1")  
+    browser.div(:id, "div4").click
+    assert browser.text_field(:name, "text1").verify_contains("0") 
   end
   
   def test_div_properties
-    assert_raises(UnknownObjectException) {$ie.div(:id , "div77").text }
-    assert_raises(UnknownObjectException) {$ie.div(:title , "div77").text }
+    assert_raises(UnknownObjectException) { browser.div(:id, "div77").text }
+    assert_raises(UnknownObjectException) { browser.div(:title, "div77").text }
     
     assert_equal("This div has an onClick that increments text1", 
-    $ie.div(:id , "div3").text.strip )
+      browser.div(:id , "div3").text.strip )
     assert_equal("This text is in a div with an id of div1 and title of test1",   
-    $ie.div(:title , "Test1").text.strip )
-    
-    assert_raises(UnknownObjectException) {$ie.div(:id , "div77").class_name }
-    assert_equal("blueText" ,   $ie.div(:id , "div2").class_name )
-    assert_equal("" ,   $ie.div(:id , "div1").class_name )
-    
-    assert_raises(UnknownObjectException) {$ie.div(:index , 44).class_name }
-    assert_equal("div1" ,      $ie.div(:index , 1).id )
-    assert_equal("" ,          $ie.div(:index , 1).class_name )
-    assert_equal("blueText" ,  $ie.div(:index , 2).class_name )
-    assert_equal(""    ,       $ie.div(:index , 2).value)
-    assert_equal(false ,       $ie.div(:index , 2).disabled)
-    assert_equal(""    ,       $ie.div(:index , 2).name)
-    assert_equal("div2",       $ie.div(:index , 2).id)
+      browser.div(:title , "Test1").text.strip )
+    
+    assert_raises(UnknownObjectException) { browser.div(:id , "div77").class_name }
+    assert_equal("blueText", browser.div(:id, "div2").class_name)
+    assert_equal("", browser.div(:id, "div1").class_name)
+    
+    assert_raises(UnknownObjectException) { browser.div(:index, 44).class_name }
+    assert_equal("div1" ,      browser.div(:index, 1).id)
+    assert_equal("" ,          browser.div(:index, 1).class_name)
+    assert_equal("blueText" ,  browser.div(:index, 2).class_name)
+    assert_equal(""    ,       browser.div(:index, 2).value)
+    assert_equal(false ,       browser.div(:index, 2).disabled)
+    assert_equal(""    ,       browser.div(:index, 2).name)
+    assert_equal("div2",       browser.div(:index, 2).id)
   end
   
   def test_div_iterator
-    assert_equal( 7 , $ie.divs.length)
-    assert_equal( "div1" , $ie.divs[1].id )
-    
-    index =1
-    $ie.divs.each do |s|
-      # puts "each - div= " + s.to_s
-      assert_equal($ie.div(:index, index ).name , s.name )
-      assert_equal($ie.div(:index, index ).id , s.id )
-      assert_equal($ie.div(:index, index ).class_name , s.class_name )
-      index +=1
+    assert_equal(8, browser.divs.length)
+    assert_equal("div1", browser.divs[1].id)
+    
+    index = 1
+    browser.divs.each do |s|
+      assert_equal(browser.div(:index,index).name, s.name)
+      assert_equal(browser.div(:index,index).id, s.id)
+      assert_equal(browser.div(:index,index).class_name , s.class_name)
+      index += 1
     end
-    assert_equal(index-1, $ie.divs.length)   # -1 as we add 1 at the end of the loop
+    assert_equal(index - 1, browser.divs.length)   # -1 as we add 1 at the end of the loop
   end
   
   def test_objects_in_div
-    assert($ie.div(:id, 'buttons1').button(:index,1).exists? )
-    assert(!$ie.div(:id, 'buttons1').button(:index,3).exists? )
-    assert($ie.div(:id, 'buttons1').button(:name,'b1').exists? )
+    assert browser.div(:id, 'buttons1').button(:index,1).exists? 
+    assert !browser.div(:id, 'buttons1').button(:index,3).exists? 
+    assert browser.div(:id, 'buttons1').button(:name,'b1').exists? 
     
-    assert($ie.div(:id, 'buttons2').button(:index,1).exists? )
-    assert($ie.div(:id, 'buttons2').button(:index,2).exists? )
-    assert(!$ie.div(:id, 'buttons1').button(:index,3).exists? )
+    assert browser.div(:id, 'buttons2').button(:index,1).exists? 
+    assert browser.div(:id, 'buttons2').button(:index,2).exists? 
+    assert !browser.div(:id, 'buttons1').button(:index,3).exists? 
     
-    $ie.div(:id, 'buttons1').button(:index,1).click
+    browser.div(:id, 'buttons1').button(:index, 1).click
+    assert_equal('button1', browser.div(:id, 'text_fields1').text_field(:index,1).value)
     
-    assert_equal( 'button1' ,   $ie.div(:id , 'text_fields1').text_field(:index,1).value)
-    
-    assert_equal( 3 , $ie.div(:id , 'text_fields1').text_fields.length )
-    $ie.div(:id, 'text_fields1').text_field(:name, 'div_text1').set("drink me")
-    assert_equal("drink me", $ie.div(:id, 'text_fields1').text_field(:name, 'div_text1').getContents)
+    assert_equal(3, browser.div(:id, 'text_fields1').text_fields.length )
+    browser.div(:id, 'text_fields1').text_field(:name, 'div_text1').set("drink me")
+    assert_equal("drink me", browser.div(:id, 'text_fields1').text_field(:name, 'div_text1').getContents)
+  end
+  
+  def test_images_inside_a_div
+    assert_equal(3, browser.div(:id, 'hasImages').images.length)
+    assert_match(/triangle/, browser.div(:id, 'hasImages').images[1].src)
+    assert_match(/circle/, browser.div(:id, 'hasImages').image(:id , 'circle').src)
   end
   
   #---- Span Tests ---
   def test_spans
-    assert_raises(UnknownObjectException) {$ie.span(:id , "span77").click }
-    assert_raises(UnknownObjectException) {$ie.span(:title , "span77").click }
-    
-    assert($ie.text_field(:name, "text2").verify_contains("0") )  
-    $ie.span(:id , "span3").click
-    assert($ie.text_field(:name, "text2").verify_contains("1") )  
+    assert_raises(UnknownObjectException) {browser.span(:id , "span77").click }
+    assert_raises(UnknownObjectException) {browser.span(:title , "span77").click }
     
-    $ie.span(:id , "span4").click
-    assert($ie.text_field(:name, "text2").verify_contains("0") )  
+    assert(browser.text_field(:name, "text2").verify_contains("0") )  
+    browser.span(:id , "span3").click
+    assert(browser.text_field(:name, "text2").verify_contains("1") )  
     
+    browser.span(:id , "span4").click
+    assert(browser.text_field(:name, "text2").verify_contains("0") )  
   end
   
   def test_span_properties
-    assert_raises(UnknownObjectException) {$ie.span(:id , "span77").text }
-    assert_raises(UnknownObjectException) {$ie.span(:title , "span77").text }
-    
-    assert_equal("This span has an onClick that increments text2" ,   $ie.span(:id , "span3").text.strip )
-    assert_equal("This text is in a span with an id of span1 and title of test2" ,   $ie.span(:title , "Test2").text.strip )
-    
-    assert_raises(UnknownObjectException) {$ie.span(:id , "span77").class_name }
-    assert_equal("blueText" ,   $ie.span(:id , "span2").class_name )
-    assert_equal("" ,   $ie.span(:id , "span1").class_name )
-    
-    assert_raises(UnknownObjectException) {$ie.span(:index , 44).class_name }
-    assert_equal("span1" ,     $ie.span(:index , 1).id )
-    assert_equal("" ,          $ie.span(:index , 1).class_name )
-    assert_equal("blueText" ,  $ie.span(:index , 2).class_name )
-    assert_equal(""    ,       $ie.span(:index , 2).value)
-    assert_equal(false ,       $ie.span(:index , 2).disabled)
-    assert_equal(""    ,       $ie.span(:index , 2).name)
-    assert_equal("span2",      $ie.span(:index , 2).id)
+    assert_raises(UnknownObjectException) {browser.span(:id , "span77").text }
+    assert_raises(UnknownObjectException) {browser.span(:title , "span77").text }
+    
+    assert_equal("This span has an onClick that increments text2" ,   browser.span(:id , "span3").text.strip )
+    assert_equal("This text is in a span with an id of span1 and title of test2" ,   browser.span(:title , "Test2").text.strip )
+    
+    assert_raises(UnknownObjectException) {browser.span(:id , "span77").class_name }
+    assert_equal("blueText" ,   browser.span(:id , "span2").class_name )
+    assert_equal("" ,   browser.span(:id , "span1").class_name )
+    
+    assert_raises(UnknownObjectException) {browser.span(:index , 44).class_name }
+    assert_equal("span1" ,     browser.span(:index , 1).id )
+    assert_equal("" ,          browser.span(:index , 1).class_name )
+    assert_equal("blueText" ,  browser.span(:index , 2).class_name )
+    assert_equal(""    ,       browser.span(:index , 2).value)
+    assert_equal(false ,       browser.span(:index , 2).disabled)
+    assert_equal(""    ,       browser.span(:index , 2).name)
+    assert_equal("span2",      browser.span(:index , 2).id)
   end
   
   def test_span_iterator
-    assert_equal(7, $ie.spans.length)
-    assert_equal("span1", $ie.spans[1].id)
+    assert_equal(7, browser.spans.length)
+    assert_equal("span1", browser.spans[1].id)
     
     index = 1
-    $ie.spans.each do |s|
+    browser.spans.each do |s|
       # puts "each - span = " + s.to_s
-      assert_equal($ie.span(:index, index ).name , s.name )
-      assert_equal($ie.span(:index, index ).id , s.id )
-      assert_equal($ie.span(:index, index ).class_name , s.class_name )
+      assert_equal(browser.span(:index, index ).name , s.name )
+      assert_equal(browser.span(:index, index ).id , s.id )
+      assert_equal(browser.span(:index, index ).class_name , s.class_name )
       index += 1
     end
-    assert_equal(index - 1, $ie.spans.length)   # -1 as we add 1 at the end of the loop
+    assert_equal(index - 1, browser.spans.length)   # -1 as we add 1 at the end of the loop
   end
   
   def test_objects_in_span
-    assert($ie.span(:id, 'buttons1').button(:index,1).exists? )
-    assert(!$ie.span(:id, 'buttons1').button(:index,3).exists? )
-    assert($ie.span(:id, 'buttons1').button(:name,'b1').exists? )
-    
-    assert($ie.span(:id, 'buttons2').button(:index,1).exists? )
-    assert($ie.span(:id, 'buttons2').button(:index,2).exists? )
-    assert(!$ie.span(:id, 'buttons1').button(:index,3).exists? )
-    
-    $ie.span(:id, 'buttons1').button(:index,1).click
+    assert(browser.span(:id, 'buttons1').button(:index,1).exists? )
+    assert(!browser.span(:id, 'buttons1').button(:index,3).exists? )
+    assert(browser.span(:id, 'buttons1').button(:name,'b1').exists? )
     
-    assert_equal( 'button1' ,   $ie.span(:id , 'text_fields1').text_field(:index,1).value)
+    assert(browser.span(:id, 'buttons2').button(:index,1).exists? )
+    assert(browser.span(:id, 'buttons2').button(:index,2).exists? )
+    assert(!browser.span(:id, 'buttons1').button(:index,3).exists? )
     
-    assert_equal( 3 , $ie.span(:id , 'text_fields1').text_fields.length )
+    browser.span(:id, 'buttons1').button(:index,1).click
+    assert_equal( 'button1' ,   browser.span(:id , 'text_fields1').text_field(:index,1).value)
+    assert_equal( 3 , browser.span(:id , 'text_fields1').text_fields.length )
   end
   
   def test_p
-    assert($ie.p(:id, 'number1').exists?)
-    assert($ie.p(:index, 3).exists?)
-    assert($ie.p(:title, 'test_3').exists?)
-    
-    assert(!$ie.p(:id, 'missing').exists?)
-    assert(!$ie.p(:index, 8).exists?)
-    assert(!$ie.p(:title, 'test_55').exists?)
-    
-    assert_raises( UnknownObjectException) {$ie.p(:id , 'missing').class_name }
-    assert_raises( UnknownObjectException) {$ie.p(:id , 'missing').text }
-    assert_raises( UnknownObjectException) {$ie.p(:id , 'missing').title }
-    assert_raises( UnknownObjectException) {$ie.p(:id , 'missing').to_s }
-    assert_raises( UnknownObjectException) {$ie.p(:id , 'missing').disabled }
-    
-    assert_equal(  'redText' , $ie.p(:index,1).class_name)
-    assert_equal(  'P_tag_1' , $ie.p(:index,1).title)
-    assert_equal(  'This text is in a p with an id of number2' , $ie.p(:index,2).text)
+    assert(browser.p(:id, 'number1').exists?)
+    assert(browser.p(:index, 3).exists?)
+    assert(browser.p(:title, 'test_3').exists?)
+    
+    assert(!browser.p(:id, 'missing').exists?)
+    assert(!browser.p(:index, 8).exists?)
+    assert(!browser.p(:title, 'test_55').exists?)
+    
+    assert_raises( UnknownObjectException) {browser.p(:id , 'missing').class_name }
+    assert_raises( UnknownObjectException) {browser.p(:id , 'missing').text }
+    assert_raises( UnknownObjectException) {browser.p(:id , 'missing').title }
+    assert_raises( UnknownObjectException) {browser.p(:id , 'missing').to_s }
+    assert_raises( UnknownObjectException) {browser.p(:id , 'missing').disabled }
+    
+    assert_equal('redText' , browser.p(:index,1).class_name)
+    assert_equal('P_tag_1' , browser.p(:index,1).title)
+    assert_equal('This text is in a p with an id of number2' , browser.p(:index,2).text)
   end
   
   def test_p_iterator
-    assert_equal( 3, $ie.ps.length)
-    assert_equal( 'italicText', $ie.ps[2].class_name)
-    assert_equal( 'number3', $ie.ps[3].id)
-    
-    count=1
-    $ie.ps.each do |p|
-      assert_equal('number'+count.to_s , p.id)
-      count+=1
+    assert_equal(3, browser.ps.length)
+    assert_equal('italicText', browser.ps[2].class_name)
+    assert_equal('number3', browser.ps[3].id)
+    
+    count = 1
+    browser.ps.each do |p|
+      assert_equal('number'+count.to_s, p.id)
+      count += 1
     end
-    assert_equal( count-1 ,  $ie.ps.length)
+    assert_equal(count - 1,  browser.ps.length)
   end
 end