watir 6.6.3 → 6.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 972d136a4af0abe48641cb7703820f8d15dc82a2
-  data.tar.gz: 41014e0e2977544fa86468ee3c91bb38e58f4f1c
+  metadata.gz: 18ce4184fd15427b0f00abf58aa9d036fd37d13f
+  data.tar.gz: 85f6b2e47e10b5c4b89f3c7d138fc58e143834bb
 SHA512:
-  metadata.gz: ba15ccf0f48236f3ab0df7523f562c1b19698c46a87b441229b0ff6fe24ab4749d145bce682ba166bfb5fa67d28f5177ffce6c0c5110d88e2f698be35db4cd1b
-  data.tar.gz: 54f53d8896b34ae1e6462b03347686e2fb16affc6e8e9f58bae598649a7f45b7f7de6186bc62aa1abf7881eb8ce0912b19adaf81c4bace186eabe01cbf89482e
+  metadata.gz: 4f0159b01a4c1be3f0d3bddbd3b4a8d7d676aad75dc82a33441f7e5a4cd6e367833bca63050cc5256ba906f78a9784fef1c16d1cb21c5266fd0744018b76a149
+  data.tar.gz: 912dfa7b7f8bf53acc6734a771ed86c98b1c71c4b5e1858f911611e1751213fb9d319a14d2595d378f26fc5b33766764c0b3213f47bf1b518356faa78cd7d6fe

data/CHANGES.md

@@ -1,3 +1,17 @@
+### 6.7.0 (2017-08-14)
+
+* Implement TableCell#column_header
+* Add aliases to access Element methods in more ways
+* Add methods on Element #scroll_into_view #location #size #height #center
+* Fix bug preventing Safari Technology Preview usage
+* Implement Browser#original_window
+* Implement TableCell#sibling_from_header
+* Fix bug preventing usage of switches with Chrome
+* Fix bug of not waiting for SelectList when using options
+* Allow OList, UList, TableRow, Table to be accessed like collections
+* Implement Element#siblings
+* Fix bug preventing locating elements by attribute
+
 ### 6.6.3 (2017-08-09)
 
 * Fix bug preventing usage of remote driver (#614)

data/README.md

@@ -15,12 +15,12 @@ Watir Powered By Selenium!
 require 'watir'
 
 browser = Watir::Browser.new
-browser.goto 'google.com'
-browser.text_field(title: 'Search').set 'Hello World!'
-browser.button(type: 'submit').click
+
+browser.goto 'watir.com'
+browser.link(text: 'Documentation').click
 
 puts browser.title
-# => 'Hello World! - Google Search'
+# => 'Documentation – Watir Project...'
 browser.close
 ```
 

data/lib/watir.rb

@@ -136,8 +136,8 @@ require 'watir/elements/form'
 require 'watir/elements/iframe'
 require 'watir/elements/hidden'
 require 'watir/elements/image'
-require 'watir/elements/input'
 require 'watir/elements/link'
+require 'watir/elements/list'
 require 'watir/elements/option'
 require 'watir/elements/radio'
 require 'watir/elements/row'

data/lib/watir/adjacent.rb

@@ -67,6 +67,19 @@ module Watir
     end
     alias_method :next_siblings, :following_siblings
 
+
+    #
+    # Returns collection of siblings of current element, including current element.
+    #
+    # @example
+    #   browser.text_field(name: "new_user_first_name").siblings.size
+    #   #=> 56
+    #
+
+    def siblings(opt = {})
+      parent.children(opt)
+    end
+
     #
     # Returns element of direct child of current element.
     #

data/lib/watir/attribute_helper.rb

@@ -68,8 +68,6 @@ module Watir
 
     def define_string_attribute(mname, aname)
       define_method mname do
-        # final w3c likely will not support className
-        aname = :class if mname == :class_name
         attribute_value(aname).to_s
       end
     end

data/lib/watir/browser.rb

@@ -9,7 +9,7 @@ module Watir
     include HasWindow
     include Waitable
 
-    attr_writer :default_context
+    attr_writer :default_context, :original_window
     attr_reader :driver
     attr_reader :after_hooks
     alias_method :wd, :driver # ensures duck typing with Watir::Element

data/lib/watir/capabilities.rb

@@ -62,9 +62,9 @@ module Watir
 
       case @selenium_browser
       when :chrome
-        if @options.key?(:args)
+        if @options.key?(:args) || @options.key?(:switches)
           browser_options ||= {}
-          browser_options[:args] = @options.delete(:args).dup
+          browser_options[:args] = (@options.delete(:args) || @options.delete(:switches)).dup
         end
         if @options.delete(:headless)
           browser_options ||= {}
@@ -77,12 +77,15 @@ module Watir
         @selenium_opts[:options] = browser_options if browser_options.is_a? Selenium::WebDriver::Firefox::Options
         @selenium_opts[:options] ||= Selenium::WebDriver::Firefox::Options.new(options) if browser_options
       when :safari
-        @selenium_opts["safari.options"] = {'technologyPreview' => true} if @options.delete(:technology_preview)
+        Selenium::WebDriver::Safari.technology_preview! if @options.delete(:technology_preview)
       when :remote
         if @browser == :chrome && @options.delete(:headless)
-          args = @options.delete(:args) || []
+          args = @options.delete(:args) || @options.delete(:switches) || []
           @options['chromeOptions'] = {'args' => args + ['--headless', '--disable-gpu']}
         end
+        if @browser == :safari && @options.delete(:technology_preview)
+          @options["safari.options"] = {'technologyPreview' => true}
+        end
       end
     end
 

data/lib/watir/element_collection.rb

@@ -28,32 +28,10 @@ module Watir
       to_a.each(&blk)
     end
 
-    #
-    # Returns number of elements in collection.
-    #
-    # @return [Integer]
-    #
-
-    def length
-      to_a.length
-    end
-    alias_method :size, :length
-
-    #
-    # Returns true if no elements are found
-    #
-    # @example
-    #   browser.select_list(name: "new_user_languages").options(class: 'not_here').empty?
-    #   #=> true
-    #
-    # @example
-    #   browser.select_list(name: "new_user_languages").options(id: 'danish').empty?
-    #   #=> false
-    #
+    alias_method :length, :count
+    alias_method :size, :count
 
-    def empty?
-      length == 0
-    end
+    alias_method :empty?, :none?
 
     #
     # Get the element at the given index.
@@ -69,16 +47,6 @@ module Watir
       to_a[idx] || element_class.new(@query_scope, @selector.merge(index: idx))
     end
 
-    #
-    # First element of this collection
-    #
-    # @return [Watir::Element] Returns an instance of a Watir::Element subclass
-    #
-
-    def first
-      self[0]
-    end
-
     #
     # Last element of the collection
     #
@@ -112,7 +80,17 @@ module Watir
             end
           end
     end
-    alias_method :locate, :to_a
+
+    #
+    # Locate all elements and return self.
+    #
+    # @return ElementCollection
+    #
+
+    def locate
+      to_a
+      self
+    end
 
     #
     # Returns true if two element collections are equal.

data/lib/watir/elements/checkbox.rb

@@ -18,6 +18,7 @@ module Watir
     def set(bool = true)
       set? == bool ? assert_enabled : click
     end
+    alias_method :check, :set
 
     #
     # Returns true if the element is checked
@@ -27,6 +28,7 @@ module Watir
     def set?
       element_call { @element.selected? }
     end
+    alias_method :checked?, :set?
 
     #
     # Unsets checkbox.
@@ -35,6 +37,7 @@ module Watir
     def clear
       set false
     end
+    alias_method :uncheck, :clear
 
   end # CheckBox
 

data/lib/watir/elements/element.rb

@@ -14,6 +14,7 @@ module Watir
     include Adjacent
 
     attr_accessor :keyword
+    attr_reader :selector
 
     #
     # temporarily add :id and :class_name manually since they're no longer specified in the HTML spec.
@@ -268,6 +269,7 @@ module Watir
     def attribute_value(attribute_name)
       element_call { @element.attribute attribute_name }
     end
+    alias_method :attribute, :attribute_value
 
     #
     # Returns outer (inner + element itself) HTML code of element.
@@ -282,7 +284,6 @@ module Watir
     def outer_html
       element_call { execute_atom(:getOuterHtml, @element) }.strip
     end
-
     alias_method :html, :outer_html
 
     #
@@ -351,6 +352,87 @@ module Watir
       element_call { execute_atom :fireEvent, @element, event_name }
     end
 
+    #
+    # Scroll until the element is in the view screen
+    #
+    # @example
+    #   browser.button(name: "new_user_button").scroll_into_view
+    #
+    # @return [Selenium::WebDriver::Point]
+    #
+
+    def scroll_into_view
+      element_call { @element.location_once_scrolled_into_view }
+    end
+
+    #
+    # location of element (x, y)
+    #
+    # @example
+    #   browser.button(name: "new_user_button").location
+    #
+    # @return [Selenium::WebDriver::Point]
+    #
+
+    def location
+      element_call { @element.location }
+    end
+
+    #
+    # size of element (width, height)
+    #
+    # @example
+    #   browser.button(name: "new_user_button").size
+    #
+    # @return [Selenium::WebDriver::Dimension]
+    #
+
+    def size
+      element_call { @element.size }
+    end
+
+    #
+    # Get height of element
+    #
+    # @example
+    #   browser.button(name: "new_user_button").height
+    #
+    # @return [Selenium::WebDriver::Dimension]
+    #
+
+    def height
+      size['height']
+    end
+
+    #
+    # Get width of element
+    #
+    # @example
+    #   browser.button(name: "new_user_button").width
+    #
+    # @return [Selenium::WebDriver::Dimension]
+    #
+
+    def width
+      size['width']
+    end
+
+    #
+    # Get centre coordinates of element
+    #
+    # @example
+    #   browser.button(name: "new_user_button").centre
+    #
+    # @return [Selenium::WebDriver::Point]
+    #
+
+    def center
+      location = location()
+      Selenium::WebDriver::Point.new(location.x + (width/2),
+                                     location.y + (height/2))
+    end
+    alias_method :centre, :center
+
     #
     # @api private
     #
@@ -510,7 +592,7 @@ module Watir
       return if present?
 
       begin
-        @query_scope.wait_for_present
+        @query_scope.wait_for_present unless @query_scope.is_a? Browser
         wait_until_present
       rescue Watir::Wait::TimeoutError
         msg = "element located, but timed out after #{Watir.default_timeout} seconds, waiting for #{inspect} to be present"

data/lib/watir/elements/font.rb

@@ -1,4 +1,18 @@
 module Watir
+  class Font < HTMLElement
+
+    #
+    # size of font
+    #
+    # @return [Integer]
+    #
+
+    def size
+      attribute_value(:size)
+    end
+
+  end # Font
+
   module Container
     def font(*args)
       Font.new(self, extract_selector(args).merge(tag_name: "font"))

data/lib/watir/elements/hidden.rb

@@ -3,6 +3,11 @@ module Watir
     def visible?
       false
     end
+
+    def click
+      raise Watir::Exception::ObjectDisabledException, "click is not available on the hidden field element"
+    end
+
   end
 
   module Container

data/lib/watir/elements/html_elements.rb

@@ -7,11 +7,11 @@ module Watir
     attribute(String, :dir, :dir)
     attribute(String, :dataset, :dataset)
     attribute("Boolean", :hidden?, :hidden)
-    attribute(Integer, :tab_index, :tabIndex)
-    attribute(String, :access_key, :accessKey)
+    attribute(Integer, :tabindex, :tabIndex)
+    attribute(String, :accesskey, :accessKey)
     attribute("Boolean", :draggable?, :draggable)
     attribute(String, :dropzone, :dropzone)
-    attribute(String, :context_menu, :contextMenu)
+    attribute(String, :contextmenu, :contextMenu)
     attribute("Boolean", :spellcheck?, :spellcheck)
     attribute(String, :onabort, :onabort)
     attribute(String, :onblur, :onblur)
@@ -85,7 +85,6 @@ module Watir
   class Font < HTMLElement
     attribute(String, :color, :color)
     attribute(String, :face, :face)
-    attribute(String, :size, :size)
   end
   class FontCollection < ElementCollection
   end
@@ -119,16 +118,14 @@ module Watir
 
   class Marquee < HTMLElement
     attribute(String, :behavior, :behavior)
-    attribute(String, :bg_color, :bgColor)
+    attribute(String, :bgcolor, :bgColor)
     attribute(String, :direction, :direction)
-    attribute(String, :height, :height)
     attribute(Integer, :hspace, :hspace)
     attribute(Integer, :loop, :loop)
-    attribute(Integer, :scroll_amount, :scrollAmount)
-    attribute(Integer, :scroll_delay, :scrollDelay)
-    attribute("Boolean", :true_speed?, :trueSpeed)
+    attribute(Integer, :scrollamount, :scrollAmount)
+    attribute(Integer, :scrolldelay, :scrollDelay)
+    attribute("Boolean", :truespeed?, :trueSpeed)
     attribute(Integer, :vspace, :vspace)
-    attribute(String, :width, :width)
     attribute(String, :onbounce, :onbounce)
     attribute(String, :onfinish, :onfinish)
     attribute(String, :onstart, :onstart)
@@ -141,20 +138,16 @@ module Watir
     attribute(String, :alt, :alt)
     attribute(String, :archive, :archive)
     attribute(String, :code, :code)
-    attribute(String, :code_base, :codeBase)
-    attribute(String, :height, :height)
+    attribute(String, :codebase, :codeBase)
     attribute(Integer, :hspace, :hspace)
     attribute(String, :name, :name)
     attribute(String, :object, :object)
     attribute(Integer, :vspace, :vspace)
-    attribute(String, :width, :width)
   end
   class AppletCollection < ElementCollection
   end
 
   class Canvas < HTMLElement
-    attribute(Integer, :width, :width)
-    attribute(Integer, :height, :height)
   end
   class CanvasCollection < ElementCollection
   end
@@ -171,7 +164,7 @@ module Watir
     attribute(String, :charset, :charset)
     attribute("Boolean", :async?, :async)
     attribute("Boolean", :defer?, :defer)
-    attribute(String, :cross_origin, :crossOrigin)
+    attribute(String, :crossorigin, :crossOrigin)
     attribute(String, :nonce, :nonce)
     attribute(String, :event, :event)
     attribute(String, :for, :htmlFor)
@@ -217,9 +210,9 @@ module Watir
     attribute(String, :form, :form)
     attribute(String, :name, :name)
     attribute(String, :type, :type)
-    attribute("Boolean", :will_validate?, :willValidate)
+    attribute("Boolean", :willvalidate?, :willValidate)
     attribute(String, :validity, :validity)
-    attribute(String, :validation_message, :validationMessage)
+    attribute(String, :validationmessage, :validationMessage)
   end
   class FieldSetCollection < ElementCollection
   end
@@ -250,11 +243,11 @@ module Watir
     attribute(String, :form, :form)
     attribute(String, :name, :name)
     attribute(String, :type, :type)
-    attribute(String, :default_value, :defaultValue)
+    attribute(String, :defaultvalue, :defaultValue)
     attribute(String, :value, :value)
-    attribute("Boolean", :will_validate?, :willValidate)
+    attribute("Boolean", :willvalidate?, :willValidate)
     attribute(String, :validity, :validity)
-    attribute(String, :validation_message, :validationMessage)
+    attribute(String, :validationmessage, :validationMessage)
     attribute(String, :labels, :labels)
   end
   class OutputCollection < ElementCollection
@@ -268,9 +261,9 @@ module Watir
     attribute(String, :keytype, :keytype)
     attribute(String, :name, :name)
     attribute(String, :type, :type)
-    attribute("Boolean", :will_validate?, :willValidate)
+    attribute("Boolean", :willvalidate?, :willValidate)
     attribute(String, :validity, :validity)
-    attribute(String, :validation_message, :validationMessage)
+    attribute(String, :validationmessage, :validationMessage)
     attribute(String, :labels, :labels)
   end
   class KeygenCollection < ElementCollection
@@ -280,28 +273,28 @@ module Watir
     attribute(String, :autocomplete, :autocomplete)
     attribute("Boolean", :autofocus?, :autofocus)
     attribute(Integer, :cols, :cols)
-    attribute(String, :dir_name, :dirName)
+    attribute(String, :dirname, :dirName)
     attribute("Boolean", :disabled?, :disabled)
     attribute(String, :form, :form)
-    attribute(String, :input_mode, :inputMode)
-    attribute(Integer, :max_length, :maxLength)
-    attribute(Integer, :min_length, :minLength)
+    attribute(String, :inputmode, :inputMode)
+    attribute(Integer, :maxlength, :maxLength)
+    attribute(Integer, :minlength, :minLength)
     attribute(String, :name, :name)
     attribute(String, :placeholder, :placeholder)
-    attribute("Boolean", :read_only?, :readOnly)
+    attribute("Boolean", :readonly?, :readOnly)
     attribute("Boolean", :required?, :required)
     attribute(String, :wrap, :wrap)
     attribute(String, :type, :type)
-    attribute(String, :default_value, :defaultValue)
+    attribute(String, :defaultvalue, :defaultValue)
     attribute(String, :value, :value)
-    attribute(Integer, :text_length, :textLength)
-    attribute("Boolean", :will_validate?, :willValidate)
+    attribute(Integer, :textlength, :textLength)
+    attribute("Boolean", :willvalidate?, :willValidate)
     attribute(String, :validity, :validity)
-    attribute(String, :validation_message, :validationMessage)
+    attribute(String, :validationmessage, :validationMessage)
     attribute(String, :labels, :labels)
-    attribute(Integer, :selection_start, :selectionStart)
-    attribute(Integer, :selection_end, :selectionEnd)
-    attribute(String, :selection_direction, :selectionDirection)
+    attribute(Integer, :selectionstart, :selectionStart)
+    attribute(Integer, :selectionend, :selectionEnd)
+    attribute(String, :selectiondirection, :selectionDirection)
   end
   class TextAreaCollection < ElementCollection
   end
@@ -310,7 +303,7 @@ module Watir
     attribute("Boolean", :disabled?, :disabled)
     attribute(String, :form, :form)
     attribute(String, :label, :label)
-    attribute("Boolean", :default_selected?, :defaultSelected)
+    attribute("Boolean", :defaultselected?, :defaultSelected)
     attribute("Boolean", :selected?, :selected)
     attribute(String, :value, :value)
     attribute(Integer, :index, :index)
@@ -339,16 +332,15 @@ module Watir
     attribute("Boolean", :multiple?, :multiple)
     attribute(String, :name, :name)
     attribute("Boolean", :required?, :required)
-    attribute(Integer, :size, :size)
     attribute(String, :type, :type)
     attribute(String, :options, :options)
     attribute(Integer, :length, :length)
-    attribute(String, :selected_options, :selectedOptions)
-    attribute(Integer, :selected_index, :selectedIndex)
+    attribute(String, :selectedoptions, :selectedOptions)
+    attribute(Integer, :selectedindex, :selectedIndex)
     attribute(String, :value, :value)
-    attribute("Boolean", :will_validate?, :willValidate)
+    attribute("Boolean", :willvalidate?, :willValidate)
     attribute(String, :validity, :validity)
-    attribute(String, :validation_message, :validationMessage)
+    attribute(String, :validationmessage, :validationMessage)
     attribute(String, :labels, :labels)
   end
   class SelectCollection < ElementCollection
@@ -358,18 +350,18 @@ module Watir
     attribute("Boolean", :autofocus?, :autofocus)
     attribute("Boolean", :disabled?, :disabled)
     attribute(String, :form, :form)
-    attribute(String, :form_action, :formAction)
-    attribute(String, :form_enctype, :formEnctype)
-    attribute(String, :form_method, :formMethod)
-    attribute("Boolean", :form_no_validate?, :formNoValidate)
-    attribute(String, :form_target, :formTarget)
+    attribute(String, :formaction, :formAction)
+    attribute(String, :formenctype, :formEnctype)
+    attribute(String, :formmethod, :formMethod)
+    attribute("Boolean", :formnovalidate?, :formNoValidate)
+    attribute(String, :formtarget, :formTarget)
     attribute(String, :name, :name)
     attribute(String, :type, :type)
     attribute(String, :value, :value)
     attribute(String, :menu, :menu)
-    attribute("Boolean", :will_validate?, :willValidate)
+    attribute("Boolean", :willvalidate?, :willValidate)
     attribute(String, :validity, :validity)
-    attribute(String, :validation_message, :validationMessage)
+    attribute(String, :validationmessage, :validationMessage)
     attribute(String, :labels, :labels)
   end
   class ButtonCollection < ElementCollection
@@ -380,49 +372,46 @@ module Watir
     attribute(String, :alt, :alt)
     attribute(String, :autocomplete, :autocomplete)
     attribute("Boolean", :autofocus?, :autofocus)
-    attribute("Boolean", :default_checked?, :defaultChecked)
+    attribute("Boolean", :defaultchecked?, :defaultChecked)
     attribute("Boolean", :checked?, :checked)
-    attribute(String, :dir_name, :dirName)
+    attribute(String, :dirname, :dirName)
     attribute("Boolean", :disabled?, :disabled)
     attribute(String, :form, :form)
     attribute(String, :files, :files)
-    attribute(String, :form_action, :formAction)
-    attribute(String, :form_enctype, :formEnctype)
-    attribute(String, :form_method, :formMethod)
-    attribute("Boolean", :form_no_validate?, :formNoValidate)
-    attribute(String, :form_target, :formTarget)
-    attribute(Integer, :height, :height)
+    attribute(String, :formaction, :formAction)
+    attribute(String, :formenctype, :formEnctype)
+    attribute(String, :formmethod, :formMethod)
+    attribute("Boolean", :formnovalidate?, :formNoValidate)
+    attribute(String, :formtarget, :formTarget)
     attribute("Boolean", :indeterminate?, :indeterminate)
-    attribute(String, :input_mode, :inputMode)
+    attribute(String, :inputmode, :inputMode)
     attribute(String, :list, :list)
     attribute(String, :max, :max)
-    attribute(Integer, :max_length, :maxLength)
+    attribute(Integer, :maxlength, :maxLength)
     attribute(String, :min, :min)
-    attribute(Integer, :min_length, :minLength)
+    attribute(Integer, :minlength, :minLength)
     attribute("Boolean", :multiple?, :multiple)
     attribute(String, :name, :name)
     attribute(String, :pattern, :pattern)
     attribute(String, :placeholder, :placeholder)
-    attribute("Boolean", :read_only?, :readOnly)
+    attribute("Boolean", :readonly?, :readOnly)
     attribute("Boolean", :required?, :required)
-    attribute(Integer, :size, :size)
     attribute(String, :src, :src)
     attribute(String, :step, :step)
     attribute(String, :type, :type)
-    attribute(String, :default_value, :defaultValue)
+    attribute(String, :defaultvalue, :defaultValue)
     attribute(String, :value, :value)
-    attribute(String, :value_as_date, :valueAsDate)
-    attribute(Float, :value_as_number, :valueAsNumber)
-    attribute(Integer, :width, :width)
-    attribute("Boolean", :will_validate?, :willValidate)
+    attribute(String, :valueasdate, :valueAsDate)
+    attribute(Float, :valueasnumber, :valueAsNumber)
+    attribute("Boolean", :willvalidate?, :willValidate)
     attribute(String, :validity, :validity)
-    attribute(String, :validation_message, :validationMessage)
+    attribute(String, :validationmessage, :validationMessage)
     attribute(String, :labels, :labels)
-    attribute(Integer, :selection_start, :selectionStart)
-    attribute(Integer, :selection_end, :selectionEnd)
-    attribute(String, :selection_direction, :selectionDirection)
+    attribute(Integer, :selectionstart, :selectionStart)
+    attribute(Integer, :selectionend, :selectionEnd)
+    attribute(String, :selectiondirection, :selectionDirection)
     attribute(String, :align, :align)
-    attribute(String, :use_map, :useMap)
+    attribute(String, :usemap, :useMap)
   end
   class InputCollection < ElementCollection
   end
@@ -443,7 +432,7 @@ module Watir
     attribute(String, :encoding, :encoding)
     attribute(String, :method, :method)
     attribute(String, :name, :name)
-    attribute("Boolean", :no_validate?, :noValidate)
+    attribute("Boolean", :novalidate?, :noValidate)
     attribute(String, :target, :target)
     attribute(Integer, :length, :length)
   end
@@ -451,19 +440,17 @@ module Watir
   end
 
   class TableCell < HTMLElement
-    attribute(Integer, :col_span, :colSpan)
-    attribute(Integer, :row_span, :rowSpan)
+    attribute(Integer, :colspan, :colSpan)
+    attribute(Integer, :rowspan, :rowSpan)
     attribute(String, :headers, :headers)
-    attribute(Integer, :cell_index, :cellIndex)
+    attribute(Integer, :cellindex, :cellIndex)
     attribute(String, :align, :align)
     attribute(String, :axis, :axis)
-    attribute(String, :height, :height)
-    attribute(String, :width, :width)
     attribute(String, :ch, :ch)
-    attribute(String, :ch_off, :chOff)
-    attribute("Boolean", :no_wrap?, :noWrap)
-    attribute(String, :v_align, :vAlign)
-    attribute(String, :bg_color, :bgColor)
+    attribute(String, :choff, :chOff)
+    attribute("Boolean", :nowrap?, :noWrap)
+    attribute(String, :valign, :vAlign)
+    attribute(String, :bgcolor, :bgColor)
   end
   class TableCellCollection < ElementCollection
   end
@@ -482,13 +469,13 @@ module Watir
   end
 
   class TableRow < HTMLElement
-    attribute(Integer, :row_index, :rowIndex)
-    attribute(Integer, :section_row_index, :sectionRowIndex)
+    attribute(Integer, :rowindex, :rowIndex)
+    attribute(Integer, :sectionrowindex, :sectionRowIndex)
     attribute(String, :align, :align)
     attribute(String, :ch, :ch)
-    attribute(String, :ch_off, :chOff)
-    attribute(String, :v_align, :vAlign)
-    attribute(String, :bg_color, :bgColor)
+    attribute(String, :choff, :chOff)
+    attribute(String, :valign, :vAlign)
+    attribute(String, :bgcolor, :bgColor)
   end
   class TableRowCollection < ElementCollection
   end
@@ -496,8 +483,8 @@ module Watir
   class TableSection < HTMLElement
     attribute(String, :align, :align)
     attribute(String, :ch, :ch)
-    attribute(String, :ch_off, :chOff)
-    attribute(String, :v_align, :vAlign)
+    attribute(String, :choff, :chOff)
+    attribute(String, :valign, :vAlign)
   end
   class TableSectionCollection < ElementCollection
   end
@@ -505,9 +492,8 @@ module Watir
   class TableCol < HTMLElement
     attribute(String, :align, :align)
     attribute(String, :ch, :ch)
-    attribute(String, :ch_off, :chOff)
-    attribute(String, :v_align, :vAlign)
-    attribute(String, :width, :width)
+    attribute(String, :choff, :chOff)
+    attribute(String, :valign, :vAlign)
   end
   class TableColCollection < ElementCollection
   end
@@ -520,18 +506,15 @@ module Watir
 
   class Table < HTMLElement
     attribute(String, :caption, :caption)
-    attribute(String, :t_head, :tHead)
-    attribute(String, :t_foot, :tFoot)
-    attribute(String, :t_bodies, :tBodies)
+    attribute(String, :tbodies, :tBodies)
     attribute(String, :align, :align)
     attribute(String, :border, :border)
     attribute(String, :frame, :frame)
     attribute(String, :rules, :rules)
     attribute(String, :summary, :summary)
-    attribute(String, :width, :width)
-    attribute(String, :bg_color, :bgColor)
-    attribute(String, :cell_padding, :cellPadding)
-    attribute(String, :cell_spacing, :cellSpacing)
+    attribute(String, :bgcolor, :bgColor)
+    attribute(String, :cellpadding, :cellPadding)
+    attribute(String, :cellspacing, :cellSpacing)
   end
   class TableCollection < ElementCollection
   end
@@ -543,10 +526,10 @@ module Watir
     attribute(String, :target, :target)
     attribute(String, :download, :download)
     attribute(String, :rel, :rel)
-    attribute(String, :rel_list, :relList)
+    attribute(String, :rellist, :relList)
     attribute(String, :hreflang, :hreflang)
     attribute(String, :type, :type)
-    attribute("Boolean", :no_href?, :noHref)
+    attribute("Boolean", :nohref?, :noHref)
     attribute(String, :href, :href)
     attribute(String, :origin, :origin)
     attribute(String, :protocol, :protocol)
@@ -572,19 +555,19 @@ module Watir
   class Media < HTMLElement
     attribute(String, :error, :error)
     attribute(String, :src, :src)
-    attribute(String, :src_object, :srcObject)
-    attribute(String, :current_src, :currentSrc)
-    attribute(String, :cross_origin, :crossOrigin)
-    attribute(Integer, :network_state, :networkState)
+    attribute(String, :srcobject, :srcObject)
+    attribute(String, :currentsrc, :currentSrc)
+    attribute(String, :crossorigin, :crossOrigin)
+    attribute(Integer, :networkstate, :networkState)
     attribute(String, :preload, :preload)
     attribute(String, :buffered, :buffered)
-    attribute(Integer, :ready_state, :readyState)
+    attribute(Integer, :readystate, :readyState)
     attribute("Boolean", :seeking?, :seeking)
-    attribute(Float, :current_time, :currentTime)
+    attribute(Float, :currenttime, :currentTime)
     attribute(Float, :duration, :duration)
     attribute("Boolean", :paused?, :paused)
-    attribute(Float, :default_playback_rate, :defaultPlaybackRate)
-    attribute(Float, :playback_rate, :playbackRate)
+    attribute(Float, :defaultplaybackrate, :defaultPlaybackRate)
+    attribute(Float, :playbackrate, :playbackRate)
     attribute(String, :played, :played)
     attribute(String, :seekable, :seekable)
     attribute("Boolean", :ended?, :ended)
@@ -593,10 +576,10 @@ module Watir
     attribute("Boolean", :controls?, :controls)
     attribute(Float, :volume, :volume)
     attribute("Boolean", :muted?, :muted)
-    attribute("Boolean", :default_muted?, :defaultMuted)
-    attribute(String, :audio_tracks, :audioTracks)
-    attribute(String, :video_tracks, :videoTracks)
-    attribute(String, :text_tracks, :textTracks)
+    attribute("Boolean", :defaultmuted?, :defaultMuted)
+    attribute(String, :audiotracks, :audioTracks)
+    attribute(String, :videotracks, :videoTracks)
+    attribute(String, :texttracks, :textTracks)
   end
   class MediaCollection < ElementCollection
   end
@@ -607,10 +590,8 @@ module Watir
   end
 
   class Video < Media
-    attribute(Integer, :width, :width)
-    attribute(Integer, :height, :height)
-    attribute(Integer, :video_width, :videoWidth)
-    attribute(Integer, :video_height, :videoHeight)
+    attribute(Integer, :videowidth, :videoWidth)
+    attribute(Integer, :videoheight, :videoHeight)
     attribute(String, :poster, :poster)
   end
   class VideoCollection < ElementCollection
@@ -622,7 +603,7 @@ module Watir
     attribute(String, :srclang, :srclang)
     attribute(String, :label, :label)
     attribute("Boolean", :default?, :default)
-    attribute(Integer, :ready_state, :readyState)
+    attribute(Integer, :readystate, :readyState)
     attribute(String, :track, :track)
   end
   class TrackCollection < ElementCollection
@@ -632,7 +613,7 @@ module Watir
     attribute(String, :name, :name)
     attribute(String, :value, :value)
     attribute(String, :type, :type)
-    attribute(String, :value_type, :valueType)
+    attribute(String, :valuetype, :valueType)
   end
   class ParamCollection < ElementCollection
   end
@@ -640,16 +621,14 @@ module Watir
   class Object < HTMLElement
     attribute(String, :data, :data)
     attribute(String, :type, :type)
-    attribute("Boolean", :type_must_match?, :typeMustMatch)
+    attribute("Boolean", :typemustmatch?, :typeMustMatch)
     attribute(String, :name, :name)
     attribute(String, :form, :form)
-    attribute(String, :width, :width)
-    attribute(String, :height, :height)
-    attribute(String, :content_document, :contentDocument)
-    attribute(String, :content_window, :contentWindow)
-    attribute("Boolean", :will_validate?, :willValidate)
+    attribute(String, :contentdocument, :contentDocument)
+    attribute(String, :contentwindow, :contentWindow)
+    attribute("Boolean", :willvalidate?, :willValidate)
     attribute(String, :validity, :validity)
-    attribute(String, :validation_message, :validationMessage)
+    attribute(String, :validationmessage, :validationMessage)
     attribute(String, :align, :align)
     attribute(String, :archive, :archive)
     attribute(String, :code, :code)
@@ -657,9 +636,9 @@ module Watir
     attribute(Integer, :hspace, :hspace)
     attribute(String, :standby, :standby)
     attribute(Integer, :vspace, :vspace)
-    attribute(String, :code_base, :codeBase)
-    attribute(String, :code_type, :codeType)
-    attribute(String, :use_map, :useMap)
+    attribute(String, :codebase, :codeBase)
+    attribute(String, :codetype, :codeType)
+    attribute(String, :usemap, :useMap)
     attribute(String, :border, :border)
   end
   class ObjectCollection < ElementCollection
@@ -668,8 +647,6 @@ module Watir
   class Embed < HTMLElement
     attribute(String, :src, :src)
     attribute(String, :type, :type)
-    attribute(String, :width, :width)
-    attribute(String, :height, :height)
     attribute(String, :align, :align)
     attribute(String, :name, :name)
   end
@@ -681,16 +658,14 @@ module Watir
     attribute(String, :srcdoc, :srcdoc)
     attribute(String, :name, :name)
     attribute(String, :sandbox, :sandbox)
-    attribute("Boolean", :allow_fullscreen?, :allowFullscreen)
-    attribute(String, :width, :width)
-    attribute(String, :height, :height)
-    attribute(String, :content_document, :contentDocument)
-    attribute(String, :content_window, :contentWindow)
+    attribute("Boolean", :allowfullscreen?, :allowFullscreen)
+    attribute(String, :contentdocument, :contentDocument)
+    attribute(String, :contentwindow, :contentWindow)
     attribute(String, :align, :align)
     attribute(String, :scrolling, :scrolling)
-    attribute(String, :frame_border, :frameBorder)
-    attribute(String, :margin_height, :marginHeight)
-    attribute(String, :margin_width, :marginWidth)
+    attribute(String, :frameborder, :frameBorder)
+    attribute(String, :marginheight, :marginHeight)
+    attribute(String, :marginwidth, :marginWidth)
   end
   class IFrameCollection < ElementCollection
   end
@@ -700,15 +675,13 @@ module Watir
     attribute(String, :src, :src)
     attribute(String, :srcset, :srcset)
     attribute(String, :sizes, :sizes)
-    attribute(String, :cross_origin, :crossOrigin)
-    attribute(String, :use_map, :useMap)
-    attribute("Boolean", :map?, :isMap)
-    attribute(Integer, :width, :width)
-    attribute(Integer, :height, :height)
-    attribute(Integer, :natural_width, :naturalWidth)
-    attribute(Integer, :natural_height, :naturalHeight)
+    attribute(String, :crossorigin, :crossOrigin)
+    attribute(String, :usemap, :useMap)
+    attribute("Boolean", :ismap?, :isMap)
+    attribute(Integer, :naturalwidth, :naturalWidth)
+    attribute(Integer, :naturalheight, :naturalHeight)
     attribute("Boolean", :complete?, :complete)
-    attribute(String, :current_src, :currentSrc)
+    attribute(String, :currentsrc, :currentSrc)
     attribute(String, :name, :name)
     attribute(String, :lowsrc, :lowsrc)
     attribute(String, :align, :align)
@@ -736,7 +709,7 @@ module Watir
 
   class Mod < HTMLElement
     attribute(String, :cite, :cite)
-    attribute(String, :date_time, :dateTime)
+    attribute(String, :datetime, :dateTime)
   end
   class ModCollection < ElementCollection
   end
@@ -753,7 +726,7 @@ module Watir
   end
 
   class Time < HTMLElement
-    attribute(String, :date_time, :dateTime)
+    attribute(String, :datetime, :dateTime)
   end
   class TimeCollection < ElementCollection
   end
@@ -769,7 +742,7 @@ module Watir
     attribute(String, :download, :download)
     attribute(String, :rel, :rel)
     attribute(String, :rev, :rev)
-    attribute(String, :rel_list, :relList)
+    attribute(String, :rellist, :relList)
     attribute(String, :hreflang, :hreflang)
     attribute(String, :type, :type)
     attribute(String, :coords, :coords)
@@ -832,7 +805,6 @@ module Watir
   end
 
   class Pre < HTMLElement
-    attribute(Integer, :width, :width)
   end
   class PreCollection < ElementCollection
   end
@@ -840,9 +812,7 @@ module Watir
   class HR < HTMLElement
     attribute(String, :align, :align)
     attribute(String, :color, :color)
-    attribute("Boolean", :no_shade?, :noShade)
-    attribute(String, :size, :size)
-    attribute(String, :width, :width)
+    attribute("Boolean", :noshade?, :noShade)
   end
   class HRCollection < ElementCollection
   end
@@ -861,9 +831,9 @@ module Watir
 
   class Body < HTMLElement
     attribute(String, :link, :link)
-    attribute(String, :v_link, :vLink)
-    attribute(String, :a_link, :aLink)
-    attribute(String, :bg_color, :bgColor)
+    attribute(String, :vlink, :vLink)
+    attribute(String, :alink, :aLink)
+    attribute(String, :bgcolor, :bgColor)
     attribute(String, :background, :background)
     attribute(String, :onafterprint, :onafterprint)
     attribute(String, :onbeforeprint, :onbeforeprint)