watir-webdriver 0.6.4 → 0.6.5

data/lib/watir-webdriver/elements/{frame.rb → iframe.rb}

@@ -1,12 +1,13 @@
 # encoding: utf-8
 module Watir
-  class Frame < HTMLElement
+  class IFrame < HTMLElement
 
     def locate
       @parent.assert_exists
 
-      element = locate_iframe || locate_frame
-      element or raise UnknownFrameException, "unable to locate frame/iframe using #{selector_string}"
+      locator = locator_class.new(@parent.wd, @selector.merge(:tag_name => tag_name), self.class.attribute_list)
+      element = locator.locate
+      element or raise UnknownFrameException, "unable to locate #{@selector[:tag_name]} using #{selector_string}"
 
       @parent.reset!
 
@@ -44,46 +45,58 @@ module Watir
 
     private
 
-    def locate_iframe
-      locator = locator_class.new(@parent.wd, @selector.merge(:tag_name => "iframe"), attribute_list)
-      locator.locate
+    def tag_name
+      'iframe'
     end
 
-    def locate_frame
-      locator = locator_class.new(@parent.wd, @selector.merge(:tag_name => "frame"), attribute_list)
-      locator.locate
+  end # IFrame
+
+
+  class IFrameCollection < ElementCollection
+
+    def to_a
+      (0...elements.size).map { |idx| element_class.new @parent, :index => idx }
     end
 
-    def attribute_list
-      self.class.attribute_list | IFrame.attribute_list
+    def element_class
+      IFrame
     end
+
+  end # IFrameCollection
+
+
+  class Frame < IFrame
+
+    private
+
+    def tag_name
+      'frame'
+    end
+
   end # Frame
 
+
+  class FrameCollection < IFrameCollection
+
+    def element_class
+      Frame
+    end
+
+  end # FrameCollection
+
+
   module Container
+
     def frame(*args)
-      Frame.new(self, extract_selector(args))
+      Frame.new(self, extract_selector(args).merge(:tag_name => "frame"))
     end
 
     def frames(*args)
-      FrameCollection.new(self, extract_selector(args).merge(:tag_name => /^(iframe|frame)$/)) # hack
+      FrameCollection.new(self, extract_selector(args).merge(:tag_name => "frame"))
     end
 
-    def iframe(*args)
-      warn "Watir::Container#iframe is replaced by Watir::Container#frame"
-      frame(*args)
-    end
-
-    def iframes(*args)
-      warn "Watir::Container#iframes is replaced by Watir::Container#frames"
-      frame(*args)
-    end
-  end
+  end # Container
 
-  class FrameCollection < ElementCollection
-    def to_a
-      (0...elements.size).map { |idx| element_class.new @parent, :index => idx }
-    end
-  end
 
   # @api private
   #

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

@@ -14,21 +14,5 @@ module Watir
       !disabled?
     end
 
-    #
-    # Return the type attribute of the element, or 'text' if the attribute is invalid.
-    # TODO: discuss.
-    #
-    # @return [String]
-    #
-
-    def type
-      assert_exists
-      value = @element.attribute("type").to_s
-
-      # we return 'text' if the type is invalid
-      # not sure if we really should do this
-      TextFieldLocator::NON_TEXT_TYPES.include?(value) ? value : 'text'
-    end
-
   end # Input
 end # Watir

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

@@ -3,5 +3,17 @@ module Watir
   module Container
     alias_method :link,  :a
     alias_method :links, :as
-  end
+  end # Container
+
+
+  class Anchor < HTMLElement
+
+    #
+    # @todo temporarily add href attribute
+    #
+    # @see https://www.w3.org/Bugs/Public/show_bug.cgi?id=23192
+    #
+    attributes :string => [:href]
+
+  end # Anchor
 end # Watir

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

@@ -1,5 +1,22 @@
 module Watir
   class TextArea < HTMLElement
     include UserEditable
+
+    private
+
+    def locator_class
+      TextAreaLocator
+    end
+
   end # TextArea
+
+  class TextAreaCollection < ElementCollection
+
+    private
+
+    def locator_class
+      TextAreaLocator
+    end
+
+  end # TextAreaCollection
 end # Watir

data/lib/watir-webdriver/html/generator.rb

@@ -45,6 +45,8 @@ module Watir
         # ignore the link element for now
         @tag2interfaces.delete("link")
         @sorted_interfaces.reject! { |intf| intf.name == "HTMLLinkElement" }
+        # frame is implemented manually, see https://github.com/watir/watir-webdriver/issues/204
+        @sorted_interfaces.reject! { |intf| intf.name == "HTMLFrameElement"  }
       end
 
       def write_header
@@ -58,7 +60,6 @@ module Watir
         end
       end
 
-
       def write_container_methods
         @io.puts indent("module Container")
 
@@ -101,7 +102,6 @@ CODE
         @io.puts "end # Watir"
       end
 
-
       def indent(code, indent = 1)
         indent_string = " "*indent
         code.split("\n").map { |line| line.empty? ? line : indent_string + line }.join("\n")

data/lib/watir-webdriver/html/spec_extractor.rb

@@ -3,6 +3,10 @@
 module Watir
   module HTML
     class SpecExtractor
+
+      class InterfaceNotFound < StandardError
+      end
+
       def initialize(uri)
         @uri = uri
       end
@@ -39,7 +43,7 @@ module Watir
       end
 
       def fetch_interface(interface)
-        @interfaces_by_name[interface] or raise "#{interface} not found in IDL"
+        @interfaces_by_name[interface] or raise InterfaceNotFound, "#{interface} not found in IDL"
       end
 
       private
@@ -51,11 +55,20 @@ module Watir
       def extract_idl_parts
         parsed = @doc.search("//pre[@class='idl']").map {  |e| parse_idl(e.inner_text) }.compact
 
-        @interfaces = parsed.map { |elements|
-          elements.select { |e| e.kind_of? WebIDL::Ast::Interface  }
-        }.flatten
+        implements = []
+        @interfaces = []
+
+        parsed.flatten.each do |element|
+          case element
+          when WebIDL::Ast::Interface
+            @interfaces << element
+          when WebIDL::Ast::ImplementsStatement
+            implements << element
+          end
+        end
 
         @interfaces_by_name = @interfaces.group_by { |i| i.name }
+        apply_implements(implements)
       end
 
       def extract_interface_map
@@ -109,6 +122,20 @@ module Watir
         end
       end
 
+      def apply_implements(implements)
+        implements.each do |is|
+          implementor_name = is.implementor.gsub(/^::/, '')
+          implementee_name = is.implementee.gsub(/^::/, '')
+
+          begin
+            intf = fetch_interface(implementor_name).first
+            intf.implements << fetch_interface(implementee_name).first
+          rescue InterfaceNotFound => ex
+            puts ex.message
+          end
+        end
+      end
+
       def idl_parser
         @idl_parser ||= WebIDL::Parser::IDLParser.new
       end

data/lib/watir-webdriver/html/visitor.rb

@@ -36,7 +36,7 @@ module Watir
 
         [ :scope,
           [:block,
-            element_class(interface.name, interface.members.select { |e| e.kind_of?(WebIDL::Ast::Attribute) }, parent),
+            element_class(interface.name, extract_attributes(interface), parent),
             collection_class(interface.name)
           ]
         ]
@@ -89,6 +89,13 @@ module Watir
         ]
       end
 
+      def extract_attributes(interface)
+        members = interface.members
+        members += interface.implements.flat_map(&:members)
+
+        members.select { |e| e.kind_of?(WebIDL::Ast::Attribute) }
+      end
+
       def collection_class(name)
         return if @already_defined.include?(name)
         @already_defined << name
@@ -114,7 +121,7 @@ module Watir
           type = ruby_type_for(a.type)
           attrs[type] << ruby_attribute_for(type, a.name)
         end
-        
+
         call :attributes, [literal_hash(attrs)]
       end
 
@@ -152,7 +159,7 @@ module Watir
           :function
         when 'Boolean'
           :bool
-        when 'Document'
+        when 'Document', 'DocumentFragment'
           :document
         when 'DOMTokenList', 'DOMSettableTokenList'
           :token_list
@@ -173,7 +180,8 @@ module Watir
         when 'Element'
           :element
         when 'WindowProxy', 'ValidityState', 'MediaError', 'TimeRanges', 'Location',
-             'Any', 'TimedTrackArray', 'TimedTrack', 'TextTrackArray', 'TextTrack', 'MediaController'
+             'Any', 'TimedTrackArray', 'TimedTrack', 'TextTrackArray', 'TextTrack',
+             'MediaController', 'TextTrackKind'
           # probably completely wrong.
           :string
         else

data/lib/watir-webdriver/locators/button_locator.rb

@@ -41,25 +41,19 @@ module Watir
     def lhs_for(key)
       if @building == :input && key == :text
         "@value"
-      elsif @building == :button && key == :value
-        "text()"
       else
         super
       end
     end
 
-    def matches_selector?(element, rx_selector)
-      rx_selector = rx_selector.dup
-      tag_name    = element.tag_name.downcase
-
-      [:value, :caption].each do |key|
-        if rx_selector.has_key?(key)
-          correct_key = tag_name == 'button' ? :text : :value
-          rx_selector[correct_key] = rx_selector.delete(key)
-        end
+    def equal_pair(key, value)
+      if @building == :button && key == :value
+        # :value should look for both node text and @value attribute
+        text = XpathSupport.escape(value)
+        "(text()=#{text} or @value=#{text})"
+      else
+        super
       end
-
-      super
     end
 
     def tag_name_matches?(tag_name, _)

data/lib/watir-webdriver/locators/element_locator.rb

@@ -10,12 +10,14 @@ module Watir
       :id,
       :link,
       :link_text,
-      # :name,     # deliberately excluded to be watirspec compliant
+      :name,
       :partial_link_text,
       :tag_name,
       :xpath
     ]
 
+    WILDCARD_ATTRIBUTE = /^(aria|data)_(.+)$/
+
     def initialize(wd, selector, valid_attributes)
       @wd               = wd
       @selector         = selector.dup
@@ -32,8 +34,10 @@ module Watir
         element = find_first_by_multiple
       end
 
-      # this actually only applies when finding by xpath - browser.text_field(:xpath, "//input[@type='radio']")
-      # we don't need to validate the element if we built the xpath ourselves.
+      # This actually only applies when finding by xpath - browser.text_field(:xpath, "//input[@type='radio']")
+      # We don't need to validate the element if we built the xpath ourselves.
+      # It is also used to alter behavior of methods locating more than one type of element
+      # (e.g. text_field locates both input and textarea)
       validate_element(element) if element
     rescue Selenium::WebDriver::Error::NoSuchElementError
       nil
@@ -234,7 +238,7 @@ module Watir
     end
 
     def assert_valid_as_attribute(attribute)
-      unless valid_attribute? attribute or attribute.to_s =~ /^data_.+$/
+      unless valid_attribute? attribute or attribute.to_s =~ WILDCARD_ATTRIBUTE
         raise MissingWayOfFindingObjectException, "invalid attribute: #{attribute.inspect}"
       end
     end
@@ -269,7 +273,7 @@ module Watir
     end
 
     def should_use_label_element?
-      @selector[:tag_name] != "option"
+      !valid_attribute?(:label)
     end
 
     def build_wd_selector(selectors)

data/lib/watir-webdriver/locators/text_area_locator.rb

@@ -0,0 +1,20 @@
+module Watir
+  class TextAreaLocator < ElementLocator
+
+    private
+
+    def normalize_selector(how, what)
+      # We need to iterate through located elements and fetch
+      # attribute value using WebDriver because XPath doesn't understand
+      # difference between IDL vs content attribute.
+      # Current ElementLocator design doesn't allow to do that in any
+      # obvious way except to use regular expression.
+      if how == :value && what.kind_of?(String)
+        [how, Regexp.new('^' + Regexp.escape(what) + '$')]
+      else
+        super
+      end
+    end
+
+  end # TextAreaLocator
+end # Watir

data/lib/watir-webdriver/locators/text_field_locator.rb

@@ -68,5 +68,13 @@ module Watir
       el = super
       el if el and not NON_TEXT_TYPES.include? el.attribute(:type)
     end
+
+    def validate_element(element)
+      if element.tag_name.downcase == 'textarea'
+        warn "Locating textareas with '#text_field' is deprecated. Please, use '#textarea' method instead."
+      end
+      super
+    end
+
   end # TextFieldLocator
 end # Watir

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/watir-webdriver/wait.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'forwardable'
+
 module Watir
   module Wait
 
@@ -7,6 +9,7 @@ module Watir
     INTERVAL = 0.1
 
     class << self
+
       #
       # Waits until the block evaluates to true or times out.
       #
@@ -18,10 +21,9 @@ module Watir
       # @raise [TimeoutError] if timeout is exceeded
       #
 
-      def until(timeout = 30, message = nil, &block)
-        end_time = ::Time.now + timeout
-
-        until ::Time.now > end_time
+      def until(timeout = nil, message = nil, &block)
+        timeout ||= Watir.default_timeout
+        wait(timeout) do
           result = yield(self)
           return result if result
           sleep INTERVAL
@@ -41,10 +43,9 @@ module Watir
       # @raise [TimeoutError] if timeout is exceeded
       #
 
-      def while(timeout = 30, message = nil, &block)
-        end_time = ::Time.now + timeout
-
-        until ::Time.now > end_time
+      def while(timeout = nil, message = nil, &block)
+        timeout ||= Watir.default_timeout
+        wait(timeout) do
           return unless yield(self)
           sleep INTERVAL
         end
@@ -61,6 +62,10 @@ module Watir
         err
       end
 
+      def wait(timeout, &block)
+        (timeout / INTERVAL).to_i.times &block
+      end
+
     end # self
   end # Wait
 
@@ -80,6 +85,10 @@ module Watir
   #
 
   class WhenPresentDecorator
+    extend Forwardable
+
+    def_delegator :@element, :present?
+
     def initialize(element, timeout, message = nil)
       @element = element
       @timeout = timeout
@@ -122,7 +131,8 @@ module Watir
     # @see Watir::Element#present?
     #
 
-    def when_present(timeout = 30)
+    def when_present(timeout = nil)
+      timeout ||= Watir.default_timeout
       message = "waiting for #{selector_string} to become present"
 
       if block_given?
@@ -145,7 +155,8 @@ module Watir
     # @see Watir::Element#present?
     #
 
-    def wait_until_present(timeout = 30)
+    def wait_until_present(timeout = nil)
+      timeout ||= Watir.default_timeout
       message = "waiting for #{selector_string} to become present"
       Watir::Wait.until(timeout, message) { present? }
     end
@@ -162,7 +173,8 @@ module Watir
     # @see Watir::Element#present?
     #
 
-    def wait_while_present(timeout = 30)
+    def wait_while_present(timeout = nil)
+      timeout ||= Watir.default_timeout
       message = "waiting for #{selector_string} to disappear"
       Watir::Wait.while(timeout, message) { present? }
     rescue Selenium::WebDriver::Error::ObsoleteElementError