watir 1.5.6 → 1.6.2

data/{watir → lib/watir}/input_elements.rb

@@ -2,13 +2,7 @@ module Watir
   
   class InputElement < Element
     def locate
-      if @how == :xpath
-        @o = @container.element_by_xpath(@what)
-      elsif @how == :ole_object
-        @o = @what
-      else
-        @o = @container.locate_input_element(@how, @what, self.class::INPUT_TYPES)
-      end
+      @o = @container.locate_input_element(@how, @what, self.class::INPUT_TYPES)
     end
     def initialize(container, how, what)
       set_container container
@@ -118,18 +112,19 @@ module Watir
     end
 
     # Does the SelectList include the specified option (text)?
-    def includes? text
-      getAllContents.include? text
+    def includes? text_or_regexp
+      getAllContents.grep(text_or_regexp).size > 0
     end
 
     # Is the specified option (text) selected? Raises exception of option does not exist.
-    def selected? text
-      unless includes? text
-        raise UnknownObjectException, "Option #{text} not found."
+    def selected? text_or_regexp
+      unless includes? text_or_regexp
+        raise UnknownObjectException, "Option #{text_or_regexp.inspect} not found."
       end
-      getSelectedItems.include? text
+
+      getSelectedItems.grep(text_or_regexp).size > 0
     end
-    
+
     def option(attribute, value)
       assert_exists
       Option.new(self, attribute, value)
@@ -456,21 +451,13 @@ module Watir
   #
   # most of the methods available to this element are inherited from the Element class
   #
-  class RadioCheckCommon < Element
+  class RadioCheckCommon < InputElement
     def locate
-      if @how == :xpath
-        @o = @container.element_by_xpath(@what)
-      else
-        @o = @container.locate_input_element(@how, @what, @type, @value)
-      end
+      @o = @container.locate_input_element(@how, @what, self.class::INPUT_TYPES, @value)
     end
-    def initialize(container, how, what, type, value=nil)
-      set_container container
-      @how = how
-      @what = what
-      @type = type
+    def initialize(container, how, what, value=nil)
+      super container, how, what
       @value = value
-      super(nil)
     end
     
     # BUG: rename me
@@ -484,7 +471,23 @@ module Watir
     alias getState isSet?
     alias checked? isSet?
     
-    # This method clears a radio button or check box. Note, with radio buttons one of them will almost always be set.
+    # This method is the common code for setting or clearing checkboxes and radio.
+    def set_clear_item(set)
+      @o.checked = set
+      @o.fireEvent("onClick")
+      @container.wait
+    end
+    private :set_clear_item
+    
+  end
+  
+  #--
+  #  this class makes the docs better
+  #++
+  # This class is the watir representation of a radio button.
+  class Radio < RadioCheckCommon
+    INPUT_TYPES = ["radio"]
+    # This method clears a radio button. One of them will almost always be set.
     # Returns true if set or false if not set.
     #   Raises UnknownObjectException if its unable to locate an object
     #         ObjectDisabledException IF THE OBJECT IS DISABLED
@@ -495,36 +498,22 @@ module Watir
       highlight(:clear)
     end
     
-    # This method sets the radio list item or check box.
+    # This method sets the radio list item.
     #   Raises UnknownObjectException  if it's unable to locate an object
     #         ObjectDisabledException  if the object is disabled
     def set
       assert_enabled
       highlight(:set)
+      @o.scrollIntoView
       set_clear_item(true)
       highlight(:clear)
     end
     
-    # This method is the common code for setting or clearing checkboxes and radio.
-    def set_clear_item(set)
-      @o.checked = set
-      @o.fireEvent("onClick")
-      @container.wait
-    end
-    private :set_clear_item
-    
-  end
-  
-  #--
-  #  this class makes the docs better
-  #++
-  # This class is the watir representation of a radio button.
-  class Radio < RadioCheckCommon
   end
   
   # This class is the watir representation of a check box.
   class CheckBox < RadioCheckCommon
-    
+    INPUT_TYPES = ["checkbox"]
     # With no arguments supplied, sets the check box.
     # If the optional value is supplied, the checkbox is set, when its true and 
     # cleared when its false

data/{watir → lib/watir}/locator.rb

@@ -34,8 +34,6 @@ module Watir
     end    
 
     def locate
-      index_target = @specifiers[:index]
-
       count = 0
       each_element(@tag) do |element|
         
@@ -47,7 +45,7 @@ module Watir
             end
           end
           count += 1
-          unless index_target == count
+          unless count == @specifiers[:index]
             throw :next_element
           end
           return element.ole_object          
@@ -85,43 +83,56 @@ module Watir
     end
     def specifier= arg
       how, what, value = arg
-      how = :value if how == :caption
-      how = :class_name if how == :class
-      what = what.to_i if how == :index
-      value = value.to_s if value 
-      @how = how
-      @what = what
-      @value = value
+
+      if how.class == Hash and what.nil?
+        specifiers = how
+      else
+        specifiers = {how => what}
+      end
+
+      @specifiers = {:index => 1} # default if not specified
+      @specifiers[:value] = value.to_s if value
+      specifiers.each do | how, what |
+        how = :value if how == :caption
+        how = :class_name if how == :class
+        what = what.to_i if how == :index
+        @specifiers[how] = what
+      end
     end
+
     def locate
-      object_index = 1
+      count = 0
       @elements.each do |object|
         element = Element.new(object)
-        if @types.include?(element.type)
-          if @how == :index
-            attribute = object_index
-          else
-            begin
-              attribute = element.send(@how)
-            rescue NoMethodError
-              raise MissingWayOfFindingObjectException,
-                "#{@how} is an unknown way of finding an <INPUT> element (#{@what})"
-            end
-          end
-          if @what.matches(attribute)
-            if @value
-              if element.value == @value
-                return object
-              end
-            else
-              return object
+
+        catch :next_element do
+          throw :next_element unless @types.include?(element.type)
+          @specifiers.each do |how, what|
+            next if how == :index
+            unless match? element, how, what
+              throw :next_element
             end
           end
-          object_index += 1
+          count += 1
+          throw :next_element unless count == @specifiers[:index]
+          return object
         end
+
       end
-      return nil
+      nil
     end
+    # return true if the element matches the provided how and what
+    def match? element, how, what
+      begin
+        attribute = element.send(how)
+      rescue NoMethodError
+        raise MissingWayOfFindingObjectException,
+          "#{how} is an unknown way of finding an <INPUT> element (#{what})"
+      end
+
+      what.matches(attribute)
+    end
+    
     def fast_locate
       # Searching through all elements returned by ole_inner_elements
       # is *significantly* slower than IE's getElementById() and
@@ -131,18 +142,20 @@ module Watir
       # where the :name matches, so we will only return the results of
       # getElementById() if the matching element actually HAS a matching
       # :id.
-      begin
-        if @what.class == String   # Only use fast calls with String what.
-          if @how == :id
-            @element = @document.getElementById(what)
-            # Return if our fast match really HAS a matching :id
-            return @element if @element.nil? or @element.invoke('id') == what
-          elsif how == :name
-            @elements = @document.getElementsByName(what)
-          end
-        end
-      rescue
-      end      
+
+      the_id = @specifiers[:id]
+      if the_id && the_id.class == String && 
+        @specifiers[:index] == 1 && @specifiers.length == 2
+        @element = @document.getElementById(the_id) rescue nil
+        # Return if our fast match really HAS a matching :id
+        return true if @element && @element.invoke('id') == the_id
+      end
+
+      the_name = @specifiers[:name]
+      if the_name && the_name.class == String
+        @elements = @document.getElementsByName(the_name) rescue nil
+      end
+      false
     end
   end
 end    

data/{watir → lib/watir}/page-container.rb

@@ -12,7 +12,7 @@ module Watir
       n = self.document.invoke('parentWindow').navigator.appVersion
       m=/MSIE\s(.*?);/.match( n )
       if m and m[1] =='7.0'
-        if m=/HTTP (\d\d\d.*)/.match( self.title )
+        if m = /HTTP (\d\d\d.*)/.match( self.title )
           raise NavigationException, m[1]
         end
       else
@@ -50,7 +50,7 @@ module Watir
     def eval_in_spawned_process(command)
       command.strip!
       load_path_code = _code_that_copies_readonly_array($LOAD_PATH, '$LOAD_PATH')
-      ruby_code = "require 'watir'; "
+      ruby_code = "require 'watir/ie'; "
 #      ruby_code = "$HIDE_IE = #{$HIDE_IE};" # This prevents attaching to a window from setting it visible. However modal dialogs cannot be attached to when not visible.
       ruby_code << "pc = #{attach_command}; " # pc = page container
       # IDEA: consider changing this to not use instance_eval (it makes the code hard to understand)

data/{watir → lib/watir}/table.rb

@@ -99,13 +99,18 @@ module Watir
       return TableRow.new(@container, :ole_object, _row(index))
     end
     
-    # This method returns the number of rows in the table.
-    # Raises an UnknownObjectException if the table doesnt exist.
+    # Returns the number of rows inside the table, including rows in nested tables.
     def row_count
       assert_exists
       #return table_body.children.length
       return @o.getElementsByTagName("TR").length
     end
+
+    # Returns the number of rows in the table, not including rows in nested tables.    
+    def row_count_excluding_nested_tables
+      assert_exists
+      return @o.rows.length
+    end    
     
     # This method returns the number of columns in a row of the table.
     # Raises an UnknownObjectException if the table doesn't exist.

data/lib/watir/version.rb

@@ -0,0 +1,5 @@
+module Watir
+  class IE
+    VERSION = '1.6.2'
+  end
+end

data/{watir → lib/watir}/watir_simple.rb

@@ -49,7 +49,7 @@ module Watir
 # Most action methods in Watir::Simple will automatically wait for the browser
 # not to be busy before and after they perform the specified action.
 #
-# revision: $Revision: 1007 $
+# revision: $Revision: 1505 $
   module Simple
 
   # Open up a browser and point it at a certain URL.
@@ -259,9 +259,9 @@ module Watir
   # * mesg - An assertion-failed message.
 	def assert_text_not_in_body(text,mesg=nil)
 		if mesg.nil? then
-			assert(! @@browser.pageContainsText(text), "found in body: [#{text}]")
+			assert_false( @@browser.pageContainsText(text), "found in body: [#{text}]")
 		else
-			assert(! @@browser.pageContainsText(text), mesg)
+			assert_false( @@browser.pageContainsText(text), mesg)
 		end
 	end
 

data/lib/watir/win32ole.rb

@@ -0,0 +1,6 @@
+# load the correct version of win32ole
+
+# Use our modified win32ole library
+$LOAD_PATH.unshift  File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir', 'win32ole'))
+require 'win32ole'
+

data/unittests/buttons_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for 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_Buttons_XPath < Test::Unit::TestCase
@@ -12,58 +12,58 @@ class TC_Buttons_XPath < Test::Unit::TestCase
   end
   
   def test_properties
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:xpath, "//input[@name='noName']/").id   }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:xpath, "//input[@name='noName']/").name   }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:xpath, "//input[@name='noName']/").disabled   }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:xpath, "//input[@name='noName']/").type   }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:xpath, "//input[@name='noName']/").value   }  
+    assert_raises(UnknownObjectException) {   browser.button(:xpath, "//input[@name='noName']/").id   }  
+    assert_raises(UnknownObjectException) {   browser.button(:xpath, "//input[@name='noName']/").name   }  
+    assert_raises(UnknownObjectException) {   browser.button(:xpath, "//input[@name='noName']/").disabled   }  
+    assert_raises(UnknownObjectException) {   browser.button(:xpath, "//input[@name='noName']/").type   }  
+    assert_raises(UnknownObjectException) {   browser.button(:xpath, "//input[@name='noName']/").value   }  
     
-    assert_equal("b1"  , $ie.button(:xpath, "//input[@id='b2']/").name  ) 
-    assert_equal("b2"  , $ie.button(:xpath, "//input[@id='b2']/").id  ) 
-    assert_equal("button"  , $ie.button(:xpath, "//input[@id='b2']/").type  ) 
+    assert_equal("b1"  , browser.button(:xpath, "//input[@id='b2']/").name  ) 
+    assert_equal("b2"  , browser.button(:xpath, "//input[@id='b2']/").id  ) 
+    assert_equal("button"  , browser.button(:xpath, "//input[@id='b2']/").type  ) 
   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(:xpath, "//input[@value='Missing Caption']/").click   }  
+    assert_raises(UnknownObjectException) {   browser.button(:xpath, "//input[@value='Missing Caption']/").click   }  
     
-    $ie.button(:xpath, "//input[@value='Click Me']/").click
-    assert($ie.text.include?("PASS") )
+    browser.button(:xpath, "//input[@value='Click Me']/").click
+    assert(browser.text.include?("PASS") )
   end
   
   def test_Button_click_only
-    $ie.button(:xpath, "//input[@value='Click Me']/").click
-    assert($ie.text.include?("PASS") )
+    browser.button(:xpath, "//input[@value='Click Me']/").click
+    assert(browser.text.include?("PASS") )
   end
   
   def test_button_click
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:xpath, "//input[@value='Missing Caption']/").click   }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:xpath, "//input[@id='MissingId']/").click   }  
+    assert_raises(UnknownObjectException) {   browser.button(:xpath, "//input[@value='Missing Caption']/").click   }  
+    assert_raises(UnknownObjectException) {   browser.button(:xpath, "//input[@id='MissingId']/").click   }  
     
-    assert_raises(ObjectDisabledException , "ObjectDisabledException was supposed to be thrown" ) {   $ie.button(:xpath, "//input[@value='Disabled Button']/").click   }  
+    assert_raises(ObjectDisabledException , "ObjectDisabledException was supposed to be thrown" ) {   browser.button(:xpath, "//input[@value='Disabled Button']/").click   }  
     
-    $ie.button(:xpath, "//input[@value='Click Me']/").click
-    assert($ie.text.include?("PASS") )
+    browser.button(:xpath, "//input[@value='Click Me']/").click
+    assert(browser.text.include?("PASS") )
   end
   
   def test_Button_Exists
-    assert($ie.button(:xpath, "//input[@value='Click Me']/").exists?)   
-    assert($ie.button(:xpath, "//input[@value='Submit']/").exists?)   
-    assert($ie.button(:xpath, "//input[@name='b1']/").exists?)   
-    assert($ie.button(:xpath, "//input[@id='b2']/").exists?)   
+    assert(browser.button(:xpath, "//input[@value='Click Me']/").exists?)   
+    assert(browser.button(:xpath, "//input[@value='Submit']/").exists?)   
+    assert(browser.button(:xpath, "//input[@name='b1']/").exists?)   
+    assert(browser.button(:xpath, "//input[@id='b2']/").exists?)   
     
-    assert(!$ie.button(:xpath, "//input[@value='Missing Caption']/").exists?)   
-    assert(!$ie.button(:xpath, "//input[@name='missingname']/").exists?)   
-    assert(!$ie.button(:xpath, "//input[@id='missingid']/").exists?)   
+    assert_false(browser.button(:xpath, "//input[@value='Missing Caption']/").exists?)   
+    assert_false(browser.button(:xpath, "//input[@name='missingname']/").exists?)   
+    assert_false(browser.button(:xpath, "//input[@id='missingid']/").exists?)   
   end
   
   def test_Button_Enabled
-    assert($ie.button(:xpath, "//input[@value='Click Me']/").enabled?)   
-    assert(!$ie.button(:xpath, "//input[@value='Disabled Button']/").enabled?)   
-    assert(!$ie.button(:xpath, "//input[@name='b4']/").enabled?)   
-    assert(!$ie.button(:xpath, "//input[@id='b5']/").enabled?)   
+    assert(browser.button(:xpath, "//input[@value='Click Me']/").enabled?)   
+    assert_false(browser.button(:xpath, "//input[@value='Disabled Button']/").enabled?)   
+    assert_false(browser.button(:xpath, "//input[@name='b4']/").enabled?)   
+    assert_false(browser.button(:xpath, "//input[@id='b5']/").enabled?)   
     
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.button(:xpath, "//input[@name='noName']/").enabled?  }  
+    assert_raises(UnknownObjectException) {   browser.button(:xpath, "//input[@name='noName']/").enabled?  }  
   end
 end