watir 1.6.2 → 1.6.5

data/lib/watir/camel_case.rb

@@ -1,46 +1,67 @@
-# These are provided for backwards compatability with Watir 1.1
-
-module Watir
-    module Container
-        alias waitForIE wait
-        alias fileField file_field
-        alias textField text_field
-        alias selectBox select_list
-        alias checkBox checkbox
-    end
-    class IE
-        alias getStatus status
-        alias getDocument document
-        alias pageContainsText contains_text
-        alias waitForIE wait
-        alias getHTML html
-        alias getText text
-        alias showFrames show_frames
-        alias showForms show_forms
-        alias showImages show_images
-        alias showLinks show_links
-        alias showActive show_active
-        alias showAllObjects show_all_objects
-        def   getIE; @ie; end
-        
-    end
-    class Element
-        alias getOLEObject ole_object 
-        alias fireEvent fire_event        
-        alias innerText text
-        alias afterText after_text
-        alias beforeText before_text
-    end    
-    class Frame        
-        alias getDocument document
-        alias waitForIE wait
-    end
-    class Form        
-        alias waitForIE wait 
-    end
-    class TextField
-        alias readOnly? :readonly?
-        alias getContents value
-        alias maxLength maxlength
-    end    
+# These are provided for backwards compatability with Watir 1.1
+
+module Watir
+    module Container
+        alias waitForIE wait
+        alias fileField file_field
+        alias textField text_field
+        alias selectBox select_list
+        alias checkBox checkbox
+    end
+    class IE
+        alias getStatus status
+        alias getDocument document
+        alias pageContainsText contains_text
+        alias waitForIE wait
+        alias getHTML html
+        alias getText text
+        alias showFrames show_frames
+        alias showForms show_forms
+        alias showImages show_images
+        alias showLinks show_links
+        alias showActive show_active
+        alias showAllObjects show_all_objects
+        def   getIE; @ie; end
+        
+    end
+    class Element
+        alias getOLEObject ole_object 
+        alias fireEvent fire_event        
+        alias innerText text
+        alias afterText after_text
+        alias beforeText before_text
+    end    
+    class Frame        
+        alias getDocument document
+        alias waitForIE wait
+    end
+    class Form        
+        alias waitForIE wait 
+    end
+
+
+    class Image
+      alias fileCreatedDate file_created_date
+      alias fileSize file_size
+      alias hasLoaded? loaded?
+    end
+    
+    class RadioCheckCommon
+      alias getState set?
+      alias isSet?   set?
+    end
+    
+    class TextField
+        alias readOnly? :readonly?
+        alias getContents value
+        alias maxLength maxlength
+        alias dragContentsTo drag_contents_to
+    end 
+    
+    class SelectList
+        alias getAllContents options
+        alias getSelectedItems selected_options
+        alias clearSelection clear
+        alias includes? include?
+    end   
 end

data/lib/watir/clickJSDialog.rb

@@ -1,19 +1,19 @@
-#
-#  clickJSDialog.rb 
-#
-#
-# This file contains the JS clicker when it runs as a separate process
-
-$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..'))
-puts $LOAD_PATH
-require 'watir/winClicker'
-
-button = "OK"
-button = ARGV[0] unless ARGV[0] == nil
-sleepTime = 0
-sleepTime = ARGV[1] unless ARGV[1] == nil
-
-
-clicker= WinClicker.new
-result = clicker.clickJavaScriptDialog( button )
-clicker = nil
+#
+#  clickJSDialog.rb 
+#
+#
+# This file contains the JS clicker when it runs as a separate process
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..'))
+puts $LOAD_PATH
+require 'watir/winClicker'
+
+button = "OK"
+button = ARGV[0] unless ARGV[0] == nil
+sleepTime = 0
+sleepTime = ARGV[1] unless ARGV[1] == nil
+
+
+clicker= WinClicker.new
+result = clicker.clickJavaScriptDialog( button )
+clicker = nil

data/lib/watir/close_all.rb

@@ -1,38 +1,38 @@
-require 'watir/ie'
-
-module Watir
-  class IE
-    # close all ie browser windows
-    def self.close_all
-      close_all_but nil
-    end
-    # find other ie browser windows and close them
-    def close_others
-      IE.close_all_but self
-    end
-    private
-    def self.close_all_but(except=nil)
-      Watir::IE.each do |ie|
-        ie.close_modal
-        ie.close unless except and except.hwnd == ie.hwnd
-      end
-      sleep 1.0 # replace with polling for window count to be zero?
-    end
-    public
-    # close modal dialog. unlike IE#modal_dialog.close, does not wait for dialog
-    # to appear and does not raise exception if no window is found.
-    # returns true if modal was found and close, otherwise false
-    def close_modal
-      begin
-        original_attach_timeout = IE.attach_timeout
-        IE.attach_timeout = 0
-        self.modal_dialog.close
-        true
-      rescue NoMatchingWindowFoundException, TimeOutException
-        false
-      ensure
-        IE.attach_timeout = original_attach_timeout
-      end
-    end
-  end
+require 'watir/ie'
+
+module Watir
+  class IE
+    # close all ie browser windows
+    def self.close_all
+      close_all_but nil
+    end
+    # find other ie browser windows and close them
+    def close_others
+      IE.close_all_but self
+    end
+    private
+    def self.close_all_but(except=nil)
+      Watir::IE.each do |ie|
+        ie.close_modal
+        ie.close unless except and except.hwnd == ie.hwnd
+      end
+      sleep 1.0 # replace with polling for window count to be zero?
+    end
+    public
+    # close modal dialog. unlike IE#modal_dialog.close, does not wait for dialog
+    # to appear and does not raise exception if no window is found.
+    # returns true if modal was found and close, otherwise false
+    def close_modal
+      begin
+        original_attach_timeout = IE.attach_timeout
+        IE.attach_timeout = 0
+        self.modal_dialog.close
+        true
+      rescue NoMatchingWindowFoundException, TimeOutException
+        false
+      ensure
+        IE.attach_timeout = original_attach_timeout
+      end
+    end
+  end
 end

data/lib/watir/collections.rb

@@ -1,312 +1,344 @@
-module Watir
-  #--
-  #   These classes are not for public consumption, so we switch off rdoc
-    
-  # presumes element_class or element_tag is defined
-  # for subclasses of ElementCollections
-  module CommonCollection
-    def element_tag
-      element_class::TAG
-    end
-    def length
-      @container.document.getElementsByTagName(element_tag).length
-    end
-  end
-  
-  # This class is used as part of the .show method of the iterators class
-  # it would not normally be used by a user
-  class AttributeLengthPairs
-    
-    # This class is used as part of the .show method of the iterators class
-    # it would not normally be used by a user
-    class AttributeLengthHolder
-      attr_accessor :attribute
-      attr_accessor :length
-      
-      def initialize(attrib, length)
-        @attribute = attrib
-        @length = length
-      end
-    end
-    
-    def initialize(attrib=nil, length=nil)
-      @attr=[]
-      add(attrib, length) if attrib
-      @index_counter = 0
-    end
-    
-    # BUG: Untested. (Null implementation passes all tests.)
-    def add(attrib, length)
-      @attr << AttributeLengthHolder.new(attrib, length)
-    end
-    
-    def delete(attrib)
-      item_to_delete = nil
-      @attr.each_with_index do |e,i|
-        item_to_delete = i if e.attribute == attrib
-      end
-      @attr.delete_at(item_to_delete) unless item_to_delete == nil
-    end
-    
-    def next
-      temp = @attr[@index_counter]
-      @index_counter += 1
-      return temp
-    end
-    
-    def each
-      0.upto(@attr.length-1) { |i | yield @attr[i]   }
-    end
-  end
-  
-  #    resume rdoc
-  #++
-  
-  # this class accesses the buttons in the document as a collection
-  # it would normally only be accessed by the Watir::Container#buttons method
-  class Buttons < ElementCollections
-    def element_class; Button; end
-    def length
-      get_length_of_input_objects(["button", "submit", "image"])
-    end
-    
-    private
-    def set_show_items
-      super
-      @show_attributes.add("disabled", 9)
-      @show_attributes.add("value", 20)
-    end
-  end
-  
-  # this class accesses the file fields in the document as a collection
-  # normal access is via the Container#file_fields method
-  class FileFields < ElementCollections
-    def element_class; FileField; end
-    def length
-      get_length_of_input_objects(["file"])
-    end
-    
-    private
-    def set_show_items
-      super
-      @show_attributes.add("disabled", 9)
-      @show_attributes.add("value", 20)
-    end
-  end
-  
-  # this class accesses the check boxes in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#checkboxes method
-  class CheckBoxes < ElementCollections
-    def element_class; CheckBox; end
-    def length
-      get_length_of_input_objects("checkbox")
-    end
-    
-    private
-    def iterator_object(i)
-      @container.checkbox(:index, i + 1)
-    end
-  end
-  
-  # this class accesses the radio buttons in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#radios method
-  class Radios < ElementCollections
-    def element_class; Radio; end
-    def length
-      get_length_of_input_objects("radio")
-    end
-    
-    private
-    def iterator_object(i)
-      @container.radio(:index, i + 1)
-    end
-  end
-    
-  # this class accesses the select boxes in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#select_lists method
-  class SelectLists < ElementCollections
-    include CommonCollection
-    def element_class; SelectList; end
-    def element_tag; 'SELECT'; end
-  end
-  
-  # this class accesses the links in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#links method
-  class Links < ElementCollections
-    include CommonCollection
-    def element_class; Link; end
-    def element_tag; 'A'; end
-    
-    private
-    def set_show_items
-      super
-      @show_attributes.add("href", 60)
-      @show_attributes.add("innerText", 60)
-    end
-  end
-  
-  class Lis  < ElementCollections
-    include CommonCollection
-    def element_class; Li; end
-    
-    def set_show_items
-      super
-      @show_attributes.delete( "name")
-      @show_attributes.add( "className" , 20)
-    end
-  end
-  
-  # this class accesses the maps in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#maps method
-  class Maps < ElementCollections
-    include CommonCollection
-    def element_class; Map; end
-    def element_tag; 'MAP'; end
-  end
-
-
-  # this class accesses the areas in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#areas method
-  class Areas < ElementCollections
-    include CommonCollection
-    def element_class; Area; end
-    def element_tag; 'AREA'; end
-  end
-  
-  # this class collects the images in the container
-  # An instance is returned by Watir::Container#images
-  class Images < ElementCollections
-    def element_class; Image; end
-    def length
-      all = @container.document.all
-      imgs = []
-      all.each{|n| imgs << n if n.nodeName == "IMG"}
-      imgs.length
-    end
-    
-    private
-    def set_show_items
-      super
-      @show_attributes.add("src", 60)
-      @show_attributes.add("alt", 30)
-    end
-  end
-  
-  # this class accesses the text fields in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#text_fields method
-  class TextFields < ElementCollections
-    def element_class; TextField; end
-    def length
-      # text areas are also included in the TextFields, but we need to get them seperately
-      get_length_of_input_objects(["text", "password"]) +
-      @container.document.getElementsByTagName("textarea").length
-    end
-  end
-  
-  # this class accesses the hidden fields in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#hiddens method
-  class Hiddens < ElementCollections
-    def element_class; Hidden; end
-    def length
-      get_length_of_input_objects("hidden")
-    end
-  end
-  
-  # this class accesses the text fields in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#tables method
-  class Tables < ElementCollections
-    include CommonCollection
-    def element_class; Table; end
-    def element_tag; 'TABLE'; end
-    
-    private
-    def set_show_items
-      super
-      @show_attributes.delete("name")
-    end
-  end
-  # this class accesses the table rows in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#rows method
-  class TableRows < ElementCollections
-    include CommonCollection
-    def element_class; TableRow; end
-    def element_tag; 'TR'; end
-  end
-  # this class accesses the table cells in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#cells method
-  class TableCells < ElementCollections
-    include CommonCollection
-    def element_class; TableCell; end
-    def element_tag; 'TD'; end
-  end
-  # this class accesses the labels in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#labels method
-  class Labels < ElementCollections
-    include CommonCollection
-    def element_class; Label; end
-    def element_tag; 'LABEL'; end
-    
-    private
-    def set_show_items
-      super
-      @show_attributes.add("htmlFor", 20)
-    end
-  end
-  
-  # this class accesses the pre tags in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#pres method
-  class Pres < ElementCollections
-    include CommonCollection
-    def element_class; Pre; end
-    
-    private
-    def set_show_items
-      super
-      @show_attributes.delete("name")
-      @show_attributes.add("className", 20)
-    end
-  end
-  
-  # this class accesses the p tags in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#ps method
-  class Ps < ElementCollections
-    include CommonCollection
-    def element_class; P; end
-    
-    private
-    def set_show_items
-      super
-      @show_attributes.delete("name")
-      @show_attributes.add("className", 20)
-    end
-    
-  end
-  # this class accesses the spans in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#spans method
-  class Spans < ElementCollections
-    include CommonCollection
-    def element_class; Span; end
-    
-    private
-    def set_show_items
-      super
-      @show_attributes.delete("name")
-      @show_attributes.add("className", 20)
-    end
-  end
-  
-  # this class accesses the divs in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#divs method
-  class Divs < ElementCollections
-    include CommonCollection
-    def element_class; Div; end
-    
-    private
-    def set_show_items
-      super
-      @show_attributes.delete("name")
-      @show_attributes.add("className", 20)
-    end
-  end
-  
-end
+module Watir
+  #--
+  #   These classes are not for public consumption, so we switch off rdoc
+    
+  # presumes element_class or element_tag is defined
+  # for subclasses of ElementCollections
+  module CommonCollection
+    def element_tag
+      element_class::TAG
+    end
+    
+    def length
+      @container.document.getElementsByTagName(element_tag).length
+    end
+    alias_method :size, :length
+  end
+  
+  # This class is used as part of the .show method of the iterators class
+  # it would not normally be used by a user
+  class AttributeLengthPairs
+    
+    # This class is used as part of the .show method of the iterators class
+    # it would not normally be used by a user
+    class AttributeLengthHolder
+      attr_accessor :attribute
+      attr_accessor :length
+      
+      def initialize(attrib, length)
+        @attribute = attrib
+        @length = length
+      end
+    end
+    
+    def initialize(attrib=nil, length=nil)
+      @attr=[]
+      add(attrib, length) if attrib
+      @index_counter = 0
+    end
+    
+    # BUG: Untested. (Null implementation passes all tests.)
+    def add(attrib, length)
+      @attr << AttributeLengthHolder.new(attrib, length)
+    end
+    
+    def delete(attrib)
+      item_to_delete = nil
+      @attr.each_with_index do |e,i|
+        item_to_delete = i if e.attribute == attrib
+      end
+      @attr.delete_at(item_to_delete) unless item_to_delete == nil
+    end
+    
+    def next
+      temp = @attr[@index_counter]
+      @index_counter += 1
+      return temp
+    end
+    
+    def each
+      0.upto(@attr.length-1) { |i | yield @attr[i]   }
+    end
+  end
+  
+  #    resume rdoc
+  #++
+  
+  # this class accesses the buttons in the document as a collection
+  # it would normally only be accessed by the Watir::Container#buttons method
+  class Buttons < ElementCollections
+    def element_class; Button; end
+    def length
+      get_length_of_input_objects(["button", "submit", "image"])
+    end
+    
+    private
+    def set_show_items
+      super
+      @show_attributes.add("disabled", 9)
+      @show_attributes.add("value", 20)
+    end
+  end
+  
+  # this class accesses the file fields in the document as a collection
+  # normal access is via the Container#file_fields method
+  class FileFields < ElementCollections
+    def element_class; FileField; end
+    def length
+      get_length_of_input_objects(["file"])
+    end
+    
+    private
+    def set_show_items
+      super
+      @show_attributes.add("disabled", 9)
+      @show_attributes.add("value", 20)
+    end
+  end
+  
+  # this class accesses the check boxes in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#checkboxes method
+  class CheckBoxes < ElementCollections
+    def element_class; CheckBox; end
+    def length
+      get_length_of_input_objects("checkbox")
+    end
+    
+    private
+    def iterator_object(i)
+      @container.checkbox(:index, i + 1)
+    end
+  end
+  
+  # this class accesses the radio buttons in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#radios method
+  class Radios < ElementCollections
+    def element_class; Radio; end
+    def length
+      get_length_of_input_objects("radio")
+    end
+    
+    private
+    def iterator_object(i)
+      @container.radio(:index, i + 1)
+    end
+  end
+    
+  # this class accesses the select boxes in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#select_lists method
+  class SelectLists < ElementCollections
+    include CommonCollection
+    def element_class; SelectList; end
+    def element_tag; 'SELECT'; end
+  end
+  
+  # this class accesses the links in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#links method
+  class Links < ElementCollections
+    include CommonCollection
+    def element_class; Link; end
+    def element_tag; 'A'; end
+    
+    private
+    def set_show_items
+      super
+      @show_attributes.add("href", 60)
+      @show_attributes.add("innerText", 60)
+    end
+  end
+  
+  class Lis  < ElementCollections
+    include CommonCollection
+    def element_class; Li; end
+    
+    def set_show_items
+      super
+      @show_attributes.delete( "name")
+      @show_attributes.add( "className" , 20)
+    end
+  end
+  
+  # this class accesses the maps in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#maps method
+  class Maps < ElementCollections
+    include CommonCollection
+    def element_class; Map; end
+    def element_tag; 'MAP'; end
+  end
+
+
+  # this class accesses the areas in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#areas method
+  class Areas < ElementCollections
+    include CommonCollection
+    def element_class; Area; end
+    def element_tag; 'AREA'; end
+  end
+  
+  # this class collects the images in the container
+  # An instance is returned by Watir::Container#images
+  class Images < ElementCollections
+    def element_class; Image; end
+    def length
+      all = @container.document.all
+      imgs = []
+      all.each{|n| imgs << n if n.nodeName == "IMG"}
+      imgs.length
+    end
+    
+    private
+    def set_show_items
+      super
+      @show_attributes.add("src", 60)
+      @show_attributes.add("alt", 30)
+    end
+  end
+  
+  # this class accesses the text fields in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#text_fields method
+  class TextFields < ElementCollections
+    def element_class; TextField; end
+    def length
+      # text areas are also included in the TextFields, but we need to get them seperately
+      get_length_of_input_objects(["text", "password"]) +
+      @container.document.getElementsByTagName("textarea").length
+    end
+  end
+  
+  # this class accesses the hidden fields in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#hiddens method
+  class Hiddens < ElementCollections
+    def element_class; Hidden; end
+    def length
+      get_length_of_input_objects("hidden")
+    end
+  end
+  
+  # this class accesses the text fields in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#tables method
+  class Tables < ElementCollections
+    include CommonCollection
+    def element_class; Table; end
+    def element_tag; 'TABLE'; end
+    
+    private
+    def set_show_items
+      super
+      @show_attributes.delete("name")
+    end
+  end
+  # this class accesses the table rows in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#rows method
+  class TableRows < ElementCollections
+    include CommonCollection
+    def element_class; TableRow; end
+    def element_tag; 'TR'; end
+  end
+  # this class accesses the table cells in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#cells method
+  class TableCells < ElementCollections
+    include CommonCollection
+    def element_class; TableCell; end
+    def element_tag; 'TD'; end
+  end
+  # this class accesses the labels in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#labels method
+  class Labels < ElementCollections
+    include CommonCollection
+    def element_class; Label; end
+    def element_tag; 'LABEL'; end
+    
+    private
+    def set_show_items
+      super
+      @show_attributes.add("htmlFor", 20)
+    end
+  end
+  
+  # this class accesses the pre tags in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#pres method
+  class Pres < ElementCollections
+    include CommonCollection
+    def element_class; Pre; end
+    
+    private
+    def set_show_items
+      super
+      @show_attributes.delete("name")
+      @show_attributes.add("className", 20)
+    end
+  end
+  
+  # this class accesses the p tags in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#ps method
+  class Ps < ElementCollections
+    include CommonCollection
+    def element_class; P; end
+    
+    private
+    def set_show_items
+      super
+      @show_attributes.delete("name")
+      @show_attributes.add("className", 20)
+    end
+    
+  end
+  # this class accesses the spans in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#spans method
+  class Spans < ElementCollections
+    include CommonCollection
+    def element_class; Span; end
+    
+    private
+    def set_show_items
+      super
+      @show_attributes.delete("name")
+      @show_attributes.add("className", 20)
+    end
+  end
+  
+  # this class accesses the divs in the document as a collection
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#divs method
+  class Divs < ElementCollections
+    include CommonCollection
+    def element_class; Div; end
+    
+    private
+    def set_show_items
+      super
+      @show_attributes.delete("name")
+      @show_attributes.add("className", 20)
+    end
+  end
+  
+  class Dls < ElementCollections
+    include CommonCollection
+    def element_class; Dl; end
+    def element_tag; Dl::TAG; end
+  end
+
+  class Dts < ElementCollections
+    include CommonCollection
+    def element_class; Dt; end
+    def element_tag; Dt::TAG; end
+  end
+
+  class Dds < ElementCollections
+    include CommonCollection
+    def element_class; Dd; end
+    def element_tag; Dd::TAG; end
+  end
+  
+  class Strongs < ElementCollections
+    include CommonCollection
+    def element_class; Strong; end
+    def element_tag; Strong::TAG; end
+  end
+  
+  class Ems < ElementCollections
+    include CommonCollection
+    def element_class; Em; end
+    def element_tag; Em::TAG; end
+  end
+  
+end