watir-webdriver 0.0.9 → 0.1.0

data/README.rdoc

@@ -22,10 +22,18 @@ http://jarib.github.com/watir-webdriver/doc/
 
 The file in lib/watir/elements/generated.rb is autogenerated from the HTML5 spec. This is done by extracting the IDL parts from the spec and processing them with the WebIDL gem (link below).
 
+= Specs
+
+watir-webdriver uses the watir2 branch of watirspec for testing. After cloning, you should fetch the submodule:
+
+  git submodule init && git submodule update
+
+Specs specific to watir-webdriver are found in spec/*_spec.rb, with watirspec in spec/watirspec.
+
 = See also
 
 * http://github.com/jarib/webidl
-* http://webdriver.googlecode.com
+* http://github.com/jarib/watirspec/tree/watir2
 * http://selenium.googlecode.com
 
 = Dependencies

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage    = "http://github.com/jarib/watir-webdriver"
     gem.authors     = ["Jari Bakken"]
 
-    gem.add_dependency "selenium-webdriver", '>= 0.0.28'
+    gem.add_dependency "selenium-webdriver", '0.0.28'
 
     gem.add_development_dependency "rspec"
     gem.add_development_dependency "yard", "~> 0.6"
@@ -118,6 +118,7 @@ namespace :html5 do
     mv "#{file}.new", file
   end
 
+  task :update => [:download, :generate, :overwrite]
 end # html5
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.1.0

data/lib/watir-webdriver.rb

@@ -10,7 +10,8 @@ require "watir-webdriver/container"
 require "watir-webdriver/locators/element_locator"
 require "watir-webdriver/locators/button_locator"
 require "watir-webdriver/locators/text_field_locator"
-require "watir-webdriver/locators/table_row_locator"
+require "watir-webdriver/locators/child_row_locator"
+require "watir-webdriver/locators/child_cell_locator"
 require "watir-webdriver/browser"
 
 module Watir
@@ -29,6 +30,8 @@ module Watir
 end
 
 require "watir-webdriver/attribute_helper"
+require "watir-webdriver/row_container"
+require "watir-webdriver/cell_container"
 require "watir-webdriver/element_collection"
 require "watir-webdriver/elements/element"
 require "watir-webdriver/elements/generated"
@@ -48,18 +51,14 @@ require "watir-webdriver/elements/form"
 require "watir-webdriver/elements/option"
 require "watir-webdriver/elements/table"
 require "watir-webdriver/elements/table_row"
+require "watir-webdriver/elements/table_cell"
+require "watir-webdriver/elements/table_section"
 
 Watir.tag_to_class.freeze
 
 module Watir
   module Container
 
-    # TODO: deprecate cell/row in favor of td/tr?
-    alias_method :cell,  :td
-    alias_method :cells, :tds
-    alias_method :row,   :tr
-    alias_method :rows,  :trs
-
   end # Container
 end # Watir
 

data/lib/watir-webdriver/attribute_helper.rb

@@ -1,15 +1,15 @@
 module Watir
-  
+
   #
   # @private
-  # 
+  #
   # Extended by Element, provides methods for defining attributes on the element classes.
-  # 
-  
+  #
+
   module AttributeHelper
-    
+
     IGNORED_ATTRIBUTES = [:text, :hash]
-    
+
     def typed_attributes
       @typed_attributes ||= Hash.new { |hash, type| hash[type] = []  }
     end
@@ -74,7 +74,8 @@ module Watir
     def define_int_attribute(mname, aname)
       define_method mname do
         assert_exists
-        @element.attribute(aname).to_i
+        value = @element.attribute(aname)
+        value && Integer(value)
       end
     end
 
@@ -85,7 +86,7 @@ module Watir
     end
 
     def method_name_for(type, attribute)
-      # TODO: rethink this - this list could get pretty long...
+      # http://github.com/jarib/watir-webdriver/issues/issue/26
       name = case attribute
              when :html_for
                'for'
@@ -103,6 +104,8 @@ module Watir
     end
 
     def attribute_for_method(method)
+      # http://github.com/jarib/watir-webdriver/issues/issue/26
+
       case method.to_sym
       when :class_name
         'class'
@@ -112,10 +115,14 @@ module Watir
         'readonly'
       when :http_equiv
         'http-equiv'
+      when :col_span
+        'colspan'
+      when :row_span
+        'rowspan'
       else
         method.to_s
       end
     end
-    
+
   end # AttributeHelper
-end # Watir
+end # Watir

data/lib/watir-webdriver/browser.rb

@@ -28,7 +28,7 @@ module Watir
     # @param args Passed to the underlying driver
     #
 
-    def initialize(browser, *args)
+    def initialize(browser = :firefox, *args)
       case browser
       when Symbol, String
         @driver = Selenium::WebDriver.for browser.to_sym, *args

data/lib/watir-webdriver/cell_container.rb

@@ -0,0 +1,19 @@
+module Watir
+  module CellContainer
+
+    def cell(*args)
+      cell = TableCell.new(self, extract_selector(args).merge(:tag_name => /^(th|td)$/))
+      cell.locator_class = ChildCellLocator
+
+      cell
+    end
+
+    def cells(*args)
+      cells = TableCellCollection.new(self, extract_selector(args).merge(:tag_name => /^(th|td)$/))
+      cells.locator_class = ChildCellLocator
+
+      cells
+    end
+
+  end
+end

data/lib/watir-webdriver/container.rb

@@ -3,6 +3,14 @@ module Watir
   module Container
     include XpathSupport
 
+    def element(*args)
+      HTMLElement.new(self, extract_selector(args))
+    end
+
+    def elements(*args)
+      HTMLElementCollection.new(self, extract_selector(args))
+    end
+
     private
 
     def browserbot(function_name, *arguments)

data/lib/watir-webdriver/element_collection.rb

@@ -53,7 +53,7 @@ module Watir
     #
 
     def first
-      to_a[0] || element_class.new(@parent, :index => 0)
+      self[0]
     end
 
     #
@@ -63,7 +63,7 @@ module Watir
     #
 
     def last
-      to_a[-1] || element_class.new(@parent, :index => -1)
+      self[-1]
     end
 
     #

data/lib/watir-webdriver/elements/button.rb

@@ -12,13 +12,14 @@ module Watir
     # add the attributes from <input>
     attributes Watir::Input.typed_attributes
 
+    VALID_TYPES = %w[button reset submit image]
 
     def self.from(parent, element)
       if element.tag_name == "button" ||
-         element.tag_name == "input" && ButtonLocator::VALID_TYPES.include?(element.attribute(:type))
+         element.tag_name == "input" && VALID_TYPES.include?(element.attribute(:type))
         Button.new(parent, :element => element)
       else
-        raise TypeError, "expected button or input[@type=#{ButtonLocator::VALID_TYPES.join("|")}] for #{element.inspect}"
+        raise TypeError, "expected button or input[@type=#{VALID_TYPES.join("|")}] for #{element.inspect}"
       end
     end
 

data/lib/watir-webdriver/elements/element.rb

@@ -42,6 +42,8 @@ module Watir
     end
 
     def ==(other)
+      return false unless other.kind_of? self.class
+
       assert_exists
       @element == other.element
     end
@@ -173,6 +175,40 @@ module Watir
       @parent.run_checkers
     end
 
+    #
+    # Cast this Element instance to a more specific subtype.
+    #
+    # Example:
+    #
+    #   browser.element(:xpath => "//input[@type='submit']").to_subtype #=> #<Watir::Button>
+    #
+
+    def to_subtype
+      elem = element()
+      tag_name = elem.tag_name
+
+      klass = nil
+
+      if tag_name == "input"
+        klass = case elem.attribute(:type)
+          when *Button::VALID_TYPES
+            Button
+          when 'checkbox'
+            CheckBox
+          when 'radio'
+            Radio
+          when 'file'
+            FileField
+          else
+            TextField
+          end
+      else
+        klass = Watir.element_class_for(tag_name)
+      end
+
+      klass.new(@parent, :element => elem)
+    end
+
   protected
 
     def assert_exists
@@ -189,11 +225,15 @@ module Watir
 
     def locate
       @parent.assert_exists
-      ElementLocator.new(@parent.wd, @selector, self.class.attribute_list).locate
+      locator_class.new(@parent.wd, @selector, self.class.attribute_list).locate
     end
 
   private
 
+    def locator_class
+      ElementLocator
+    end
+
     def selector_string
       @selector.inspect
     end

data/lib/watir-webdriver/elements/generated.rb

@@ -74,7 +74,7 @@ module Watir
    end
  end
  class Frame < HTMLElement
-   attributes(:string => [:frame_border, :long_desc, :margin_height, :margin_width, :name, :scrolling, :src], :bool => [:no_resize], :document => [:content_document])
+   attributes(:string => [:frame_border, :long_desc, :margin_height, :margin_width, :name, :scrolling, :src, :content_window], :bool => [:no_resize], :document => [:content_document])
  end
  class FrameCollection < ElementCollection
    def element_class
@@ -90,7 +90,7 @@ module Watir
    end
  end
  class Marquee < HTMLElement
-   attributes(:string => [:behavior, :bg_color, :direction, :height, :true_speed, :width], :int => [:hspace, :loop, :scroll_amount, :scroll_delay, :vspace], :function => [:onbounce, :onfinish, :onstart])
+   attributes(:string => [:behavior, :bg_color, :direction, :height, :width], :int => [:hspace, :loop, :scroll_amount, :scroll_delay, :vspace], :bool => [:true_speed], :function => [:onbounce, :onfinish, :onstart])
  end
  class MarqueeCollection < ElementCollection
    def element_class
@@ -410,7 +410,7 @@ module Watir
    end
  end
  class Track < HTMLElement
-   attributes(:string => [:kind, :label, :src, :srclang, :track])
+   attributes(:string => [:kind, :src, :charset, :srclang, :label, :track])
  end
  class TrackCollection < ElementCollection
    def element_class

data/lib/watir-webdriver/elements/input.rb

@@ -38,57 +38,5 @@ module Watir
       TextFieldLocator::NON_TEXT_TYPES.include?(value) ? value : 'text'
     end
 
-    #
-    # not sure about this
-    #
-    # this is mostly useful if you're using Browser#element_by_xpath, and want to
-    # 'cast' the returned Input instance to one of the subclasses
-    #
-
-    #
-    # @return [Watir::CheckBox]
-    # 
-
-    def to_checkbox
-      assert_exists
-      CheckBox.from(@parent, @element)
-    end
-
-    #
-    # @return [Watir::Radio]
-    # 
-    
-    def to_radio
-      assert_exists
-      Radio.from(@parent, @element)
-    end
-
-    #
-    # @return [Watir::Button]
-    # 
-    
-    def to_button
-      assert_exists
-      Button.from(@parent, @element)
-    end
-    
-    #
-    # @return [Watir::TextField]
-    # 
-
-    def to_text_field
-      assert_exists
-      TextField.from(@parent, @element)
-    end
-
-    #
-    # @return [Watir::FileField]
-    # 
-
-    def to_file_field
-      assert_exists
-      FileField.from(@parent, @element)
-    end
-
   end # Input
 end # Watir

data/lib/watir-webdriver/elements/select.rb

@@ -44,7 +44,6 @@ module Watir
       # TODO: optimize similar to selected?
       options.any? { |e| str_or_rx === e.text }
     end
-    alias_method :includes?, :include?
 
     #
     # Select the option(s) whose text or label matches the given string.

data/lib/watir-webdriver/elements/table.rb

@@ -1,19 +1,41 @@
 # encoding: utf-8
+
 module Watir
   class Table < HTMLElement
+    include RowContainer
 
     #
-    # The table as an 2D Array of strings with the text of each cell.
+    # The table as a 2D Array of strings with the text of each cell.
     #
     # @return [Array<Array<String>>]
     #
 
-    def to_a
+    def strings
       assert_exists
 
-      trs.inject [] do |res, row|
-        res << row.wd.find_elements(:xpath, ".//td | .//th").map { |cell| cell.text }
+      rows.inject [] do |res, row|
+        res << row.cells.map { |cell| cell.text }
+      end
+    end
+    alias_method :to_a, :strings
+
+    def hashes
+      all_rows   = rows.to_a
+      header_row = all_rows.shift or raise Exception::Error, "no rows in table"
+
+      headers = header_row.ths.map { |header_cell| header_cell.text  }
+      result = []
+
+      all_rows.each_with_index do |row, idx|
+        cells = row.cells.to_a
+        if cells.length != headers.length
+          raise Exception::Error, "row at index #{idx} has #{cells.length} cells, expected #{headers.length}"
+        end
+
+        result << headers.inject({}) { |res, header| res.merge(header => cells.shift.text) }
       end
+
+      result
     end
 
     #

data/lib/watir-webdriver/elements/table_cell.rb

@@ -0,0 +1,36 @@
+module Watir
+  class TableCell < HTMLElement
+    # @private
+    attr_writer :locator_class
+
+    def locator_class
+      @locator_class || super
+    end
+
+    def colspan
+      value = attribute_value :colspan
+      value ? Integer(value) : 1
+    end
+  end
+
+  class TableCellCollection < ElementCollection
+    attr_writer :locator_class
+
+    def locator_class
+      @locator_class || super
+    end
+
+    def elements
+      # we do this craziness since the xpath used will find direct child rows
+      # before any rows inside thead/tbody/tfoot...
+      elements = super
+
+      if locator_class == ChildCellLocator
+        elements = elements.sort_by { |row| row.attribute(:cellIndex).to_i }
+      end
+
+      elements
+    end
+
+  end
+end