watir 6.16.5 → 6.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa8314c42d13abbcf8c23676254674e9f7db6072
-  data.tar.gz: aab0634d0461fb0f67749b48625ef6b86f337929
+SHA256:
+  metadata.gz: c714ef62b6caccbf6f2885fd9ea9ece26d42c9b64f64642dadd445e35029da0c
+  data.tar.gz: 2621db569beaa32c36577da613a0c27e16a64ca45e286a37e1cd000c3bf46db1
 SHA512:
-  metadata.gz: 42511b036683635c9f960753ed429a332f91a6917af42c71b2d619f8004d1e4147f76e41f89e0eebd39a2043129662ccd7ce673521edac87ad759e52d9ba27c3
-  data.tar.gz: 3d581c12b5be6ae282824b7ec9ce9785d2a7991b95f520f108017ba2c93bb3bda6881fb535ee38799b31521319e36585e194bd230af5ae1d70f2e09f24cf3dec
+  metadata.gz: 510bf92bb5212caec7334540076448f43bf13e4fcef510a36c78188718a1e744094b7cfe6dad3b713f51a2cf36f9ad22d5dfbf5983406fdb0bddcf75fb9a3fff
+  data.tar.gz: 634cff1ed0f60d0d88f6596b377933b0ec6eda95dae9fd554352e4bb6c55ef2f8f7b791fd0b2abc8bcc39d3bc4e4a4f52429c7db6efae533fb1d8f0e45159159

data/.github/actions/enable-safari/action.yml

@@ -0,0 +1,11 @@
+name: 'Enable Safari Driver'
+description: 'Set safaridriver to run in automation mode'
+runs:
+  using: composite
+  steps:
+    - run: |
+        defaults write com.apple.Safari IncludeDevelopMenu YES
+        defaults write com.apple.Safari AllowRemoteAutomation 1
+        sudo safaridriver --enable
+        safaridriver -p 0 &
+      shell: bash

data/.github/actions/install-chrome/action.yml

@@ -0,0 +1,11 @@
+name: 'Install Chrome'
+runs:
+  using: "composite"
+  steps:
+    - run: |
+        wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+        echo "deb http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee -a /etc/apt/sources.list.d/google-chrome.list
+        sudo apt-get update -qqy
+        sudo apt-get -qqy install google-chrome-stable
+        sudo rm /etc/apt/sources.list.d/google-chrome.list
+      shell: bash

data/.github/workflows/linux.yml

@@ -0,0 +1,61 @@
+name: Linux Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  chrome-test:
+    name: Chrome Test
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'chrome' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - uses: ./.github/actions/install-chrome
+      - run: Xvfb :99 &
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+        env:
+          DISPLAY: :99
+
+  firefox-test:
+    name: Firefox Test
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'firefox' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: Xvfb :99 &
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+        env:
+          DISPLAY: :99
+
+  documentation-test:
+    name: Yard Doc Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - uses: ./.github/actions/install-chrome
+      - run: Xvfb :99 &
+      - run: |
+          bundle exec rake yard:doctest
+        env:
+          DISPLAY: :99

data/.github/workflows/mac.yml

@@ -0,0 +1,55 @@
+name: Mac Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  chrome-test:
+    name: Chrome Test
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'chrome' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+
+  firefox-test:
+    name: Firefox Test
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'firefox' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+
+  safari-test:
+    name: Safari Test
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'safari' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - uses: ./.github/actions/enable-safari
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}

data/.github/workflows/unit.yml

@@ -0,0 +1,37 @@
+name: Unit Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  unit-test:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.5', '2.6', '2.7', '3.0']
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - uses: ./.github/actions/install-chrome
+      - run: Xvfb :99 &
+      - run: |
+          bundle exec rake spec:unit
+        env:
+          DISPLAY: :99
+
+  linter-test:
+    name: Rubocop Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: bundle exec rubocop

data/.github/workflows/windows.yml

@@ -0,0 +1,39 @@
+name: Windows Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  chrome-test:
+    name: Chrome Test
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'chrome' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+  firefox-test:
+    name: Firefox Test
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'firefox' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+
+

data/.rubocop.yml

@@ -1,46 +1,36 @@
-# Offense count: 144
-# Cop supports --auto-correct.
-# Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
-Layout/EmptyLineBetweenDefs:
-  Exclude:
-    - 'lib/watir/elements/html_elements.rb'
-    - 'lib/watir/elements/svg_elements.rb'
+inherit_from: .rubocop_todo.yml
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Layout/EmptyLines:
+AllCops:
+  TargetRubyVersion: 2.5.8
+  NewCops: enable
   Exclude:
     - 'lib/watir/elements/html_elements.rb'
     - 'lib/watir/elements/svg_elements.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
-Layout/EmptyLinesAroundModuleBody:
-  Exclude:
-    - 'lib/watir/elements/html_elements.rb'
-    - 'lib/watir/elements/svg_elements.rb'
+Layout/LineLength:
+  Max: 120
 
-# Offense count: 85
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-# Offense count: 1
-Lint/HandleExceptions:
-  Exclude:
-    - 'lib/watirspec.rb'
-
 Lint/UnifiedInteger:
   Exclude:
   - 'lib/watir/locators/element/selector_builder.rb'
 
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
+# Default: 17
+Metrics/AbcSize:
+  Max: 20
+  Exclude:
+    - 'lib/watir/capabilities.rb'
+    - 'lib/watir/locators/element/selector_builder.rb'
+    - 'lib/watir/locators/element/selector_builder/regexp_disassembler.rb'
+    - 'lib/watir/locators/element/selector_builder/xpath.rb'
+    - 'lib/watir/locators/element/locator.rb'
+    - 'lib/watir/generator/base/generator.rb'
+    - 'lib/watir/generator/base/visitor.rb'
+    - 'spec/locator_spec_helper.rb'
+    - 'spec/watirspec_helper.rb'
+
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
@@ -48,21 +38,6 @@ Metrics/BlockLength:
     - 'watir.gemspec'
     - 'Rakefile'
 
-## Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Exclude:
-    - 'lib/watir/elements/html_elements.rb'
-    - 'lib/watir/elements/svg_elements.rb'
-
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 18
-  Exclude:
-  - 'lib/watir/locators/element/selector_builder.rb'
-  - 'lib/watir/locators/element/selector_builder/xpath.rb'
-  - 'lib/watir/locators/element/selector_builder/regexp_disassembler.rb'
-
-# Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 93
   Exclude:
@@ -77,42 +52,24 @@ Metrics/ClassLength:
     - 'lib/watir/generator/base/spec_extractor.rb'
     - 'lib/watir/element_collection.rb'
 
-Metrics/PerceivedComplexity:
-  Max: 10
-
+# Default: 7
 Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 9
   Exclude:
-  - 'lib/watir/locators/element/selector_builder.rb'
+    - 'lib/watir/locators/element/selector_builder.rb'
 
-Metrics/AbcSize:
-  Max: 20
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 18
   Exclude:
     - 'lib/watir/locators/element/selector_builder.rb'
-    - 'lib/watir/locators/element/selector_builder/regexp_disassembler.rb'
     - 'lib/watir/locators/element/selector_builder/xpath.rb'
-    - 'lib/watir/locators/element/locator.rb'
-    - 'lib/watir/generator/base/generator.rb'
-    - 'lib/watir/generator/base/visitor.rb'
-    - 'spec/locator_spec_helper.rb'
-
-# TODO: fix with Watir 7
-# Configuration parameters: CountKeywordArgs.
-Metrics/ParameterLists:
-  Exclude:
-    - 'lib/watir/wait.rb'
+    - 'lib/watir/locators/element/selector_builder/regexp_disassembler.rb'
 
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 120
+# Default: 8
+Metrics/PerceivedComplexity:
+  Max: 10
 
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
 Style/BlockDelimiters:
   EnforcedStyle: braces_for_chaining
 
@@ -122,44 +79,12 @@ Style/CommentedKeyword:
 Style/DoubleNegation:
   Enabled: false
 
-## Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   AllowedVariables:
     - $browser
 
-Style/RegexpLiteral:
-  Exclude:
-    - 'spec/watirspec/selector_builder/element_spec.rb'
-
-### Cop supports --auto-correct.
-### Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-## SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'lib/watir/elements/html_elements.rb'
-    - 'lib/watir/elements/svg_elements.rb'
-
-Style/MethodCallWithoutArgsParentheses:
+Style/HashEachMethods:
   Enabled: false
 
-# TODO: I can't tell if this applies
-## Configuration parameters: EnforcedStyle.
-## SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
-  Exclude:
-    - 'lib/watir/browser.rb'
-    - 'lib/watir/locators/text_field/selector_builder/xpath.rb'
-    - 'lib/watir/window.rb'
-
-Style/Documentation:
+Style/OptionalBooleanParameter:
   Enabled: false
-
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: when_needed, always, never
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Naming/FileName:
-  Exclude:
-    - 'lib/watir-webdriver.rb'

data/.rubocop_todo.yml

@@ -0,0 +1,36 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-08-27 01:55:04 UTC using RuboCop version 0.89.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 116
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 11
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
+  Exclude:
+    - 'lib/watir/browser.rb'
+    - 'lib/watir/window.rb'
+
+# Offense count: 229
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Remove for Watir 7
+Naming/FileName:
+  Exclude:
+    - 'lib/watir-webdriver.rb'
+
+# Fix in Watir 7
+Metrics/ParameterLists:
+  Exclude:
+    - 'lib/watir/wait.rb'

data/CHANGES.md

@@ -1,3 +1,55 @@
+### 6.19.1 (2021-03-17)
+
+* Fix bug preventing using Selenium 4
+* Fix bug preventing non-xml characters in attributes (#787)
+
+### 6.19.0 (2021-03-12)
+
+* Create custom Watir HTTP Client
+* Require minimum of Selenium 3.142.7
+* Add support for starting browser with :http_client and :service hashes
+* Allow inferring desired browser from Capabilities or Options if browser not specified
+* Deprecate WindowCollection#to_a method
+* Deprecate starting browser with both Capabilities and Options
+* Deprecate starting browser with both URL and Service
+* Deprecate using :desired_capabilities
+* Deprecate starting browser service keywords in top level Hash
+* Deprecate using :remote to start a browser; browser name must be specified
+* Deprecate sending unknown keywords into the top level
+* Fix bug preventing Safari Options from being recognized
+* Fix bug preventing options provided without :remote keyword from being properly recognized (#812, #870)
+* Fix bug preventing :headless from being recognized when :options specified (#692)
+
+### 6.18.0 (2021-02-26)
+
+* Implement `WindowCollection` to manage multiple `Window` objects
+* Add support for locating `Window` by `:element`
+* Deprecate locating `Window` by `:index`
+* Deprecate `Select#select_all` in favor of `#select` and an `Array`
+* Implement `Browser#switch_window` (#849)
+* Add support for `Numeric` attribute values to `Waitable`
+* Allow users to specify Selenium 4 in their projects
+* Update stale element handling behavior to match webdriver spec (#905 #909)
+* Implement `Waitable` for `ElementCollection` (#853 #857)
+* Improve performance for nested elements (#843)
+* Less strict version check for `regexp_parser` gem (thanks Pavel Lobashov)
+
+### 6.17.0 (2020-08-27)
+* Require Ruby > 2.5
+* Implement Logger#selenium= to set selenium level from Watir
+* Implement FileField#upload
+* Fix bug with staleness handling in #exist and #present? (#853 & #852)
+* Fix bug when locating elements by text with RegExp (#866 #871)
+* Implement modifiers for `Element#right_click` (thanks Lakshya Kapoor #861)
+* Updated locator code to adhere to spec on what attributes are case sensitive (#507 #856)
+* Fix locating bug when iframe is nested under another element (thanks Matthew Mazaika #885 #886)
+* Deprecate Element#scroll_into_view in favor of the new Scroll methods (#884)
+* Fix threading bugs by allowing each Browser instance its own Timer (#881)
+* Allow adjacent locators to return Input subtype when applicable (#878)
+* Removed unnecessary reference to rubyforge (thanks olleolleolle #874)
+* Removed deprecated Selenium classes (thanks joesho112358 #867)
+* Add support for :service parameter for initializing Browser
+
 ### 6.16.5 (2018-12-25)
 
 * Fix bug with nested elements using scopes (#842)

data/Gemfile

@@ -1,8 +1,10 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'webidl', path: File.expand_path('../webidl') if ENV['LOCAL_WEBIDL']
 
 gem 'selenium-webdriver', path: File.expand_path('../selenium/build/rb') if ENV['LOCAL_SELENIUM']
 
+gem 'ffi' if Gem.win_platform? # For selenium-webdriver on Windows
+
 # Specify your gem's dependencies in watir.gemspec
 gemspec

data/LICENSE

@@ -1,8 +1,8 @@
 (the MIT License)
 
 Copyright (c) 2009-2015 Jari Bakken
-Copyright (c) 2015-2018 Alex Rodionov, Titus Fortner
-Copyright (c) 2018 Justin Ko
+Copyright (c) 2015-2021 Alex Rodionov, Titus Fortner
+Copyright (c) 2018-2021 Justin Ko
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,10 +3,12 @@
 Watir Powered By Selenium!
 
 [![Gem Version](https://badge.fury.io/rb/watir.svg)](http://badge.fury.io/rb/watir)
-[![Travis Status](https://travis-ci.org/watir/watir.svg?branch=master)](https://travis-ci.org/watir/watir)
-[![AppVeyor status](https://ci.appveyor.com/api/projects/status/9vbb7pp5p4uyoott/branch/master?svg=true)](https://ci.appveyor.com/project/p0deje/watir)
+[![Unit Tests](https://github.com/watir/watir/workflows/Unit%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Unit+Tests%22)
+[![Mac Tests](https://github.com/watir/watir/workflows/Mac%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Mac+Tests%22)
+[![Windows Tests](https://github.com/watir/watir/workflows/Windows%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Windows+Tests%22)
+[![Linux Tests](https://github.com/watir/watir/workflows/Linux%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Linux+Tests%22)
 [![Code Climate](https://codeclimate.com/github/watir/watir.svg)](https://codeclimate.com/github/watir/watir)
-[![Coverage Status](https://coveralls.io/repos/github/watir/watir/badge.svg?branch=master)](https://coveralls.io/github/watir/watir?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/watir/watir/badge.svg?branch=main)](https://coveralls.io/github/watir/watir?branch=main)
 
 ## Using Watir
 
@@ -69,11 +71,11 @@ $ bundle exec rake svg:update
 
 ## Specs
 
-#### Travis CI
+#### Github Actions
 
-Watir specs are run on [Travis CI](https://travis-ci.org/watir/watir).
+Watir specs are run with [Github Actions](https://github.com/watir/watir/workflows).
 
-Watir code is tested with 2.3, 2.4 and 2.5 versions in multiple browsers and with multiple configurations.
+Watir code is tested on Linux with latest versions of supported browsers and all active Ruby versions.
 
 #### Doctests
 
@@ -95,7 +97,7 @@ to ensure all paths in their code have tests associated with them.
 
 Watir is using [Rubocop](https://github.com/rubocop-hq/rubocop) to ensure a consistent style across the
 code base. It is run with our minimum supported Ruby version (2.3) 
-We have some [established exceptions](https://github.com/watir/watir/blob/master/.rubocop.yml) 
+We have some [established exceptions](https://github.com/watir/watir/blob/main/.rubocop.yml) 
 that might need to be tweaked for new code submissions. This can be addressed in the PR as necessary.
 
 #### Statistics
@@ -107,7 +109,4 @@ on wire calls.
 
 ## Copyright
 
-Copyright (c) 2009-2015 Jari Bakken
-Copyright (c) 2015-2018 Alex Rodionov, Titus Fortner
-Copyright (c) 2018 Justin Ko
 See LICENSE for details

data/Rakefile

@@ -5,7 +5,7 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.rspec_opts = %w[--color --require fuubar --format Fuubar]
+  spec.rspec_opts = %w[--color --format doc]
   spec.pattern = 'spec/**/*_spec.rb'
   spec.exclude_pattern = 'spec/unit/**/*_spec.rb'
 end
@@ -61,7 +61,7 @@ end
 
       if extractor.errors.any?
         puts "\n\n<======================= ERRORS =======================>\n\n"
-        puts extractor.errors.join("\n" + '=' * 80 + "\n")
+        puts extractor.errors.join("\n#{'=' * 80}\n")
       end
     end
 
@@ -93,7 +93,7 @@ YARD::Rake::YardocTask.new do |task|
   task.options = %w[--debug] # this is pretty slow, so nice with some output
 end
 
-require 'yard-doctest'
+require 'yard/doctest/rake'
 YARD::Doctest::RakeTask.new do |task|
   task.doctest_opts = ['-v']
 end
@@ -115,7 +115,7 @@ namespace :changes do
 
   desc 'Print latest diff'
   task print: :differ do
-    VersionDiffer.new.print_latest(STDOUT)
+    VersionDiffer.new.print_latest($stdout)
   end
 end
 

data/lib/watir/adjacent.rb

@@ -113,16 +113,14 @@ module Watir
     def xpath_adjacent(opt = {})
       plural = opt.delete(:plural)
       opt[:index] ||= 0 unless plural || opt.values.any? { |e| e.is_a? Regexp }
-      klass = if !plural && opt[:tag_name]
-                Watir.element_class_for(opt[:tag_name])
-              elsif !plural
-                HTMLElement
-              elsif opt[:tag_name]
-                Object.const_get("#{Watir.element_class_for(opt[:tag_name])}Collection")
-              else
-                HTMLElementCollection
-              end
-      klass.new(self, opt)
+      if !plural
+        el = Watir.element_class_for(opt[:tag_name] || '').new(self, opt)
+        el.is_a?(Input) ? el.to_subtype : el
+      elsif opt[:tag_name]
+        Watir.const_get("#{Watir.element_class_for(opt[:tag_name])}Collection").new(self, opt)
+      else
+        HTMLElementCollection.new(self, opt)
+      end
     end
   end # Adjacent
 end # Watir

data/lib/watir/after_hooks.rb

@@ -69,8 +69,8 @@ module Watir
       return unless @after_hooks.any? && !@browser.alert.exists?
 
       each { |after_hook| after_hook.call(@browser) }
-    rescue Selenium::WebDriver::Error::NoSuchWindowError => ex
-      Watir.logger.info "Could not execute After Hooks because browser window was closed #{ex}"
+    rescue Selenium::WebDriver::Error::NoSuchWindowError => e
+      Watir.logger.info "Could not execute After Hooks because browser window was closed #{e}"
     end
 
     #
@@ -99,8 +99,8 @@ module Watir
     # @yieldparam [#call] after_hook Object responding to call
     #
 
-    def each
-      @after_hooks.each { |after_hook| yield after_hook }
+    def each(&blk)
+      @after_hooks.each { |after_hook| blk.call(after_hook) }
     end
 
     #