watir 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8a3f59dcd9f56e63cf532cc2ba8c9605e8ffad78bd59d3f104e6677c9f5e20c
-  data.tar.gz: 1f1cb55a4270ebdce957f4a8dc33e76403eef391ed59e3179f4f6772595d3f59
+  metadata.gz: 5e21571e92209dad62a8048886e0d383b0a2d8c720b2fa42cdb8d23c0f790a28
+  data.tar.gz: 2ebaf5e9faf6aa665986cb333b264e29a1b3400438f8eabecdc91ec42ce640b3
 SHA512:
-  metadata.gz: 488c6b2f0a93a20390350da8b95025f9e33d2be9bb7bd84b130808906bca067860b3db6908c59961ef3914ccbb682d2d15d2418656749f8916a1416fa8c6cbb5
-  data.tar.gz: 64bc4a7b36c294a75ceb86c3fea21809dbefc158cbca08ba72dc6bf7b3b64d76f04b5c02130a8cce15e78d5156659cb317ee397e27d93d06e537e804695e425b
+  metadata.gz: b631f01f18c1741b4949188ead10e9f42dd9e7f20853e6a11a4563c1cfeca71efd9cc4dc5d186ab9021f7b8134d73760519d34a765cd21498a4e454361d23ae9
+  data.tar.gz: 433d5075795f765aa516811c956573670f97efe667e2fbadb7a41be9acc96ad3a85df712b21ed23f73dcd8c7f0f70a15ad1db2c4a888f3a92ab2a1380c6f0e8b

data/.github/workflows/chrome.yml

@@ -1,6 +1,7 @@
 name: Chrome Tests
 
 on:
+  - workflow_dispatch
   - push
   - pull_request
 
@@ -12,23 +13,35 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        ruby: [ 2.6, 3.0 ]
+        ruby: [ 2.7, 3.1 ]
     steps:
-      - uses: actions/checkout@v2
-      - uses: ./.github/actions/setup-linux
-        if:  matrix.os == 'ubuntu-latest'
-      - uses: ./.github/actions/install-chrome
-        if:  matrix.os == 'ubuntu-latest'
-      - run: |
-          echo "COVERAGE=true" >> $GITHUB_ENV
-        if: |
-          matrix.os == 'ubuntu-latest' ||
-          matrix.os == 'macos-latest'
-      - uses: ruby/setup-ruby@v1
+      - name: Checkout source tree
+        uses: actions/checkout@v2
+      - name: Setup Fluxbox
+        if: matrix.os == 'ubuntu-latest'
+        run: sudo apt-get -y install fluxbox
+      - name: Start XVFB
+        if: matrix.os == 'ubuntu-latest'
+        run: Xvfb :99 -screen 0 1920x1280x24 > /dev/null 2>&1 &
+      - name: Start Fluxbox
+        if: matrix.os == 'ubuntu-latest'
+        run: fluxbox -display :99 &
+      - name: Set Windows resolution
+        if: matrix.os == 'windows-latest'
+        run: Set-DisplayResolution -Width 1920 -Height 1080 -Force
+      - name: Set Mac resolution
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          system_profiler SPDisplaysDataType | grep Resolution
+          "/Library/Application Support/VMware Tools/vmware-resolutionSet" 2560 1440
+          system_profiler SPDisplaysDataType | grep Resolution
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle install
-      - run: |
-          bundle exec rake spec:chrome
+      - name: Install gems
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake spec:chrome
         env:
-          DISPLAY: :99
+          DISPLAY: :99.0

data/.github/workflows/edge.yml

@@ -1,6 +1,7 @@
 name: Edge Tests
 
 on:
+  - workflow_dispatch
   - push
   - pull_request
 
@@ -12,17 +13,24 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest]
-        ruby: [ 2.6, 3.0 ]
+        ruby: [ 2.7, 3.1 ]
     steps:
-      - uses: actions/checkout@v2
-      - run: |
-          echo "COVERAGE=true" >> $GITHUB_ENV
-        if: matrix.os == 'macos-latest'
-      - uses: ruby/setup-ruby@v1
+      - name: Checkout source tree
+        uses: actions/checkout@v2
+      - name: Set Windows resolution
+        if: matrix.os == 'windows-latest'
+        run: Set-DisplayResolution -Width 1920 -Height 1080 -Force
+      - name: Set Mac resolution
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          system_profiler SPDisplaysDataType | grep Resolution
+          "/Library/Application Support/VMware Tools/vmware-resolutionSet" 2560 1440
+          system_profiler SPDisplaysDataType | grep Resolution
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle install
-      - run: |
-          bundle exec rake spec:edge
-        env:
-          DISPLAY: :99
+      - name: Install gems
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake spec:chrome

data/.github/workflows/firefox.yml

@@ -1,6 +1,7 @@
 name: Firefox Tests
 
 on:
+  - workflow_dispatch
   - push
   - pull_request
 
@@ -12,24 +13,35 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        ruby: [ 2.6, 3.0 ]
+        ruby: [ 2.7, 3.1 ]
     steps:
-      - uses: actions/checkout@v2
-      - uses: ./.github/actions/setup-linux
-        if:  matrix.os == 'ubuntu-latest'
-      - uses: browser-actions/setup-firefox@latest
-        with:
-          firefox-version: '93.0'
-      - run: |
-          echo "COVERAGE=true" >> $GITHUB_ENV
-        if: |
-          matrix.os == 'ubuntu-latest' ||
-          matrix.os == 'macos-latest'
-      - uses: ruby/setup-ruby@v1
+      - name: Checkout source tree
+        uses: actions/checkout@v2
+      - name: Setup Fluxbox
+        if: matrix.os == 'ubuntu-latest'
+        run: sudo apt-get -y install fluxbox
+      - name: Start XVFB
+        if: matrix.os == 'ubuntu-latest'
+        run: Xvfb :99 -screen 0 1920x1280x24 > /dev/null 2>&1 &
+      - name: Start Fluxbox
+        if: matrix.os == 'ubuntu-latest'
+        run: fluxbox -display :99 &
+      - name: Set Windows resolution
+        if: matrix.os == 'windows-latest'
+        run: Set-DisplayResolution -Width 1920 -Height 1080 -Force
+      - name: Set Mac resolution
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          system_profiler SPDisplaysDataType | grep Resolution
+          "/Library/Application Support/VMware Tools/vmware-resolutionSet" 2560 1440
+          system_profiler SPDisplaysDataType | grep Resolution
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle install
-      - run: |
-          bundle exec rake spec:firefox
+      - name: Install gems
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake spec:chrome
         env:
           DISPLAY: :99

data/.github/workflows/ie.yml

@@ -1,6 +1,7 @@
 name: IE Tests
 
 on:
+  - workflow_dispatch
   - push
   - pull_request
 
@@ -11,14 +12,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.6, 3.0 ]
+        ruby: [ 2.7, 3.1 ]
     steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
+      - name: Checkout source tree
+        uses: actions/checkout@v2
+      - name: Set Windows resolution
+        run: Set-DisplayResolution -Width 1920 -Height 1080 -Force
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle install
-      - run: |
-          bundle exec rake spec:ie
+      - name: Install gems
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake spec:ie
         env:
-          DISPLAY: :99
+          GITHUB_TOKEN: ${{ github.token }}

data/.github/workflows/safari.yml

@@ -1,6 +1,7 @@
 name: Safari Tests
 
 on:
+  - workflow_dispatch
   - push
   - pull_request
 
@@ -11,17 +12,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.6, 3.0 ]
+        ruby: [ 2.7, 3.1 ]
     steps:
-      - uses: actions/checkout@v2
-      - uses: ./.github/actions/enable-safari
-      - run: |
-          echo "COVERAGE=true" >> $GITHUB_ENV
-      - uses: ruby/setup-ruby@v1
+      - name: Checkout source tree
+        uses: actions/checkout@v2
+      - name: Set Mac resolution
+        run: |
+          system_profiler SPDisplaysDataType | grep Resolution
+          "/Library/Application Support/VMware Tools/vmware-resolutionSet" 2560 1440
+          system_profiler SPDisplaysDataType | grep Resolution
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle install
-      - run: |
-          bundle exec rake spec:safari
-        env:
-          DISPLAY: :99
+      - name: Install gems
+        run: bundle install
+      - name: Configure safaridriver
+        run: |
+          defaults write com.apple.Safari IncludeDevelopMenu YES
+          defaults write com.apple.Safari AllowRemoteAutomation 1
+          sudo safaridriver --enable
+          safaridriver --version
+          safaridriver -p 0 &
+      - name: Run tests
+        run: bundle exec rake spec:safari

data/.github/workflows/unit.yml

@@ -1,6 +1,7 @@
 name: Unit Tests
 
 on:
+  - workflow_dispatch
   - push
   - pull_request
 
@@ -9,16 +10,22 @@ jobs:
     name: Yard Doctest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
+      - name: Checkout source tree
+        uses: actions/checkout@v2
+      - name: Setup Fluxbox
+        run: sudo apt-get -y install fluxbox
+      - name: Start XVFB
+        run: Xvfb :99 -screen 0 1920x1280x24 > /dev/null 2>&1 &
+      - name: Start Fluxbox
+        run: fluxbox -display :99 &
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
-      - run: bundle install
-      - uses: ./.github/actions/install-chrome
-      - uses: ./.github/actions/setup-linux
-      - run: |
-          bundle exec rake yard:doctest
-
+          ruby-version: 2.7
+      - name: Install gems
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake yard:doctest
 
   unit-test:
     name: Unit Tests
@@ -26,27 +33,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.6', '2.7', '3.0']
+        ruby: ['2.7', '3.0', '3.1']
     steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
+      - name: Checkout source tree
+        uses: actions/checkout@v2
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle install
-      - uses: ./.github/actions/install-chrome
-      - uses: ./.github/actions/setup-linux
-      - run: |
-          bundle exec rake spec:unit
-        env:
-          DISPLAY: :99
+      - name: Install gems
+        run: bundle install
+      - run: bundle exec rake spec:unit
 
   linter-test:
     name: Rubocop Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
+      - name: Checkout source tree
+        uses: actions/checkout@v2
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
-      - run: bundle install
+          ruby-version: 2.7
+      - name: Install gems
+        run: bundle install
       - run: bundle exec rubocop

data/.rubocop.yml

@@ -1,15 +1,16 @@
 inherit_from: .rubocop_todo.yml
 
+require:
+  - rubocop-performance
+  - rubocop-rake
+
 AllCops:
-  TargetRubyVersion: 2.6.8
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - 'lib/watir/elements/html_elements.rb'
     - 'lib/watir/elements/svg_elements.rb'
 
-Layout/LineLength:
-  Max: 120
-
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
@@ -17,7 +18,6 @@ Lint/UnifiedInteger:
   Exclude:
   - 'lib/watir/locators/element/selector_builder.rb'
 
-# Default: 17
 Metrics/AbcSize:
   Max: 22
   Exclude:
@@ -33,6 +33,10 @@ Metrics/BlockLength:
     - 'watir.gemspec'
     - 'Rakefile'
 
+Metrics/ModuleLength:
+  Exclude:
+    - 'spec/**/*'
+
 Metrics/ClassLength:
   Max: 93
   Exclude:
@@ -47,7 +51,6 @@ Metrics/ClassLength:
     - 'lib/watir/generator/base/spec_extractor.rb'
     - 'lib/watir/element_collection.rb'
 
-# Default: 7
 Metrics/CyclomaticComplexity:
   Max: 9
   Exclude:
@@ -61,16 +64,19 @@ Metrics/MethodLength:
     - 'lib/watir/locators/element/selector_builder/xpath.rb'
     - 'lib/watir/locators/element/selector_builder/regexp_disassembler.rb'
 
-# Default: 8
 Metrics/PerceivedComplexity:
   Max: 10
 
+Performance/CollectionLiteralInLoop:
+  MinSize: 3
+
 Style/BlockDelimiters:
   EnforcedStyle: braces_for_chaining
 
 Style/CommentedKeyword:
   Enabled: false
 
+# truthy is not true
 Style/DoubleNegation:
   Enabled: false
 
@@ -78,6 +84,7 @@ Style/GlobalVars:
   AllowedVariables:
     - $browser
 
+# Need to add new keys into hash during iteration
 Style/HashEachMethods:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -6,31 +6,5 @@
 # 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,10 +1,25 @@
+### 7.2.0 (2022-12-22)
+
+* Implement Shadow DOM support (#953)
+* Implement existing `Scroll#by` with Selenium Actions Class instead of JavaScript
+* Implement `Scroll#from` to set origin points
+* Implement `Scroll#to(:viewport)` for elements using Selenium Actions Class
+* Fix bug for regex matching on single quotes (#957)
+* Fix bug for unexpected whitespace in classes (#956)
+* Fix bug for inferring Edge browser name from Capabilities parameter
+* Allow starting `Browser` with `Watir::Capabilities`
+* Allow starting `Browser` with just a `Hash` for generating a `Watir::Capabilities`
+* Have `Capabilities` use `:options` to generate Selenium `Options` instance
+* Deprecate allowing `:capabilities` argument in `Browser` constructor
+* Require Ruby 2.7 and Selenium 4.2
+
 ### 7.1.0 (2021-11-15)
 
 * Add automatic scroll to `Element#click` with method parameters to ensure element is in viewport
 * Provide `:scroll_to` parameter for element methods implemented with `Actions` class (thanks osadasami #948, #949)
 * Allow `:scroll_to` parameter to accept `nil` argument to avoid automatic scrolling
 * Implement `Element#in_viewport?`
-* Fix but where `Scroll#to` for `Browser` with `:center` argument did not scroll to center of page
+* Fix bug where `Scroll#to` for `Browser` with `:center` argument did not scroll to center of page
 * Change `Element#obscured?` to only scroll when element out of viewport and then scroll to bottom instead of top
 
 ### 7.0.0 (2021-10-18)

data/Gemfile

@@ -1,8 +1,13 @@
+# frozen_string_literal: true
+
 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']
+if ENV['LOCAL_SELENIUM']
+  ENV['RUBYOPT'] = '-I../selenium/bazel-bin/rb'
+  gem 'selenium-webdriver', path: File.expand_path('../selenium/rb')
+end
 
 gem 'ffi' if Gem.win_platform? # For selenium-webdriver on Windows
 

data/README.md

@@ -3,16 +3,19 @@
 Watir Powered By Selenium!
 
 [![Gem Version](https://badge.fury.io/rb/watir.svg)](http://badge.fury.io/rb/watir)
-[![All Tests](https://github.com/watir/watir/actions/workflows/tests.yml/badge.svg)](https://github.com/watir/watir/actions/workflows/tests.yml)
-[![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=main)](https://coveralls.io/github/watir/watir?branch=main)
+[![Chrome Tests](https://github.com/watir/watir/actions/workflows/chrome.yml/badge.svg)](https://github.com/watir/watir/actions/workflows/chrome.yml)
+[![Edge Tests](https://github.com/watir/watir/actions/workflows/edge.yml/badge.svg)](https://github.com/watir/watir/actions/workflows/edge.yml)
+[![Firefox Tests](https://github.com/watir/watir/actions/workflows/firefox.yml/badge.svg)](https://github.com/watir/watir/actions/workflows/firefox.yml)
+[![IE Tests](https://github.com/watir/watir/actions/workflows/ie.yml/badge.svg)](https://github.com/watir/watir/actions/workflows/ie.yml)
+[![Safari Tests](https://github.com/watir/watir/actions/workflows/safari.yml/badge.svg)](https://github.com/watir/watir/actions/workflows/safari.yml)
+[![Unit Tests](https://github.com/watir/watir/actions/workflows/unit.yml/badge.svg)](https://github.com/watir/watir/actions/workflows/unit.yml)
 
 ## Using Watir
 
 This README is for people interested in writing code for Watir or gems in the Watir ecosystem
 that leverage private-api Watir code.
 
-For our users, everything you'll need is on the [Watir website](http://watir.com): 
+For our users, everything you'll need is on the [Watir website](http://watir.com):
 examples, news, guides, additional resources, support information and more.
 
 ## Procedure for Patches/Pull Requests
@@ -30,7 +33,7 @@ examples, news, guides, additional resources, support information and more.
 
 ## Developing Extensions
 
-When developing a gem intended to be used with Watir, you can run your code with WatirSpec 
+When developing a gem intended to be used with Watir, you can run your code with WatirSpec
 to make sure that requiring your code does not break something else in Watir.
 
 First, add WatirSpec Rake tasks to your gem:
@@ -52,7 +55,7 @@ This command will walk you through how to customize your code.
 ## Automatic Element Generation
 
 The majority of element methods Watir provides is autogenerated from specifications.
-This is done by extracting the IDL parts from the spec and processing them with the 
+This is done by extracting the IDL parts from the spec and processing them with the
 [WebIDL gem](https://github.com/jarib/webidl).
 
 Generated elements are currently based on the following specifications:
@@ -61,6 +64,7 @@ Generated elements are currently based on the following specifications:
 * [SVG](https://www.w3.org/TR/2018/CR-SVG2-20180807/) (`lib/watir/elements/svg_elements.rb`)
 
 To run:
+
 ```bash
 $ bundle exec rake html:update
 $ bundle exec rake svg:update
@@ -70,7 +74,7 @@ $ bundle exec rake svg:update
 
 #### Github Actions
 
-Watir specs are run with [Github Actions](https://github.com/watir/watir/workflows).
+Watir specs are run with [Github Actions](https://github.com/watir/watir/tree/main/.github/workflows).
 
 Watir code is tested on Linux with latest versions of supported browsers and all active Ruby versions.
 
@@ -92,14 +96,14 @@ to ensure all paths in their code have tests associated with them.
 
 #### Rubocop
 
-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/main/.rubocop.yml) 
+Watir is using [Rubocop](https://github.com/rubocop/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 at `.rubocop.yml`
 that might need to be tweaked for new code submissions. This can be addressed in the PR as necessary.
 
 #### Statistics
 
-Element specs are run with 
+Element specs are run with
 [Selenium Statistics gem](https://github.com/titusfortner/selenium_statistics)
 to verify that changes to the code do not dramatically decrease the performance based
 on wire calls.

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path('lib', __dir__)
 
 require 'bundler'
@@ -16,13 +18,6 @@ RuboCop::RakeTask.new(:rubocop) do |t|
   t.options = ['--display-cop-names']
 end
 
-namespace :spec do
-  RSpec::Core::RakeTask.new(:html) do |spec|
-    spec.rspec_opts = "--format html --out #{ENV['SPEC_REPORT'] || 'specs.html'}"
-    spec.pattern = 'spec/**/*_spec.rb'
-  end
-end
-
 {
   html: 'https://www.w3.org/TR/html52/single-page.html',
   svg: 'https://www.w3.org/TR/2018/CR-SVG2-20180807/single-page.html'
@@ -30,6 +25,7 @@ end
   namespace type do
     spec_path = "support/#{type}.html"
 
+    desc 'require generator'
     task generator_lib: :lib do
       require 'watir/generator'
     end
@@ -99,6 +95,7 @@ YARD::Doctest::RakeTask.new do |task|
 end
 
 namespace :changes do
+  desc 'Show how versions differ'
   task :differ do
     require './support/version_differ'
   end
@@ -122,6 +119,11 @@ end
 task default: [:spec, 'yard:doctest']
 
 namespace :spec do
+  RSpec::Core::RakeTask.new(:html) do |spec|
+    spec.rspec_opts = "--format html --out #{ENV['SPEC_REPORT'] || 'specs.html'}"
+    spec.pattern = 'spec/**/*_spec.rb'
+  end
+
   require 'selenium-webdriver'
 
   desc 'Run specs in all browsers'

data/lib/watir/adjacent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Adjacent
     #
@@ -112,7 +114,7 @@ module Watir
 
     def xpath_adjacent(opt = {})
       plural = opt.delete(:plural)
-      opt[:index] ||= 0 unless plural || opt.values.any? { |e| e.is_a? Regexp }
+      opt[:index] ||= 0 unless plural || opt.values.any?(Regexp)
       if !plural
         el = Watir.element_class_for(opt[:tag_name] || '').new(self, opt)
         el.is_a?(Input) ? el.to_subtype : el

data/lib/watir/after_hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   #
   # After hooks are blocks that run after certain browser events.
@@ -33,7 +35,7 @@ module Watir
     #
 
     def add(after_hook = nil, &block)
-      if block_given?
+      if block
         @after_hooks << block
       elsif after_hook.respond_to? :call
         @after_hooks << after_hook
@@ -99,8 +101,8 @@ module Watir
     # @yieldparam [#call] after_hook Object responding to call
     #
 
-    def each(&blk)
-      @after_hooks.each { |after_hook| blk.call(after_hook) }
+    def each(&block)
+      @after_hooks.each(&block)
     end
 
     #

data/lib/watir/alert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   class Alert
     include Waitable