watir-webdriver 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69667d301519d6ffd4340fe0187d9989d72cd0b5
-  data.tar.gz: 27ec93300295d47e1334fe0a92be7d40fceb9811
+  metadata.gz: d1f54118bae04cf0d3fa63789d3e497c44598568
+  data.tar.gz: 577b5480be284ed6fb2872faf741e5dc657fe81f
 SHA512:
-  metadata.gz: 103bf16805460dd31e2e2c2151701c1eaaac607544868879a3e77ed83c85aa96b143d46d398355cca5eb024a5d16173bd7d05c7ac2a41bdb609de140c8ab6d1d
-  data.tar.gz: fac256f75d40768e6df698add77dbc0032cad9a48b3ef4f2878824e9c807c6c92b12ce137be68ec4a4aeddd6adb15a3ab85d0f8e81e651afc6f8de3eb6b05998
+  metadata.gz: 720bbaa5c0629b2dbd845b336b9870d1cf48bc659ee3c5bd2ed7e83104d65141c80da02f327f6d0cb68a515ce534629a3c772a7454dc9a4faff201a10ece6866
+  data.tar.gz: d3d4c44c25c95ba661ed233c9c11f2b032019a45b89c7aa61352ea56d9da2c06b7e45a6636f39b813ef7058e20c1d55c1b5114cb0920b46c392dc97327763b45

data/.gitignore

@@ -16,3 +16,6 @@ support/svg.html
 /doc
 .idea
 .ruby-version
+.envrc
+.projections.json
+bin/

data/.travis.yml

@@ -1,8 +1,8 @@
 sudo: false
 rvm:
-  - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
 addons:
   apt:
     packages:
@@ -14,8 +14,12 @@ notifications:
     - p0deje@gmail.com
     - jarmo.p@gmail.com
     - titusfortner@gmail.com
-  irc: "irc.freenode.net#watir"
-before_script: support/travis.sh
+  slack:
+    secure: BLsBCm33R32VNRccrLx9F0P24X6BVpVHj1OWaN4Kyn6g9qXteIwC2VKVMnKNbifpojfMkrn0OeFQFK1O1DSOsC3mgzn/udoB+DnUGcSemFUn04xhbYF5SI+3zGPKPo0JLvjjdEKSSma84YwKdrj88pGUK34p01gL8hiaqjFzWdk=
+before_script:
+  - mkdir travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs:$PATH
+  - support/travis.sh
 script: bundle exec rake $RAKE_TASK
 env:
   - RAKE_TASK=spec:firefox

data/CHANGES.md

@@ -1,3 +1,9 @@
+### 0.9.2 (2016-07-29)
+
+* Massive reorganization and refactoring of element locators (#392)
+* Fix bug with when_present (#432)
+* Bug fix for elements in collections going stale
+
 ### 0.9.1 (2015-10-14)
 
 * Fix permissions issue with element_locator file(#381)

data/Rakefile

@@ -126,19 +126,31 @@ namespace :spec do
   require 'selenium-webdriver'
 
   desc 'Run specs in all browsers'
-  task all_browsers: [:firefox,
-                      :firefox_nightly,
-                      :chrome,
+  task all_browsers: [:chrome,
+                      :firefox,
+                      :phantomjs,
+                      :remote_chrome,
+                      :remote_firefox,
+                      :remote_phantomjs,
                       (:safari if Selenium::WebDriver::Platform.os == :macosx),
+                      (:remote_safari if Selenium::WebDriver::Platform.os == :macosx),
                       (:ie if Selenium::WebDriver::Platform.os == :windows),
+                      (:remote_ie if Selenium::WebDriver::Platform.os == :windows),
                       (:edge if Selenium::WebDriver::Platform.os == :windows),
-                      :phantomjs].compact
+                      (:remote_edge if Selenium::WebDriver::Platform.os == :windows)].compact
 
-  %w(firefox firefox_nightly chrome safari phantomjs ie edge).each do |browser|
+  %w(firefox marionette chrome safari phantomjs ie edge).each do |browser|
     desc "Run specs in #{browser}"
     task browser do
       ENV['WATIR_WEBDRIVER_BROWSER'] = browser
       Rake::Task['spec'].execute
     end
+
+    desc "Run specs in Remote #{browser}"
+    task "remote_#{browser}" do
+      ENV['WATIR_WEBDRIVER_BROWSER'] = 'remote'
+      ENV['REMOTE_BROWSER'] =  browser
+      Rake::Task['spec'].execute
+    end
   end
 end

data/lib/watir-webdriver.rb

@@ -10,12 +10,6 @@ require 'watir-webdriver/alert'
 require 'watir-webdriver/atoms'
 require 'watir-webdriver/container'
 require 'watir-webdriver/cookies'
-require 'watir-webdriver/locators/element_locator'
-require 'watir-webdriver/locators/button_locator'
-require 'watir-webdriver/locators/text_area_locator'
-require 'watir-webdriver/locators/text_field_locator'
-require 'watir-webdriver/locators/child_row_locator'
-require 'watir-webdriver/locators/child_cell_locator'
 require 'watir-webdriver/browser'
 require 'watir-webdriver/screenshot'
 require 'watir-webdriver/after_hooks'
@@ -62,6 +56,19 @@ module Watir
       @prefer_css = bool
     end
 
+    def locator_namespace
+      @locator_namespace ||= Watir::Locators
+    end
+
+    #
+    # Whether the locators should be used from a different namespace.
+    # Defaults to Watir::Locators.
+    #
+
+    def locator_namespace=(mod)
+      @locator_namespace = mod
+    end
+
     #
     # @api private
     #
@@ -93,6 +100,7 @@ require 'watir-webdriver/elements/svg_elements'
 
 require 'watir-webdriver/elements/area'
 require 'watir-webdriver/elements/button'
+require 'watir-webdriver/elements/cell'
 require 'watir-webdriver/elements/checkbox'
 require 'watir-webdriver/elements/dlist'
 require 'watir-webdriver/elements/file_field'
@@ -105,6 +113,7 @@ require 'watir-webdriver/elements/input'
 require 'watir-webdriver/elements/link'
 require 'watir-webdriver/elements/option'
 require 'watir-webdriver/elements/radio'
+require 'watir-webdriver/elements/row'
 require 'watir-webdriver/elements/select'
 require 'watir-webdriver/elements/table'
 require 'watir-webdriver/elements/table_cell'
@@ -113,6 +122,7 @@ require 'watir-webdriver/elements/table_section'
 require 'watir-webdriver/elements/text_area'
 require 'watir-webdriver/elements/text_field'
 
+require 'watir-webdriver/locators'
 require 'watir-webdriver/aliases'
 
 Watir.tag_to_class.freeze

data/lib/watir-webdriver/after_hooks.rb

@@ -25,7 +25,7 @@ module Watir
     #   browser.after_hooks.add do |browser|
     #     browser.text.include?("Server Error") and puts "Application exception or 500 error!"
     #   end
-    #   browser.goto "www.watir.com/404"
+    #   browser.goto "watir.github.io/404"
     #   "Application exception or 500 error!"
     #
     # @param [#call] after_hook Object responding to call
@@ -51,7 +51,7 @@ module Watir
     #   browser.after_hooks.add do |browser|
     #     browser.text.include?("Server Error") and puts "Application exception or 500 error!"
     #   end
-    #   browser.goto "www.watir.com/404"
+    #   browser.goto "watir.github.io/404"
     #   "Application exception or 500 error!"
     #   browser.after_hooks.delete browser.after_hooks[0]
     #   browser.refresh

data/lib/watir-webdriver/browser.rb

@@ -65,7 +65,7 @@ module Watir
     # Goes to the given URL.
     #
     # @example
-    #   browser.goto "www.watir.com"
+    #   browser.goto "watir.github.io"
     #
     # @param [String] uri The url.
     # @return [String] The url you end up at.
@@ -100,9 +100,9 @@ module Watir
     # Returns URL of current page.
     #
     # @example
-    #   browser.goto "www.watir.com"
+    #   browser.goto "watir.github.io"
     #   browser.url
-    #   #=> "http://watir.com/"
+    #   #=> "http://watir.github.io/"
     #
     # @return [String]
     #
@@ -116,9 +116,9 @@ module Watir
     # Returns title of current page.
     #
     # @example
-    #   browser.goto "www.watir.com"
+    #   browser.goto "watir.github.io"
     #   browser.title
-    #   #=> "Watir.com | Web Application Testing in Ruby"
+    #   #=> "Watir is... – Watir Project – Watir stands for Web Application Testing In Ruby. It facilitates the writing of automated tests by mimicking the behavior of a user interacting with a website."
     #
     # @return [String]
     #

data/lib/watir-webdriver/cell_container.rb

@@ -4,27 +4,21 @@ module Watir
     #
     # Returns table cell.
     #
-    # @return [TableCell]
+    # @return [Cell]
     #
 
     def cell(*args)
-      cell = TableCell.new(self, extract_selector(args).merge(tag_name: /^(th|td)$/))
-      cell.locator_class = ChildCellLocator
-
-      cell
+      Cell.new(self, extract_selector(args).merge(tag_name: /^(th|td)$/))
     end
 
     #
     # Returns table cells collection.
     #
-    # @return [TableCell]
+    # @return [Cell]
     #
 
     def cells(*args)
-      cells = TableCellCollection.new(self, extract_selector(args).merge(tag_name: /^(th|td)$/))
-      cells.locator_class = ChildCellLocator
-
-      cells
+      CellCollection.new(self, extract_selector(args).merge(tag_name: /^(th|td)$/))
     end
 
   end # CellContainer

data/lib/watir-webdriver/element_collection.rb

@@ -89,16 +89,37 @@ module Watir
     def elements
       @parent.is_a?(IFrame) ? @parent.switch_to! : @parent.send(:assert_exists)
 
-      @elements ||= locator_class.new(
-        @parent.wd,
-        @selector,
-        element_class.attribute_list
-      ).locate_all
+      element_validator = element_validator_class.new
+      selector_builder = selector_builder_class.new(@parent, @selector, element_class.attribute_list)
+      locator = locator_class.new(@parent, @selector, selector_builder, element_validator)
+
+      @elements ||= locator.locate_all
     end
 
-    # overridable by subclasses
     def locator_class
-      ElementLocator
+      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::Locator")
+    rescue NameError
+      Kernel.const_get("#{Watir.locator_namespace}::Element::Locator")
+    end
+
+    def element_validator_class
+      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::Validator")
+    rescue NameError
+      Kernel.const_get("#{Watir.locator_namespace}::Element::Validator")
+    end
+
+    def selector_builder_class
+      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::SelectorBuilder")
+    rescue NameError
+      Kernel.const_get("#{Watir.locator_namespace}::Element::SelectorBuilder")
+    end
+
+    def element_class_name
+      element_class.to_s.split('::').last
+    end
+
+    def element_class
+      Kernel.const_get(self.class.name.sub(/Collection$/, ''))
     end
 
   end # ElementCollection

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

@@ -33,23 +33,5 @@ module Watir
         raise Exception::Error, "unknown tag name for button: #{tn}"
       end
     end
-
-    private
-
-    def locator_class
-      ButtonLocator
-    end
   end # Button
-
-  class ButtonCollection < ElementCollection
-    private
-
-    def locator_class
-      ButtonLocator
-    end
-
-    def element_class
-      Button
-    end
-  end # ButtonsCollection
 end # Watir

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

@@ -0,0 +1,17 @@
+module Watir
+
+  #
+  # Custom class representing table cell (th or td).
+  #
+
+  class Cell < TableCell
+  end # Cell
+
+  class CellCollection < TableCellCollection
+    def elements
+      # we do this craziness since the xpath used will find direct child rows
+      # before any rows inside thead/tbody/tfoot...
+      super.sort_by { |e| e.attribute(:cellIndex).to_i }
+    end
+  end
+end # Watir

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

@@ -50,8 +50,5 @@ module Watir
   end # Container
 
   class CheckBoxCollection < InputCollection
-    def element_class
-      CheckBox
-    end
   end # CheckBoxCollection
 end # Watir

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

@@ -434,7 +434,7 @@ module Watir
     #
     # @example
     #   browser.button(value: "Delete").style           #=> "border: 4px solid red;"
-    #   browser.button(value: "Delete").style("border") #=> "4px solid red"
+    #   browser.button(value: "Delete").style("border") #=> "4px solid rgb(255, 0, 0)"
     #
     # @param [String] property
     # @return [String]
@@ -493,7 +493,7 @@ module Watir
       @parent.browser
     end
 
-  protected
+    protected
 
     # Ensure that the element exists, making sure that it is not stale and located if necessary
     def assert_exists
@@ -543,13 +543,36 @@ module Watir
 
     def locate
       ensure_context
-      locator_class.new(@parent.wd, @selector, self.class.attribute_list).locate
+
+      element_validator = element_validator_class.new
+      selector_builder = selector_builder_class.new(@parent, @selector, self.class.attribute_list)
+      locator = locator_class.new(@parent, @selector, selector_builder, element_validator)
+
+      locator.locate
     end
 
-  private
+    private
 
     def locator_class
-      ElementLocator
+      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::Locator")
+    rescue NameError
+      Kernel.const_get("#{Watir.locator_namespace}::Element::Locator")
+    end
+
+    def element_validator_class
+      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::Validator")
+    rescue NameError
+      Kernel.const_get("#{Watir.locator_namespace}::Element::Validator")
+    end
+
+    def selector_builder_class
+      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::SelectorBuilder")
+    rescue NameError
+      Kernel.const_get("#{Watir.locator_namespace}::Element::SelectorBuilder")
+    end
+
+    def element_class_name
+      self.class.name.split('::').last
     end
 
     def selector_string
@@ -597,22 +620,26 @@ module Watir
     def element_call
       yield
     rescue Selenium::WebDriver::Error::StaleElementReferenceError
-      raise unless Watir.always_locate?
-      assert_exists
+      if Watir.always_locate? && !@selector[:element]
+        @element = locate
+      else
+        reset!
+      end
+      assert_element_found
       retry
     end
 
     def method_missing(meth, *args, &blk)
       method = meth.to_s
-      if method =~ ElementLocator::WILDCARD_ATTRIBUTE
-        attribute_value(method.gsub(/_/, '-'), *args)
+      if method =~ Locators::Element::SelectorBuilder::WILDCARD_ATTRIBUTE
+        attribute_value(method.tr('_', '-'), *args)
       else
         super
       end
     end
 
     def respond_to_missing?(meth, *)
-      ElementLocator::WILDCARD_ATTRIBUTE === meth.to_s || super
+      Locators::Element::SelectorBuilder::WILDCARD_ATTRIBUTE === meth.to_s || super
     end
 
   end # Element

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

@@ -37,8 +37,5 @@ module Watir
   end # Container
 
   class FileFieldCollection < InputCollection
-    def element_class
-      FileField
-    end
   end # FileFieldCollection
 end # Watir

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

@@ -16,8 +16,5 @@ module Watir
   end # Container
 
   class HiddenCollection < InputCollection
-    def element_class
-      Hidden
-    end
   end # HiddenCollection
 end

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

@@ -94,9 +94,6 @@ module Watir
     attribute("Boolean", :content_editable?, :isContentEditable)
   end
   class HTMLElementCollection < ElementCollection
-    def element_class
-      HTMLElement
-    end
   end
 
   class Font < HTMLElement
@@ -105,18 +102,12 @@ module Watir
     attribute(String, :size, :size)
   end
   class FontCollection < ElementCollection
-    def element_class
-      Font
-    end
   end
 
   class Directory < HTMLElement
     attribute("Boolean", :compact?, :compact)
   end
   class DirectoryCollection < ElementCollection
-    def element_class
-      Directory
-    end
   end
 
   class FrameSet < HTMLElement
@@ -136,9 +127,6 @@ module Watir
     attribute(String, :onunload, :onunload)
   end
   class FrameSetCollection < ElementCollection
-    def element_class
-      FrameSet
-    end
   end
 
   class Marquee < HTMLElement
@@ -158,9 +146,6 @@ module Watir
     attribute(String, :onstart, :onstart)
   end
   class MarqueeCollection < ElementCollection
-    def element_class
-      Marquee
-    end
   end
 
   class Applet < HTMLElement
@@ -177,9 +162,6 @@ module Watir
     attribute(String, :width, :width)
   end
   class AppletCollection < ElementCollection
-    def element_class
-      Applet
-    end
   end
 
   class Canvas < HTMLElement
@@ -187,18 +169,12 @@ module Watir
     attribute(Fixnum, :height, :height)
   end
   class CanvasCollection < ElementCollection
-    def element_class
-      Canvas
-    end
   end
 
   class Template < HTMLElement
     attribute(String, :content, :content)
   end
   class TemplateCollection < ElementCollection
-    def element_class
-      Template
-    end
   end
 
   class Script < HTMLElement
@@ -212,9 +188,6 @@ module Watir
     attribute(String, :for, :htmlFor)
   end
   class ScriptCollection < ElementCollection
-    def element_class
-      Script
-    end
   end
 
   class Dialog < HTMLElement
@@ -222,9 +195,6 @@ module Watir
     attribute(String, :return_value, :returnValue)
   end
   class DialogCollection < ElementCollection
-    def element_class
-      Dialog
-    end
   end
 
   class MenuItem < HTMLElement
@@ -238,9 +208,6 @@ module Watir
     attribute(String, :command, :command)
   end
   class MenuItemCollection < ElementCollection
-    def element_class
-      MenuItem
-    end
   end
 
   class Menu < HTMLElement
@@ -249,18 +216,12 @@ module Watir
     attribute("Boolean", :compact?, :compact)
   end
   class MenuCollection < ElementCollection
-    def element_class
-      Menu
-    end
   end
 
   class Details < HTMLElement
     attribute("Boolean", :open?, :open)
   end
   class DetailsCollection < ElementCollection
-    def element_class
-      Details
-    end
   end
 
   class Legend < HTMLElement
@@ -268,9 +229,6 @@ module Watir
     attribute(String, :align, :align)
   end
   class LegendCollection < ElementCollection
-    def element_class
-      Legend
-    end
   end
 
   class FieldSet < HTMLElement
@@ -283,9 +241,6 @@ module Watir
     attribute(String, :validation_message, :validationMessage)
   end
   class FieldSetCollection < ElementCollection
-    def element_class
-      FieldSet
-    end
   end
 
   class Meter < HTMLElement
@@ -298,9 +253,6 @@ module Watir
     attribute(String, :labels, :labels)
   end
   class MeterCollection < ElementCollection
-    def element_class
-      Meter
-    end
   end
 
   class Progress < HTMLElement
@@ -310,9 +262,6 @@ module Watir
     attribute(String, :labels, :labels)
   end
   class ProgressCollection < ElementCollection
-    def element_class
-      Progress
-    end
   end
 
   class Output < HTMLElement
@@ -328,9 +277,6 @@ module Watir
     attribute(String, :labels, :labels)
   end
   class OutputCollection < ElementCollection
-    def element_class
-      Output
-    end
   end
 
   class Keygen < HTMLElement
@@ -347,9 +293,6 @@ module Watir
     attribute(String, :labels, :labels)
   end
   class KeygenCollection < ElementCollection
-    def element_class
-      Keygen
-    end
   end
 
   class TextArea < HTMLElement
@@ -380,9 +323,6 @@ module Watir
     attribute(String, :selection_direction, :selectionDirection)
   end
   class TextAreaCollection < ElementCollection
-    def element_class
-      TextArea
-    end
   end
 
   class Option < HTMLElement
@@ -395,9 +335,6 @@ module Watir
     attribute(Fixnum, :index, :index)
   end
   class OptionCollection < ElementCollection
-    def element_class
-      Option
-    end
   end
 
   class OptGroup < HTMLElement
@@ -405,18 +342,12 @@ module Watir
     attribute(String, :label, :label)
   end
   class OptGroupCollection < ElementCollection
-    def element_class
-      OptGroup
-    end
   end
 
   class DataList < HTMLElement
     attribute(String, :options, :options)
   end
   class DataListCollection < ElementCollection
-    def element_class
-      DataList
-    end
   end
 
   class Select < HTMLElement
@@ -440,9 +371,6 @@ module Watir
     attribute(String, :labels, :labels)
   end
   class SelectCollection < ElementCollection
-    def element_class
-      Select
-    end
   end
 
   class Button < HTMLElement
@@ -464,9 +392,6 @@ module Watir
     attribute(String, :labels, :labels)
   end
   class ButtonCollection < ElementCollection
-    def element_class
-      Button
-    end
   end
 
   class Input < HTMLElement
@@ -521,9 +446,6 @@ module Watir
     attribute(String, :use_map, :useMap)
   end
   class InputCollection < ElementCollection
-    def element_class
-      Input
-    end
   end
 
   class Label < HTMLElement
@@ -532,9 +454,6 @@ module Watir
     attribute(String, :control, :control)
   end
   class LabelCollection < ElementCollection
-    def element_class
-      Label
-    end
   end
 
   class Form < HTMLElement
@@ -550,9 +469,6 @@ module Watir
     attribute(Fixnum, :length, :length)
   end
   class FormCollection < ElementCollection
-    def element_class
-      Form
-    end
   end
 
   class TableCell < HTMLElement
@@ -571,9 +487,6 @@ module Watir
     attribute(String, :bg_color, :bgColor)
   end
   class TableCellCollection < ElementCollection
-    def element_class
-      TableCell
-    end
   end
 
   class TableHeaderCell < TableCell
@@ -582,18 +495,12 @@ module Watir
     attribute(String, :sorted, :sorted)
   end
   class TableHeaderCellCollection < ElementCollection
-    def element_class
-      TableHeaderCell
-    end
   end
 
   class TableDataCell < TableCell
     attribute(String, :abbr, :abbr)
   end
   class TableDataCellCollection < ElementCollection
-    def element_class
-      TableDataCell
-    end
   end
 
   class TableRow < HTMLElement
@@ -606,9 +513,6 @@ module Watir
     attribute(String, :bg_color, :bgColor)
   end
   class TableRowCollection < ElementCollection
-    def element_class
-      TableRow
-    end
   end
 
   class TableSection < HTMLElement
@@ -618,9 +522,6 @@ module Watir
     attribute(String, :v_align, :vAlign)
   end
   class TableSectionCollection < ElementCollection
-    def element_class
-      TableSection
-    end
   end
 
   class TableCol < HTMLElement
@@ -631,18 +532,12 @@ module Watir
     attribute(String, :width, :width)
   end
   class TableColCollection < ElementCollection
-    def element_class
-      TableCol
-    end
   end
 
   class TableCaption < HTMLElement
     attribute(String, :align, :align)
   end
   class TableCaptionCollection < ElementCollection
-    def element_class
-      TableCaption
-    end
   end
 
   class Table < HTMLElement
@@ -662,9 +557,6 @@ module Watir
     attribute(String, :cell_spacing, :cellSpacing)
   end
   class TableCollection < ElementCollection
-    def element_class
-      Table
-    end
   end
 
   class Area < HTMLElement
@@ -681,9 +573,6 @@ module Watir
     attribute("Boolean", :no_href?, :noHref)
   end
   class AreaCollection < ElementCollection
-    def element_class
-      Area
-    end
   end
 
   class Map < HTMLElement
@@ -692,9 +581,6 @@ module Watir
     attribute(String, :images, :images)
   end
   class MapCollection < ElementCollection
-    def element_class
-      Map
-    end
   end
 
   class Media < HTMLElement
@@ -729,17 +615,11 @@ module Watir
     attribute(String, :text_tracks, :textTracks)
   end
   class MediaCollection < ElementCollection
-    def element_class
-      Media
-    end
   end
 
   class Audio < Media
   end
   class AudioCollection < ElementCollection
-    def element_class
-      Audio
-    end
   end
 
   class Video < Media
@@ -750,9 +630,6 @@ module Watir
     attribute(String, :poster, :poster)
   end
   class VideoCollection < ElementCollection
-    def element_class
-      Video
-    end
   end
 
   class Track < HTMLElement
@@ -765,9 +642,6 @@ module Watir
     attribute(String, :track, :track)
   end
   class TrackCollection < ElementCollection
-    def element_class
-      Track
-    end
   end
 
   class Param < HTMLElement
@@ -777,9 +651,6 @@ module Watir
     attribute(String, :value_type, :valueType)
   end
   class ParamCollection < ElementCollection
-    def element_class
-      Param
-    end
   end
 
   class Object < HTMLElement
@@ -808,9 +679,6 @@ module Watir
     attribute(String, :border, :border)
   end
   class ObjectCollection < ElementCollection
-    def element_class
-      Object
-    end
   end
 
   class Embed < HTMLElement
@@ -822,9 +690,6 @@ module Watir
     attribute(String, :name, :name)
   end
   class EmbedCollection < ElementCollection
-    def element_class
-      Embed
-    end
   end
 
   class IFrame < HTMLElement
@@ -846,9 +711,6 @@ module Watir
     attribute(String, :margin_width, :marginWidth)
   end
   class IFrameCollection < ElementCollection
-    def element_class
-      IFrame
-    end
   end
 
   class Image < HTMLElement
@@ -874,9 +736,6 @@ module Watir
     attribute(String, :border, :border)
   end
   class ImageCollection < ElementCollection
-    def element_class
-      Image
-    end
   end
 
   class Source < HTMLElement
@@ -887,17 +746,11 @@ module Watir
     attribute(String, :type, :type)
   end
   class SourceCollection < ElementCollection
-    def element_class
-      Source
-    end
   end
 
   class Picture < HTMLElement
   end
   class PictureCollection < ElementCollection
-    def element_class
-      Picture
-    end
   end
 
   class Mod < HTMLElement
@@ -905,44 +758,29 @@ module Watir
     attribute(String, :date_time, :dateTime)
   end
   class ModCollection < ElementCollection
-    def element_class
-      Mod
-    end
   end
 
   class BR < HTMLElement
     attribute(String, :clear, :clear)
   end
   class BRCollection < ElementCollection
-    def element_class
-      BR
-    end
   end
 
   class Span < HTMLElement
   end
   class SpanCollection < ElementCollection
-    def element_class
-      Span
-    end
   end
 
   class Time < HTMLElement
     attribute(String, :date_time, :dateTime)
   end
   class TimeCollection < ElementCollection
-    def element_class
-      Time
-    end
   end
 
   class Data < HTMLElement
     attribute(String, :value, :value)
   end
   class DataCollection < ElementCollection
-    def element_class
-      Data
-    end
   end
 
   class Anchor < HTMLElement
@@ -960,27 +798,18 @@ module Watir
     attribute(String, :shape, :shape)
   end
   class AnchorCollection < ElementCollection
-    def element_class
-      Anchor
-    end
   end
 
   class Div < HTMLElement
     attribute(String, :align, :align)
   end
   class DivCollection < ElementCollection
-    def element_class
-      Div
-    end
   end
 
   class DList < HTMLElement
     attribute("Boolean", :compact?, :compact)
   end
   class DListCollection < ElementCollection
-    def element_class
-      DList
-    end
   end
 
   class LI < HTMLElement
@@ -988,9 +817,6 @@ module Watir
     attribute(String, :type, :type)
   end
   class LICollection < ElementCollection
-    def element_class
-      LI
-    end
   end
 
   class UList < HTMLElement
@@ -998,9 +824,6 @@ module Watir
     attribute(String, :type, :type)
   end
   class UListCollection < ElementCollection
-    def element_class
-      UList
-    end
   end
 
   class OList < HTMLElement
@@ -1010,27 +833,18 @@ module Watir
     attribute("Boolean", :compact?, :compact)
   end
   class OListCollection < ElementCollection
-    def element_class
-      OList
-    end
   end
 
   class Quote < HTMLElement
     attribute(String, :cite, :cite)
   end
   class QuoteCollection < ElementCollection
-    def element_class
-      Quote
-    end
   end
 
   class Pre < HTMLElement
     attribute(Fixnum, :width, :width)
   end
   class PreCollection < ElementCollection
-    def element_class
-      Pre
-    end
   end
 
   class HR < HTMLElement
@@ -1041,27 +855,18 @@ module Watir
     attribute(String, :width, :width)
   end
   class HRCollection < ElementCollection
-    def element_class
-      HR
-    end
   end
 
   class Paragraph < HTMLElement
     attribute(String, :align, :align)
   end
   class ParagraphCollection < ElementCollection
-    def element_class
-      Paragraph
-    end
   end
 
   class Heading < HTMLElement
     attribute(String, :align, :align)
   end
   class HeadingCollection < ElementCollection
-    def element_class
-      Heading
-    end
   end
 
   class Body < HTMLElement
@@ -1085,9 +890,6 @@ module Watir
     attribute(String, :onunload, :onunload)
   end
   class BodyCollection < ElementCollection
-    def element_class
-      Body
-    end
   end
 
   class Style < HTMLElement
@@ -1096,9 +898,6 @@ module Watir
     attribute("Boolean", :scoped?, :scoped)
   end
   class StyleCollection < ElementCollection
-    def element_class
-      Style
-    end
   end
 
   class Meta < HTMLElement
@@ -1108,9 +907,6 @@ module Watir
     attribute(String, :scheme, :scheme)
   end
   class MetaCollection < ElementCollection
-    def element_class
-      Meta
-    end
   end
 
   class Base < HTMLElement
@@ -1118,42 +914,27 @@ module Watir
     attribute(String, :target, :target)
   end
   class BaseCollection < ElementCollection
-    def element_class
-      Base
-    end
   end
 
   class Title < HTMLElement
   end
   class TitleCollection < ElementCollection
-    def element_class
-      Title
-    end
   end
 
   class Head < HTMLElement
   end
   class HeadCollection < ElementCollection
-    def element_class
-      Head
-    end
   end
 
   class Html < HTMLElement
     attribute(String, :version, :version)
   end
   class HtmlCollection < ElementCollection
-    def element_class
-      Html
-    end
   end
 
   class Unknown < HTMLElement
   end
   class UnknownCollection < ElementCollection
-    def element_class
-      Unknown
-    end
   end