watir 6.13.0 → 6.14.0

data/lib/watir/elements/file_field.rb

@@ -1,6 +1,5 @@
 module Watir
   class FileField < Input
-
     #
     # Set the file field to the given path
     #
@@ -10,6 +9,7 @@ module Watir
 
     def set(path)
       raise Errno::ENOENT, path unless File.exist?(path)
+
       self.value = path
     end
 
@@ -23,16 +23,15 @@ module Watir
       path = path.gsub(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
       element_call { @element.send_keys path }
     end
-
   end # FileField
 
   module Container
     def file_field(*args)
-      FileField.new(self, extract_selector(args).merge(tag_name: "input", type: "file"))
+      FileField.new(self, extract_selector(args).merge(tag_name: 'input', type: 'file'))
     end
 
     def file_fields(*args)
-      FileFieldCollection.new(self, extract_selector(args).merge(tag_name: "input", type: "file"))
+      FileFieldCollection.new(self, extract_selector(args).merge(tag_name: 'input', type: 'file'))
     end
   end # Container
 

data/lib/watir/elements/font.rb

@@ -1,6 +1,5 @@
 module Watir
   class Font < HTMLElement
-
     #
     # size of font
     #
@@ -10,16 +9,15 @@ module Watir
     def size
       attribute_value(:size)
     end
-
   end # Font
 
   module Container
     def font(*args)
-      Font.new(self, extract_selector(args).merge(tag_name: "font"))
+      Font.new(self, extract_selector(args).merge(tag_name: 'font'))
     end
 
     def fonts(*args)
-      FontCollection.new(self, extract_selector(args).merge(tag_name: "font"))
+      FontCollection.new(self, extract_selector(args).merge(tag_name: 'font'))
     end
   end # Container
 end # Watir

data/lib/watir/elements/form.rb

@@ -1,6 +1,5 @@
 module Watir
   class Form < HTMLElement
-
     #
     # Submits the form.
     #
@@ -11,6 +10,5 @@ module Watir
       element_call(:wait_for_present) { @element.submit }
       browser.after_hooks.run
     end
-
   end # Form
 end # Watir

data/lib/watir/elements/hidden.rb

@@ -5,18 +5,17 @@ module Watir
     end
 
     def click
-      raise Watir::Exception::ObjectDisabledException, "click is not available on the hidden field element"
+      raise Watir::Exception::ObjectDisabledException, 'click is not available on the hidden field element'
     end
-
   end
 
   module Container
     def hidden(*args)
-      Hidden.new(self, extract_selector(args).merge(tag_name: "input", type: "hidden"))
+      Hidden.new(self, extract_selector(args).merge(tag_name: 'input', type: 'hidden'))
     end
 
     def hiddens(*args)
-      HiddenCollection.new(self, extract_selector(args).merge(tag_name: "input", type: "hidden"))
+      HiddenCollection.new(self, extract_selector(args).merge(tag_name: 'input', type: 'hidden'))
     end
   end # Container
 

data/lib/watir/elements/html_elements.rb

@@ -10,9 +10,8 @@ module Watir
     attribute(Integer, :tabindex, :tabIndex)
     attribute(String, :accesskey, :accessKey)
     attribute("Boolean", :draggable?, :draggable)
-    attribute(String, :dropzone, :dropzone)
-    attribute(String, :contextmenu, :contextMenu)
     attribute("Boolean", :spellcheck?, :spellcheck)
+    attribute(String, :innertext, :innerText)
     attribute(String, :onabort, :onabort)
     attribute(String, :onblur, :onblur)
     attribute(String, :oncancel, :oncancel)
@@ -21,7 +20,6 @@ module Watir
     attribute(String, :onchange, :onchange)
     attribute(String, :onclick, :onclick)
     attribute(String, :onclose, :onclose)
-    attribute(String, :oncontextmenu, :oncontextmenu)
     attribute(String, :oncuechange, :oncuechange)
     attribute(String, :ondblclick, :ondblclick)
     attribute(String, :ondrag, :ondrag)
@@ -172,24 +170,11 @@ module Watir
   class ScriptCollection < ElementCollection
   end
 
-  class MenuItem < HTMLElement
-    attribute(String, :type, :type)
-    attribute(String, :label, :label)
-    attribute(String, :icon, :icon)
-    attribute("Boolean", :disabled?, :disabled)
-    attribute("Boolean", :checked?, :checked)
-    attribute(String, :radiogroup, :radiogroup)
-    attribute("Boolean", :default?, :default)
-  end
-  class MenuItemCollection < ElementCollection
-  end
-
-  class Menu < HTMLElement
-    attribute(String, :type, :type)
-    attribute(String, :label, :label)
-    attribute("Boolean", :compact?, :compact)
+  class Dialog < HTMLElement
+    attribute("Boolean", :open?, :open)
+    attribute(String, :returnvalue, :returnValue)
   end
-  class MenuCollection < ElementCollection
+  class DialogCollection < ElementCollection
   end
 
   class Details < HTMLElement
@@ -253,22 +238,6 @@ module Watir
   class OutputCollection < ElementCollection
   end
 
-  class Keygen < HTMLElement
-    attribute("Boolean", :autofocus?, :autofocus)
-    attribute(String, :challenge, :challenge)
-    attribute("Boolean", :disabled?, :disabled)
-    attribute(String, :form, :form)
-    attribute(String, :keytype, :keytype)
-    attribute(String, :name, :name)
-    attribute(String, :type, :type)
-    attribute("Boolean", :willvalidate?, :willValidate)
-    attribute(String, :validity, :validity)
-    attribute(String, :validationmessage, :validationMessage)
-    attribute(String, :labels, :labels)
-  end
-  class KeygenCollection < ElementCollection
-  end
-
   class TextArea < HTMLElement
     attribute(String, :autocomplete, :autocomplete)
     attribute("Boolean", :autofocus?, :autofocus)
@@ -276,7 +245,6 @@ module Watir
     attribute(String, :dirname, :dirName)
     attribute("Boolean", :disabled?, :disabled)
     attribute(String, :form, :form)
-    attribute(String, :inputmode, :inputMode)
     attribute(Integer, :maxlength, :maxLength)
     attribute(Integer, :minlength, :minLength)
     attribute(String, :name, :name)
@@ -319,7 +287,6 @@ module Watir
   end
 
   class DataList < HTMLElement
-    attribute(String, :options, :options)
   end
   class DataListCollection < ElementCollection
   end
@@ -333,7 +300,6 @@ module Watir
     attribute(String, :name, :name)
     attribute("Boolean", :required?, :required)
     attribute(String, :type, :type)
-    attribute(String, :options, :options)
     attribute(Integer, :length, :length)
     attribute(String, :selectedoptions, :selectedOptions)
     attribute(Integer, :selectedindex, :selectedIndex)
@@ -358,7 +324,6 @@ module Watir
     attribute(String, :name, :name)
     attribute(String, :type, :type)
     attribute(String, :value, :value)
-    attribute(String, :menu, :menu)
     attribute("Boolean", :willvalidate?, :willValidate)
     attribute(String, :validity, :validity)
     attribute(String, :validationmessage, :validationMessage)
@@ -384,7 +349,6 @@ module Watir
     attribute("Boolean", :formnovalidate?, :formNoValidate)
     attribute(String, :formtarget, :formTarget)
     attribute("Boolean", :indeterminate?, :indeterminate)
-    attribute(String, :inputmode, :inputMode)
     attribute(String, :list, :list)
     attribute(String, :max, :max)
     attribute(Integer, :maxlength, :maxLength)
@@ -463,7 +427,6 @@ module Watir
   end
 
   class TableDataCell < TableCell
-    attribute(String, :abbr, :abbr)
   end
   class TableDataCellCollection < ElementCollection
   end
@@ -529,6 +492,7 @@ module Watir
     attribute(String, :rellist, :relList)
     attribute(String, :hreflang, :hreflang)
     attribute(String, :type, :type)
+    attribute(String, :referrerpolicy, :referrerPolicy)
     attribute("Boolean", :nohref?, :noHref)
     attribute(String, :href, :href)
     attribute(String, :origin, :origin)
@@ -638,7 +602,6 @@ module Watir
     attribute(Integer, :vspace, :vspace)
     attribute(String, :codebase, :codeBase)
     attribute(String, :codetype, :codeType)
-    attribute(String, :usemap, :useMap)
     attribute(String, :border, :border)
   end
   class ObjectCollection < ElementCollection
@@ -659,11 +622,14 @@ module Watir
     attribute(String, :name, :name)
     attribute(String, :sandbox, :sandbox)
     attribute("Boolean", :allowfullscreen?, :allowFullscreen)
+    attribute("Boolean", :allowpaymentrequest?, :allowPaymentRequest)
+    attribute(String, :referrerpolicy, :referrerPolicy)
     attribute(String, :contentdocument, :contentDocument)
     attribute(String, :contentwindow, :contentWindow)
     attribute(String, :align, :align)
     attribute(String, :scrolling, :scrolling)
     attribute(String, :frameborder, :frameBorder)
+    attribute(String, :longdesc, :longDesc)
     attribute(String, :marginheight, :marginHeight)
     attribute(String, :marginwidth, :marginWidth)
   end
@@ -677,11 +643,13 @@ module Watir
     attribute(String, :sizes, :sizes)
     attribute(String, :crossorigin, :crossOrigin)
     attribute(String, :usemap, :useMap)
+    attribute(String, :longdesc, :longDesc)
     attribute("Boolean", :ismap?, :isMap)
     attribute(Integer, :naturalwidth, :naturalWidth)
     attribute(Integer, :naturalheight, :naturalHeight)
     attribute("Boolean", :complete?, :complete)
     attribute(String, :currentsrc, :currentSrc)
+    attribute(String, :referrerpolicy, :referrerPolicy)
     attribute(String, :name, :name)
     attribute(String, :lowsrc, :lowsrc)
     attribute(String, :align, :align)
@@ -693,11 +661,11 @@ module Watir
   end
 
   class Source < HTMLElement
+    attribute(String, :src, :src)
+    attribute(String, :type, :type)
     attribute(String, :srcset, :srcset)
     attribute(String, :sizes, :sizes)
     attribute(String, :media, :media)
-    attribute(String, :src, :src)
-    attribute(String, :type, :type)
   end
   class SourceCollection < ElementCollection
   end
@@ -745,6 +713,7 @@ module Watir
     attribute(String, :rellist, :relList)
     attribute(String, :hreflang, :hreflang)
     attribute(String, :type, :type)
+    attribute(String, :referrerpolicy, :referrerPolicy)
     attribute(String, :coords, :coords)
     attribute(String, :charset, :charset)
     attribute(String, :name, :name)
@@ -830,7 +799,6 @@ module Watir
   end
 
   class Body < HTMLElement
-    attribute(String, :link, :link)
     attribute(String, :vlink, :vLink)
     attribute(String, :alink, :aLink)
     attribute(String, :bgcolor, :bgColor)
@@ -1172,6 +1140,16 @@ module Watir
     end
     Watir.tag_to_class[:dfn] = HTMLElement
 
+    # @return [Dialog]
+    def dialog(*args)
+      Dialog.new(self, extract_selector(args).merge(tag_name: "dialog"))
+    end
+    # @return [DialogCollection]
+    def dialogs(*args)
+      DialogCollection.new(self, extract_selector(args).merge(tag_name: "dialog"))
+    end
+    Watir.tag_to_class[:dialog] = Dialog
+
     # @return [Div]
     def div(*args)
       Div.new(self, extract_selector(args).merge(tag_name: "div"))
@@ -1442,16 +1420,6 @@ module Watir
     end
     Watir.tag_to_class[:kbd] = HTMLElement
 
-    # @return [Keygen]
-    def keygen(*args)
-      Keygen.new(self, extract_selector(args).merge(tag_name: "keygen"))
-    end
-    # @return [KeygenCollection]
-    def keygens(*args)
-      KeygenCollection.new(self, extract_selector(args).merge(tag_name: "keygen"))
-    end
-    Watir.tag_to_class[:keygen] = Keygen
-
     # @return [Label]
     def label(*args)
       Label.new(self, extract_selector(args).merge(tag_name: "label"))
@@ -1512,26 +1480,6 @@ module Watir
     end
     Watir.tag_to_class[:mark] = HTMLElement
 
-    # @return [Menu]
-    def menu(*args)
-      Menu.new(self, extract_selector(args).merge(tag_name: "menu"))
-    end
-    # @return [MenuCollection]
-    def menus(*args)
-      MenuCollection.new(self, extract_selector(args).merge(tag_name: "menu"))
-    end
-    Watir.tag_to_class[:menu] = Menu
-
-    # @return [MenuItem]
-    def menuitem(*args)
-      MenuItem.new(self, extract_selector(args).merge(tag_name: "menuitem"))
-    end
-    # @return [MenuItemCollection]
-    def menuitems(*args)
-      MenuItemCollection.new(self, extract_selector(args).merge(tag_name: "menuitem"))
-    end
-    Watir.tag_to_class[:menuitem] = MenuItem
-
     # @return [Meta]
     def meta(*args)
       Meta.new(self, extract_selector(args).merge(tag_name: "meta"))

data/lib/watir/elements/iframe.rb

@@ -1,40 +1,17 @@
 module Watir
   class IFrame < HTMLElement
-
-    def locate
-      return if @selector.empty?
-      @query_scope.ensure_context
-
-      selector = @selector.merge(tag_name: frame_tag)
-      element_validator = element_validator_class.new
-      selector_builder = selector_builder_class.new(@query_scope, selector, self.class.attribute_list)
-      @locator = locator_class.new(@query_scope, selector, selector_builder, element_validator)
-
-      element = @locator.locate
-      element or raise unknown_exception, "unable to locate #{@selector[:tag_name]} using #{selector_string}"
-
-      @element = FramedDriver.new(element, browser)
-    end
-
-    def ==(other)
-      return false unless other.is_a?(self.class)
-      wd == other.wd.is_a?(FramedDriver) ? other.wd.send(:wd) : other.wd
-    end
+    #
+    # Move Driver context into the iframe
+    #
 
     def switch_to!
-      locate.send :switch!
-    end
-
-    def assert_exists
-      if @element && @selector.empty?
-        raise UnknownFrameException, "wrapping a Selenium element as a Frame is not currently supported"
-      end
-
-      super
+      locate unless located?
+      wd.switch!
     end
 
     #
     # Returns text of iframe body.
+    # #body ensures context so this method does not have to
     #
     # @return [String]
     #
@@ -50,8 +27,15 @@ module Watir
     #
 
     def html
-      wait_for_exists
-      @element.page_source
+      wd.page_source
+    end
+
+    #
+    # Delegate sending keystrokes to FramedDriver
+    #
+
+    def send_keys(*args)
+      wd.send_keys(*args)
     end
 
     #
@@ -61,106 +45,108 @@ module Watir
     #
 
     def execute_script(script, *args)
-      args.map! { |e| e.kind_of?(Watir::Element) ? e.wd : e }
+      args.map! { |e| e.is_a?(Watir::Element) ? e.wd : e }
       returned = driver.execute_script(script, *args)
 
-      browser.send(:wrap_elements_in, self, returned)
+      browser.wrap_elements_in(self, returned)
     end
 
-    def ensure_context
-      switch_to!
+    #
+    # Provides access to underlying Selenium Objects as delegated by FramedDriver
+    #
+    # @return [Watir::FramedDriver]
+    #
+
+    def wd
+      super
+      FramedDriver.new(@element, browser)
     end
 
-    private
+    #
+    # @api private
+    #
+    # Always relocate a FramedDriver to ensure proper context switching
+    #
+    # @return [Boolean]
+    #
 
-    def frame_tag
-      'iframe'
+    def relocate?
+      true
     end
 
+    private
+
     def unknown_exception
       Watir::Exception::UnknownFrameException
     end
-
   end # IFrame
 
-
   class IFrameCollection < ElementCollection
   end # IFrameCollection
 
-
   class Frame < IFrame
-
-    private
-
-    def frame_tag
-      'frame'
-    end
-
   end # Frame
 
-
   class FrameCollection < IFrameCollection
   end # FrameCollection
 
-
   module Container
-
     def frame(*args)
-      Frame.new(self, extract_selector(args).merge(tag_name: "frame"))
+      Frame.new(self, extract_selector(args).merge(tag_name: 'frame'))
     end
 
     def frames(*args)
-      FrameCollection.new(self, extract_selector(args).merge(tag_name: "frame"))
+      FrameCollection.new(self, extract_selector(args).merge(tag_name: 'frame'))
     end
-
   end # Container
 
-
-  # @api private
   #
-  # another hack..
+  # @api private
   #
 
   class FramedDriver
     def initialize(element, browser)
       @element = element
       @browser = browser
-      @driver = browser.driver
+      @driver = browser.wd
     end
 
     def ==(other)
       wd == other.wd
     end
-    alias_method :eql?, :==
+    alias eql? ==
 
     def send_keys(*args)
       switch!
       @driver.switch_to.active_element.send_keys(*args)
     end
 
-    protected
+    def switch!
+      @driver.switch_to.frame @element
+      @browser.default_context = false
+    rescue Selenium::WebDriver::Error::NoSuchFrameError => e
+      raise Exception::UnknownFrameException, e.message
+    end
 
     def wd
       @element
     end
 
-    private
+    def respond_to_missing?(meth)
+      @driver.respond_to?(meth) || @element.respond_to?(meth)
+    end
 
     def method_missing(meth, *args, &blk)
-      if @driver.respond_to?(meth)
+      if %i[find_element find_elements].include?(meth)
+        @driver.send(meth, *args, &blk)
+      elsif @driver.respond_to?(meth)
         switch!
         @driver.send(meth, *args, &blk)
-      else
+      elsif @element.respond_to?(meth)
         @element.send(meth, *args, &blk)
+      else
+        super
       end
     end
-
-    def switch!
-      @driver.switch_to.frame @element
-      @browser.default_context = false
-    rescue Selenium::WebDriver::Error::NoSuchFrameError => e
-      raise Exception::UnknownFrameException, e.message
-    end
-
   end # FramedDriver
 end # Watir