watir 2.0.1 → 2.0.2.rc1

data/CHANGES

@@ -1,3 +1,11 @@
+== Version 2.x.x - 2011/xx/xx
+
+* added support for del, ins, font, meta and ol tags
+* added support for h1, h2, h3, h4, h5, h6 and ul collection methods
+* Watir::IE#execute_script returns now the value of the JavaScript evaluation
+* Watir::Table#rows method iterates correctly over rows
+* speed up dealing with html elements in some situations
+
 == Version 2.0.1 - 2011/08/10
 
 * fixed Watir::IE#close for Ruby 1.9.2 - fixes http://jira.openqa.org/browse/WTR-481

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2.rc1

data/lib/watir/collections.rb

@@ -35,16 +35,21 @@ module Watir
     def element_tag; 'SELECT'; end
   end  
 
-  %w[Buttons FileFields Radios TextFields Hiddens].each do |collection|
+  %w[Button FileField Radio TextField Hidden].each do |element|
     module_eval %Q{
-      class #{collection} < InputElementCollections; end
+      class #{element}s < InputElementCollections; end
     }
   end
+
+  class Inses < ElementCollections
+    def element_class; Ins; end
+  end
   
-  %w[Links Lis Maps Areas Images Tables TableRows TableCells
-     Labels Pres Ps Spans Divs Dls Dts Dds Strongs Ems].each do |collection|
+  %w[Link Li Map Area Image Table TableRow TableCell
+     Label Pre P Span Div Dl Dt Dd Strong Em Del
+     Font H1 H2 H3 H4 H5 H6 Meta Ol Ul].each do |element|
     module_eval %Q{
-      class #{collection} < ElementCollections; end
+      class #{element}s < ElementCollections; end
     }
   end
   

data/lib/watir/container.rb

@@ -14,7 +14,7 @@ module Watir
   #
   # there are many methods available to the Button object
   #--
-  # Is includable for classes that have @container, document and ole_inner_elements
+  # Is includable for classes that have @container, document and __ole_inner_elements
   module Container
     include Watir::Exception
     
@@ -61,10 +61,9 @@ module Watir
     # Not for external consumption
     #
     #++
-    def ole_inner_elements
+    def __ole_inner_elements
       return document.body.all
     end
-    private :ole_inner_elements
     
     # This method shows the available objects on the current page.
     # This is usually only used for debugging or writing new test scripts.
@@ -102,21 +101,18 @@ module Watir
     def input_element_locator(how, what, types, klass=nil)
       locator = InputElementLocator.new self, types, klass
       locator.set_specifier how, what
-      locator.document = document
-      return locator.element if locator.fast_locate
-      locator.elements = ole_inner_elements if locator.elements.nil?
       locator
     end
     
     def tagged_element_locator(tag, how, what, klass=nil)
-      locator = TaggedElementLocator.new(self, tag, klass)
-      locator.set_specifier(how, what)
+      locator = TaggedElementLocator.new self, tag, klass
+      locator.set_specifier how, what
       locator
     end
 
     def locator_for(locator_class, how, what)
-      locator = locator_class.new(self)
-      locator.set_specifier(how, what)
+      locator = locator_class.new self
+      locator.set_specifier how, what
       locator
     end
     

data/lib/watir/element.rb

@@ -152,13 +152,11 @@ module Watir
       ole_object.getAttribute('name') || ''
     end
 
-    def ole_inner_elements
+    def __ole_inner_elements
       assert_exists
       return ole_object.all
     end
 
-    private :ole_inner_elements
-
     def document
       assert_exists
       return ole_object
@@ -338,10 +336,9 @@ module Watir
 
     def dispatch_event(event)
       if IE.version_parts.first.to_i >= 9
-        begin
-          # we're in IE9 document standards mode
+        if @container.page_container.document_mode.to_i >= 9
           ole_object.dispatchEvent(create_event(event))
-        rescue WIN32OLERuntimeError
+        else
           ole_object.fireEvent(event)
         end
       else

data/lib/watir/form.rb

@@ -43,11 +43,10 @@ module Watir
       @container.wait
     end
     
-    def ole_inner_elements
+    def __ole_inner_elements
       assert_exists
       @o.elements
     end
-    private :ole_inner_elements
 
     # This method is responsible for setting and clearing the colored highlighting on the specified form.
     # use :set  to set the highlight

data/lib/watir/frame.rb

@@ -20,10 +20,9 @@ module Watir
       end
     end
 
-    def ole_inner_elements
+    def __ole_inner_elements
       document.body.all
     end
-    private :ole_inner_elements
 
     def initialize(container, how, what)
       set_container container
@@ -41,6 +40,10 @@ module Watir
       end
     end
 
+    def document_mode
+      document.documentMode
+    end
+
     def attach_command
       @container.page_container.attach_command + ".frame(#{@how.inspect}, #{@what.inspect})".gsub('"','\'')
     end

data/lib/watir/ie-class.rb

@@ -368,6 +368,13 @@ module Watir
       @ie.document.title
     end
 
+    # The document standards mode used by IE
+    # can be overridden in the html with: <meta http-equiv="x-ua-compatible" content="IE=8">
+    def document_mode
+      @ie.document.documentMode.to_i
+    end
+
+
     # Return the status of the window, typically from the status bar at the bottom.
     def status
       return @ie.statusText
@@ -413,8 +420,16 @@ module Watir
     # Execute the given JavaScript string
     def execute_script(source)
       document.parentWindow.eval(source.to_s)
-    rescue WIN32OLERuntimeError
-      document.parentWindow.execScript(source.to_s)
+    rescue WIN32OLERuntimeError #if eval fails we need to use execScript(source.to_s) which does not return a value, hence the workaround
+      wrapper = "_watir_helper_div_#{rand(100000)}"
+      escaped_src = source.to_s
+      escaped_src = escaped_src.gsub("'", "\\\\'")
+      cmd = "var e= document.createElement('DIV'); e.id='#{wrapper}'; e.innerHTML= eval('#{escaped_src}');document.body.appendChild(e);"
+      document.parentWindow.execScript(cmd)
+      wrapper_obj = document.getElementById(wrapper)
+      result_value = wrapper_obj.innerHTML
+      wrapper_obj.style.display = 'none'
+      result_value
     end
 
     # clear the list of urls that we have visited

data/lib/watir/locator.rb

@@ -3,6 +3,10 @@ module Watir
     include Watir
     include Watir::Exception
 
+    def document
+      @document ||= @container.document
+    end
+
     def normalize_specifiers!(specifiers)
       specifiers.each do |how, what|
         case how
@@ -28,11 +32,35 @@ module Watir
       @specifiers.all? {|how, what| how == :index || match?(element, how, what)}
     end
 
+    def has_excluding_specifiers?
+      @specifiers.keys.any? {|specifier| [:css, :xpath, :ole_object].include? specifier}
+    end
+
     def set_specifier(how, what=nil)
       specifiers = what ? {how => what} : how
       @specifiers = {:index => Watir::IE.base_index} # default if not specified
       normalize_specifiers! specifiers
     end
+    
+    def locate_by_id
+      # Searching through all elements returned by __ole_inner_elements
+      # is *significantly* slower than IE's getElementById() and
+      # getElementsByName() calls when how is :id.  However
+      # IE doesn't match Regexps, so first we make sure what is a String.
+      # In addition, IE's getElementById() will also return an element
+      # where the :name matches, so we will only return the results of
+      # getElementById() if the matching element actually HAS a matching
+      # :id.
+
+      the_id = @specifiers[:id]
+      if the_id && the_id.class == String 
+        element = document.getElementById(the_id) rescue nil
+        # Return if our fast match really HAS a matching :id
+        return element if element && element.invoke('id') == the_id 
+      end
+
+      nil
+    end
 
     def locate_by_xpath_css_ole
       if @specifiers[:xpath]
@@ -41,7 +69,18 @@ module Watir
         return @container.element_by_css(@specifiers[:css])
       elsif @specifiers[:ole_object]
         return @specifiers[:ole_object]
+      end      
+    end
+
+    def create_element ole_object
+      if @klass == Element
+        element = Element.new(ole_object)
+      else
+        element = @klass.new(@container, @specifiers, nil)
+        element.ole_object = ole_object
+        def element.locate; @o; end
       end
+      element
     end
   end
 
@@ -53,15 +92,8 @@ module Watir
     end
 
     def each_element tag
-      @container.document.getElementsByTagName(tag).each do |ole_object|
-        if @klass == Element
-          element = Element.new(ole_object)
-        else
-          element = @klass.new(@container, @specifiers, nil)
-          element.ole_object = ole_object
-          def element.locate; @o; end unless @klass == TableRow
-        end
-        yield element
+      document.getElementsByTagName(tag).each do |ole_object|
+        yield create_element ole_object
       end
     end
 
@@ -74,7 +106,9 @@ module Watir
     end    
 
     def locate
-      return locate_by_xpath_css_ole if @specifiers[:xpath] || @specifiers[:css] || @specifiers[:ole_object]
+      el = locate_by_id
+      return el if el
+      return locate_by_xpath_css_ole if has_excluding_specifiers?
 
       count = Watir::IE.base_index - 1
       each do |element|
@@ -89,7 +123,7 @@ module Watir
         method = element.method(how)
       rescue NameError
         raise MissingWayOfFindingObjectException,
-          "#{how} is an unknown way of finding a <#{@tag}> element (#{what})"
+          "#{how} is an unknown way of finding a <#{@tag || @tags.join(", ")}> element (#{what})"
       end
       case method.arity
       when 0
@@ -98,7 +132,7 @@ module Watir
         method.call(what)
       else
         raise MissingWayOfFindingObjectException,
-          "#{how} is an unknown way of finding a <#{@tag}> element (#{what})"
+          "#{how} is an unknown way of finding a <#{@tag || @tags.join(", ")}> element (#{what})"
       end
     end
 
@@ -106,26 +140,23 @@ module Watir
 
   class FrameLocator < TaggedElementLocator
     def initialize(container)
-      @container = container
-      @tags = Frame::TAG
+      super(container, Frame::TAG, Frame)
     end
 
     def each_element tag
-      frames = @container.document.frames
+      frames = document.frames
       i = 0
-      @container.document.getElementsByTagName(tag).each do |ole_object|
-        frame = Frame.new(@container, @specifiers, nil)
-        frame.ole_object = ole_object
+      document.getElementsByTagName(tag).each do |ole_object|
+        frame = create_element ole_object
         frame.document = frames.item(i)
-        def frame.locate; @o; end
         yield frame
         i += 1
       end
     end
 
     def each
-      @tags.each do |tag|
-        each_element(tag) do |element| 
+      @tag.each do |t|
+        each_element(t) do |element| 
           next unless match_with_specifiers?(element)
           yield element          
         end 
@@ -134,7 +165,9 @@ module Watir
     end        
 
     def locate
-      return locate_by_xpath_css_ole if @specifiers[:xpath] || @specifiers[:css] || @specifiers[:ole_object]      
+      # do not locate frames by getElementById since can't get the correct
+      # 'document' related with that ole_object like it's done in #each_element
+      return locate_by_xpath_css_ole if has_excluding_specifiers?
 
       count = Watir::IE.base_index - 1
       each do |frame|
@@ -150,42 +183,31 @@ module Watir
     end
 
     def each_element(tag)
-      @container.document.forms.each do |form|
-        form_element = Form.new(@container, @specifiers, nil)
-        form_element.ole_object = form
-        def form_element.locate; @o; end
-        yield form_element
+      document.forms.each do |form|
+        yield create_element form
       end
     end
   end
 
   class InputElementLocator < Locator
-
-    attr_accessor :document, :element, :elements, :klass
-
     def initialize container, types, klass
       @container = container
       @types = types
-      @elements = nil
       @klass = klass || Element
     end
 
     def each_element
-      @elements.each do |object|
-        if @klass == Element
-          element = Element.new(object)
-        else
-          element = @klass.new(@container, @specifiers, nil)
-          element.ole_object = object
-          def element.locate; @o; end          
-        end
-        yield element
+      elements = locate_by_name || @container.__ole_inner_elements
+      elements.each do |object|
+        yield create_element object
       end
       nil
     end    
 
     def locate
-      return locate_by_xpath_css_ole if @specifiers[:xpath] || @specifiers[:css] || @specifiers[:ole_object]
+      el = locate_by_id
+      return el if el
+      return locate_by_xpath_css_ole if has_excluding_specifiers?
 
       count = Watir::IE.base_index - 1
       each do |element|
@@ -214,29 +236,14 @@ module Watir
       what.matches(attribute)
     end
 
-    def fast_locate
-      # Searching through all elements returned by ole_inner_elements
-      # is *significantly* slower than IE's getElementById() and
-      # getElementsByName() calls when how is :id or :name.  However
-      # IE doesn't match Regexps, so first we make sure what is a String.
-      # In addition, IE's getElementById() will also return an element
-      # where the :name matches, so we will only return the results of
-      # getElementById() if the matching element actually HAS a matching
-      # :id.
-
-      the_id = @specifiers[:id]
-      if the_id && the_id.class == String &&
-          @specifiers[:index] == Watir::IE.base_index && @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 && @types.include?(@element.getAttribute('type'))
-      end
+    private
 
+    def locate_by_name
       the_name = @specifiers[:name]
       if the_name && the_name.class == String
-        @elements = @document.getElementsByName(the_name) rescue nil
-      end
-      false
+        return document.getElementsByName(the_name) rescue nil
+      end      
+      nil
     end
   end
 

data/lib/watir/non_control_elements.rb

@@ -55,9 +55,20 @@ module Watir
     end
   end
 
-  %w[pre p div span map area li ul h1 h2 h3 h4 h5 h6 dl dt dd strong em].each do |elem|
+  class Ins < NonControlElement
+    Watir::Container.module_eval do
+      remove_method :inss
+
+      def inses(how={}, what=nil)
+        Inses.new(self, how, what)
+      end
+    end
+  end
+
+  %w[Pre P Div Span Map Area Li Ul H1 H2 H3 H4 H5 H6
+     Dl Dt Dd Strong Em Del Font Meta Ol].each do |elem|
     module_eval %Q{
-      class #{elem.capitalize} < NonControlElement; end
+      class #{elem} < NonControlElement; end
     }
   end
   

data/lib/watir/table.rb

@@ -247,13 +247,20 @@ module Watir
     
     def locate
       super
-      if @o # cant call the assert_exists here, as an exists? method call will fail
-        @cells = []
-        @o.cells.each do |oo|
-          @cells << TableCell.new(@container, :ole_object, oo)
-        end
+      cells if @o
+    end
+
+    def cells
+      return @cells if @cells
+
+      @cells = []
+      @o.cells.each do |c|
+        @cells << TableCell.new(@container, :ole_object, c)
       end
+      @cells
     end
+
+    private :cells
     
     # Returns an initialized instance of a table row
     #   * o  - the object contained in the row
@@ -270,16 +277,16 @@ module Watir
     # this method iterates through each of the cells in the row. Yields a TableCell object
     def each
       locate
-      0.upto(@cells.length - 1) { |i| yield @cells[i] }
+      0.upto(cells.length - 1) { |i| yield cells[i] }
     end
     
     # Returns an element from the row as a TableCell object
     def [](index)
       assert_exists
-      if @cells.length <= index
+      if cells.length <= index
         raise UnknownCellException, "Unable to locate a cell at index #{index}" 
       end
-      return @cells[index]
+      return cells[index]
     end
     
     # defaults all missing methods to the array of elements, to be able to
@@ -289,7 +296,7 @@ module Watir
     #        end
     def column_count
       locate
-      @cells.length
+      cells.length
     end
 
     # Returns (multi-dimensional) array of the cell texts in table's row.
@@ -363,11 +370,10 @@ module Watir
       super nil
     end
     
-    def ole_inner_elements
+    def __ole_inner_elements
       locate
       return @o.all
     end
-    private :ole_inner_elements
     
     def document
       locate

data/unittests/document_standards.rb

@@ -0,0 +1,67 @@
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_DocumentStandards_Quirks < Test::Unit::TestCase
+  include Watir::Exception
+  
+  def setup
+    goto_page 'quirks_document_standards.html'
+  end
+
+  def test_elements_exist_or_not
+    assert(browser.document_mode.to_i == 5)
+    assert(browser.text_field(:name,"quirks_text").exists?)
+    browser.text_field(:name,"quirks_text").set "test"
+    browser.text_field(:name,"quirks_text").fire_event "onClick"
+    assert(browser.text_field(:name,"quirks_text").value == 'test')
+  end
+end
+
+class TC_DocumentStandards_IE7 < Test::Unit::TestCase
+  include Watir::Exception
+  
+  def setup
+    goto_page 'ie7_document_standards.html'
+  end
+
+  def test_elements_exist_or_not
+    assert(browser.document_mode.to_i == 7)
+    assert(browser.text_field(:name,"ie7_text").exists?)
+    browser.text_field(:name,"ie7_text").set "test"
+    browser.text_field(:name,"ie7_text").fire_event "onClick"
+    assert(browser.text_field(:name,"ie7_text").value == 'test')
+  end
+end
+
+class TC_DocumentStandards_IE8 < Test::Unit::TestCase
+  include Watir::Exception
+
+  def setup
+    goto_page 'ie8_document_standards.html'
+  end
+
+  def test_elements_exist_or_not
+    assert(browser.document_mode.to_i == 8)
+    assert(browser.text_field(:name,"ie8_text").exists?)
+    browser.text_field(:name,"ie8_text").set "test"
+    browser.text_field(:name,"ie8_text").fire_event "onClick"
+    assert(browser.text_field(:name,"ie8_text").value == 'test')
+  end
+end
+
+class TC_DocumentStandards_IE9 < Test::Unit::TestCase
+  include Watir::Exception
+
+  def setup
+    goto_page 'ie9_document_standards.html'
+  end
+
+  def test_elements_exist_or_not
+    assert(browser.document_mode.to_i == 9)
+    assert(browser.text_field(:name,"ie9_text").exists?)
+    browser.text_field(:name,"ie9_text").set "test"
+    browser.text_field(:name,"ie9_text").fire_event "onClick"
+    assert(browser.text_field(:name,"ie9_text").value == 'test')
+  end
+end

data/unittests/element_collections_test.rb

@@ -81,5 +81,14 @@ class TC_ElementCollections < Test::Unit::TestCase
     assert_raises(Watir::Exception::MissingWayOfFindingObjectException) {browser.divs(:index, 1)}
   end
 
+  def test_table_rows
+    rows = browser.table.rows
+    assert 2, rows.size
+    rows.each_with_index do |row, i|
+      assert Watir::TableRow, row.class
+      assert i == 0 ? "one" : "two", row.class_name
+    end
+  end
+
 end
 

data/unittests/frame_test.rb

@@ -173,8 +173,8 @@ class TC_Frame_multiple_attributes < Test::Unit::TestCase
     goto_page "frame_multi.html"
   end
 
-  def test_get_frame_by_name_and_id
-    assert_equal('blankpage.html', browser.frame(:id => 'second_frame', :name => 'buttonFrame2').src)
+  def test_get_frame_by_name_and_src
+    assert_equal('blankpage.html', browser.frame(:src => 'blankpage.html', :name => 'buttonFrame2').src)
   end
 end
 

data/unittests/html/ie7_document_standards.html

@@ -0,0 +1,9 @@
+<!doctype html>
+<head>
+<meta http-equiv="x-ua-compatible" content="IE=7">
+<title>IE8 document mode</title>
+</head>
+<body>
+<input type=text name=ie7_text>
+</body>
+</html>

data/unittests/html/ie8_document_standards.html

@@ -0,0 +1,9 @@
+<!doctype html>
+<head>
+<meta http-equiv="x-ua-compatible" content="IE=8">
+<title>IE8 document mode</title>
+</head>
+<body>
+<input type=text name=ie8_text>
+</body>
+</html>

data/unittests/html/ie9_document_standards.html

@@ -0,0 +1,9 @@
+<!doctype html>
+<head>
+<meta http-equiv="x-ua-compatible" content="IE=9">
+<title>IE8 document mode</title>
+</head>
+<body>
+<input type=text name=ie9_text>
+</body>
+</html>

data/unittests/html/quirks_document_standards.html

@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>IE8 document mode</title>
+</head>
+<body>
+<input type=text name=quirks_text>
+</body>
+</html>

data/unittests/js_events_test.rb

@@ -23,4 +23,9 @@ class TC_JSEvents < Test::Unit::TestCase
     assert(browser.div(:id, 'event_name').text == 'onchange')
   end
 
+  def test_execute_script
+    assert_equal(browser.execute_script("2+2").to_i, 4)
+    assert_nil(browser.execute_script("null"))
+  end
+
 end

data/watir.gemspec

@@ -41,7 +41,6 @@ spec = Gem::Specification.new do |s|
   s.add_dependency 'ffi', '~>1.0'
   s.add_dependency 'rautomation', '~>0.6.3'
 
-  s.has_rdoc = true
   s.rdoc_options += $WATIR_RDOC_OPTIONS
   s.extra_rdoc_files = $WATIR_EXTRA_RDOC_FILES
   s.executables << 'watir-console'

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
+  hash: 15424071
+  prerelease: 6
   segments: 
   - 2
   - 0
+  - 2
+  - rc
   - 1
-  version: 2.0.1
+  version: 2.0.2.rc1
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 Z
+date: 2011-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: win32-process
@@ -57,12 +59,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 15424071
         segments: 
         - 2
         - 0
+        - 2
+        - rc
         - 1
-        version: 2.0.1
+        version: 2.0.2.rc1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -171,6 +175,7 @@ files:
 - unittests/div2_xpath_test.rb
 - unittests/div_test.rb
 - unittests/div_xpath_test.rb
+- unittests/document_standards.rb
 - unittests/element_collections_test.rb
 - unittests/element_test.rb
 - unittests/errorchecker_test.rb
@@ -241,6 +246,9 @@ files:
 - unittests/html/frame_links.html
 - unittests/html/frame_multi.html
 - unittests/html/google_india.html
+- unittests/html/ie7_document_standards.html
+- unittests/html/ie8_document_standards.html
+- unittests/html/ie9_document_standards.html
 - unittests/html/iframe.html
 - unittests/html/iframeTest.html
 - unittests/html/iframeTest1.html
@@ -263,6 +271,7 @@ files:
 - unittests/html/pass.html
 - unittests/html/popups1.html
 - unittests/html/pre.html
+- unittests/html/quirks_document_standards.html
 - unittests/html/radioButtons1.html
 - unittests/html/selectboxes1.html
 - unittests/html/select_tealeaf.html
@@ -341,16 +350,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: Watir
-rubygems_version: 1.8.4
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Automated testing tool for web applications.