watir 6.16.2 → 6.18.0

data/CHANGES.md

@@ -1,3 +1,45 @@
+### 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)
+
+### 6.16.4 (2018-12-24)
+
+* Minor adjustments to support locator extensions
+
+### 6.16.3 (2018-12-24)
+
+* Minor adjustments to support locator extensions
+
 ### 6.16.2 (2018-12-24)
 
 * Fix bug merging scope when locating nested elements with css locator (#841)

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/titusfortner/watir/workflows/Unit%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Unit+Tests%22)
+[![Mac Tests](https://github.com/titusfortner/watir/workflows/Mac%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Mac+Tests%22)
+[![Windows Tests](https://github.com/titusfortner/watir/workflows/Windows%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Windows+Tests%22)
+[![Linux Tests](https://github.com/titusfortner/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=master)
 
 ## 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-webdriver.rb

@@ -1,2 +1,2 @@
 require 'watir'
-warn Kernel.caller.first + ': `require "watir-webdriver"` is deprecated. Please, use `require "watir"`.'
+warn "#{Kernel.caller.first}: `require 'watir-webdriver'` is deprecated. Please, use `require 'watir'`."

data/lib/watir.rb

@@ -6,6 +6,7 @@ require 'watir/legacy_wait'
 require 'watir/wait'
 require 'watir/exception'
 require 'watir/window'
+require 'watir/window_collection'
 require 'watir/has_window'
 require 'watir/adjacent'
 require 'watir/js_execution'
@@ -114,7 +115,6 @@ require 'watir/elements/element'
 require 'watir/elements/html_elements'
 require 'watir/elements/svg_elements'
 
-require 'watir/elements/area'
 require 'watir/elements/button'
 require 'watir/elements/cell'
 require 'watir/elements/checkbox'

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
 
     #

data/lib/watir/alert.rb

@@ -84,6 +84,7 @@ module Watir
       false
     end
     alias present? exists?
+    alias exist? exists?
 
     #
     # @api private

data/lib/watir/attribute_helper.rb

@@ -46,6 +46,8 @@ module Watir
     #  @return [$1] value of $3 property
     #
     def attribute(type, method, attr)
+      return if method_defined?(method)
+
       typed_attributes[type] << [method, attr]
       define_attribute(type, method, attr)
     end

data/lib/watir/browser.rb

@@ -11,7 +11,7 @@ module Watir
     include Exception
     include Scrolling
 
-    attr_writer :default_context, :original_window, :locator_namespace
+    attr_writer :default_context, :original_window, :locator_namespace, :timer
     attr_reader :driver, :after_hooks
     alias wd driver # ensures duck typing with Watir::Element
 
@@ -213,11 +213,11 @@ module Watir
     # @param args Arguments will be available in the given script in the 'arguments' pseudo-array
     #
 
-    def execute_script(script, *args)
+    def execute_script(script, *args, function_name: nil)
       args.map! do |e|
         e.is_a?(Element) ? e.wait_until(&:exists?).wd : e
       end
-
+      Watir.logger.info "Executing Script on Browser: #{function_name}" if function_name
       wrap_elements_in(self, @driver.execute_script(script, *args))
     end
 
@@ -300,6 +300,10 @@ module Watir
       end
     end
 
+    def timer
+      @timer ||= Wait::Timer.new
+    end
+
     private
 
     def wrap_element(scope, element)

data/lib/watir/capabilities.rb

@@ -25,7 +25,11 @@ module Watir
 
     def process_arguments
       url = @options.delete(:url)
-      @selenium_opts[:url] = url if url
+      if url
+        @selenium_opts[:url] = url
+      elsif @options.key?(:service)
+        @selenium_opts[:service] = options.delete(:service)
+      end
 
       create_http_client
 
@@ -63,7 +67,6 @@ module Watir
     end
 
     # TODO: - this will get addressed with Capabilities Update
-    # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/MethodLength
     # rubocop:disable Metrics/PerceivedComplexity:
     # rubocop:disable Metrics/CyclomaticComplexity::
@@ -82,7 +85,7 @@ module Watir
           browser_options[:args] += ['--headless', '--disable-gpu']
         end
         @selenium_opts[:options] = browser_options if browser_options.is_a? Selenium::WebDriver::Chrome::Options
-        @selenium_opts[:options] ||= Selenium::WebDriver::Chrome::Options.new(browser_options)
+        @selenium_opts[:options] ||= Selenium::WebDriver::Chrome::Options.new(**browser_options)
       when :firefox
         profile = @options.delete(:profile)
         if browser_options.is_a? Selenium::WebDriver::Firefox::Options
@@ -97,7 +100,7 @@ module Watir
           browser_options[:args] ||= []
           browser_options[:args] += ['--headless']
         end
-        @selenium_opts[:options] ||= Selenium::WebDriver::Firefox::Options.new(browser_options)
+        @selenium_opts[:options] ||= Selenium::WebDriver::Firefox::Options.new(**browser_options)
         @selenium_opts[:options].profile = profile if profile
       when :safari
         Selenium::WebDriver::Safari.technology_preview! if @options.delete(:technology_preview)
@@ -120,13 +123,13 @@ module Watir
         end
         unless browser_options.is_a? Selenium::WebDriver::IE::Options
           ie_caps = browser_options.select { |k| Selenium::WebDriver::IE::Options::CAPABILITIES.include?(k) }
-          browser_options = Selenium::WebDriver::IE::Options.new(browser_options)
+          browser_options = Selenium::WebDriver::IE::Options.new(**browser_options)
           ie_caps.each { |k, v| browser_options.add_option(k, v) }
         end
         @selenium_opts[:options] = browser_options
       end
     end
-    # rubocop:enable Metrics/AbcSize
+
     # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/PerceivedComplexity:
     # rubocop:enable Metrics/CyclomaticComplexity::

data/lib/watir/cookies.rb

@@ -61,7 +61,7 @@ module Watir
       cookie[:path] = opts[:path] if opts.key?(:path)
       expires = opts[:expires]
       if expires
-        cookie[:expires] = ::Time.parse(expires) if expires.is_a?(String) else expires
+        cookie[:expires] = expires.is_a?(String) ? ::Time.parse(expires) : expires
       end
       cookie[:domain] = opts[:domain] if opts.key?(:domain)
 
@@ -105,6 +105,8 @@ module Watir
       IO.write(file, to_a.to_yaml)
     end
 
+    #
+    # TODO: Use :permitted_classes keyword when minimum supported Ruby is 2.6
     #
     # Load cookies from file
     #

data/lib/watir/element_collection.rb

@@ -7,17 +7,19 @@ module Watir
     include Enumerable
     include Exception
     include JSSnippets
+    include Waitable
     include Locators::ClassHelpers
 
     def initialize(query_scope, selector)
       @query_scope = query_scope
       @selector = selector
+      @to_a = nil
 
       build unless @selector.key?(:element)
     end
 
     #
-    # Yields each element in collection.
+    # Relocates elements then yields each element in resulting collection.
     #
     # @example
     #   divs = browser.divs(class: 'kls')
@@ -29,6 +31,7 @@ module Watir
     #
 
     def each(&blk)
+      reset!
       to_a.each(&blk)
     end
 
@@ -37,6 +40,9 @@ module Watir
 
     alias empty? none?
 
+    alias exist? any?
+    alias exists? any?
+
     def build
       selector_builder.build(@selector.dup)
     end
@@ -145,14 +151,19 @@ module Watir
     alias eql? ==
 
     #
-    # Creates a Collection containing elements of two collections.
+    # Removes cache of previously located elements in the collection.
     #
     # @example
     #   options = browser.select_list(name: "new_user_languages").options
-    #   (options + browser.select_list(id: "new_user_role").options).size
-    #   #=> 8
+    #   options.reset!
+    #   options[0]
+    #   #=> nil
     #
 
+    def reset!
+      @to_a = nil
+    end
+
     private
 
     def elements
@@ -182,7 +193,11 @@ module Watir
     end
 
     def ensure_context
-      @query_scope.locate if @query_scope.is_a?(Browser) || @query_scope.located? && @query_scope.stale?
+      if @query_scope.is_a?(Browser) || !@query_scope.located? && @query_scope.is_a?(IFrame)
+        @query_scope.browser.locate
+      elsif @query_scope.located? && @query_scope.stale?
+        @query_scope.locate
+      end
       @query_scope.switch_to! if @query_scope.is_a?(IFrame)
     end
 
@@ -191,7 +206,7 @@ module Watir
     end
 
     def element_class
-      Kernel.const_get(self.class.name.sub(/Collection$/, ''))
+      Watir.const_get(self.class.name.sub(/Collection$/, ''))
     end
 
     def construct_subtype(element, hash, tag_name)

data/lib/watir/elements/element.rb

@@ -18,6 +18,17 @@ module Watir
     attr_accessor :keyword
     attr_reader :selector
 
+    # https://www.w3.org/TR/html52/single-page.html#casesensitivity
+    CASE_INSENSITIVE_ATTRIBUTES = %i[accept accept_charset align alink axis
+                                     bgcolor charset checked clear codetype
+                                     color compact declare defer dir direction
+                                     disabled enctype face frame hreflang
+                                     http_equiv lang language link media
+                                     method multiple nohref noresize noshade
+                                     nowrap readonly rel rev rules scope
+                                     scrolling selected shape target text
+                                     type valign valuetype vlink].freeze
+
     #
     # temporarily add :id and :class_name manually since they're no longer specified in the HTML spec.
     #
@@ -54,12 +65,9 @@ module Watir
 
     def exists?
       if located? && stale?
-        Watir.logger.deprecate 'Checking `#exists? == false` to determine a stale element',
-                               '`#stale? == true`',
-                               reference: 'http://watir.com/staleness-changes',
-                               ids: [:stale_exists]
-        # TODO: Change this to `reset!` after removing deprecation
-        return false
+        reset!
+      elsif located?
+        return true
       end
 
       assert_exists
@@ -141,7 +149,6 @@ module Watir
     #
 
     def click(*modifiers)
-      # TODO: Should wait_for_enabled be default, or `Button` specific behavior?
       element_call(:wait_for_enabled) do
         if modifiers.any?
           action = driver.action
@@ -196,15 +203,35 @@ module Watir
     end
 
     #
-    # Right clicks the element.
-    # Note that browser support may vary.
+    # Right clicks the element, optionally while pressing the given modifier keys.
+    # Note that support for holding a modifier key is currently experimental,
+    # and may not work at all. Also, the browser support may vary.
     #
     # @example
     #   browser.element(name: "new_user_button").right_click
     #
+    # @example Right click an element with shift key pressed
+    #   browser.element(name: "new_user_button").right_click(:shift)
+    #
+    # @example Click an element with several modifier keys pressed
+    #   browser.element(name: "new_user_button").right_click(:shift, :alt)
+    #
+    # @param [:shift, :alt, :control, :command, :meta] modifiers to press while right clicking.
+    #
+
+    def right_click(*modifiers)
+      element_call(:wait_for_present) do
+        action = driver.action
+        if modifiers.any?
+          modifiers.each { |mod| action.key_down mod }
+          action.context_click(@element)
+          modifiers.each { |mod| action.key_up mod }
+          action.perform
+        else
+          action.context_click(@element).perform
+        end
+      end
 
-    def right_click
-      element_call(:wait_for_present) { driver.action.context_click(@element).perform }
       browser.after_hooks.run
     end
 
@@ -247,7 +274,7 @@ module Watir
     # Note that browser support may vary.
     #
     # @example
-    #   browser.div(id: "draggable").drag_and_drop_by 100, -200
+    #   browser.div(id: "draggable").drag_and_drop_by 100, 25
     #
     # @param [Integer] right_by
     # @param [Integer] down_by
@@ -358,6 +385,8 @@ module Watir
     #
 
     def scroll_into_view
+      Watir.logger.deprecate 'Element#scroll_into_view', 'Element#scroll methods', ids: [:scroll_into_view]
+
       element_call { @element.location_once_scrolled_into_view }
     end
 
@@ -460,16 +489,7 @@ module Watir
       msg = '#visible? behavior will be changing slightly, consider switching to #present? ' \
             '(more details: http://watir.com/element-existentialism/)'
       Watir.logger.warn msg, ids: [:visible_element]
-      displayed = display_check
-      if displayed.nil? && display_check
-        Watir.logger.deprecate 'Checking `#visible? == false` to determine a stale element',
-                               '`#stale? == true`',
-                               reference: 'http://watir.com/staleness-changes',
-                               ids: [:stale_visible]
-      end
-      raise unknown_exception if displayed.nil?
-
-      displayed
+      display_check
     end
 
     #
@@ -492,14 +512,7 @@ module Watir
     #
 
     def present?
-      displayed = display_check
-      if displayed.nil? && display_check
-        Watir.logger.deprecate 'Checking `#present? == false` to determine a stale element',
-                               '`#stale? == true`',
-                               reference: 'http://watir.com/staleness-changes',
-                               ids: [:stale_present]
-      end
-      displayed
+      display_check
     rescue UnknownObjectException, UnknownFrameException
       false
     end
@@ -547,7 +560,7 @@ module Watir
     #
 
     def to_subtype
-      tag = tag_name()
+      tag = tag_name
       klass = if tag == 'input'
                 case attribute_value(:type)
                 when 'checkbox'
@@ -595,7 +608,7 @@ module Watir
     def stale_in_context?
       @element.css_value('staleness_check') # any wire call will check for staleness
       false
-    rescue Selenium::WebDriver::Error::ObsoleteElementError
+    rescue Selenium::WebDriver::Error::StaleElementReferenceError
       true
     end
 
@@ -686,7 +699,7 @@ module Watir
       return assert_enabled unless Watir.relaxed_locate?
 
       wait_for_exists
-      return unless [Input, Button, Select, Option].any? { |c| is_a? c } || @content_editable
+      return unless [Input, Button, Select, Option].any? { |c| is_a? c } || content_editable
       return if enabled?
 
       begin
@@ -698,9 +711,7 @@ module Watir
 
     def wait_for_writable
       wait_for_enabled
-      unless Watir.relaxed_locate?
-        raise_writable unless !respond_to?(:readonly?) || !readonly?
-      end
+      raise_writable unless Watir.relaxed_locate? || (!respond_to?(:readonly?) || !readonly?)
 
       return if !respond_to?(:readonly?) || !readonly?
 
@@ -720,7 +731,11 @@ module Watir
     end
 
     def ensure_context
-      @query_scope.locate if @query_scope.is_a?(Browser) || @query_scope.located? && @query_scope.stale?
+      if @query_scope.is_a?(Browser) || !@query_scope.located? && @query_scope.is_a?(IFrame)
+        @query_scope.browser.locate
+      elsif @query_scope.located? && @query_scope.stale?
+        @query_scope.locate
+      end
       @query_scope.switch_to! if @query_scope.is_a?(IFrame)
     end
 
@@ -770,54 +785,52 @@ module Watir
       @element.displayed?
     rescue Selenium::WebDriver::Error::StaleElementReferenceError
       reset!
-      nil
+      retry
     end
 
     # TODO: - this will get addressed with Watir::Executor implementation
     # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/MethodLength
-    # rubocop:disable Metrics/PerceivedComplexity
     # rubocop:disable Metrics/CyclomaticComplexity:
+    # rubocop:disable Metrics/PerceivedComplexity::
     def element_call(precondition = nil, &block)
       caller = caller_locations(1, 1)[0].label
-      already_locked = Wait.timer.locked?
-      Wait.timer = Wait::Timer.new(timeout: Watir.default_timeout) unless already_locked
+      already_locked = browser.timer.locked?
+      browser.timer = Wait::Timer.new(timeout: Watir.default_timeout) unless already_locked
 
       begin
         check_condition(precondition, caller)
         Watir.logger.debug "-> `Executing #{inspect}##{caller}`"
         yield
-      rescue unknown_exception => ex
+      rescue unknown_exception => e
         element_call(:wait_for_exists, &block) if precondition.nil?
-        msg = ex.message
+        msg = e.message
         msg += '; Maybe look in an iframe?' if @query_scope.iframe.exists?
-        custom_attributes = @locator.nil? ? [] : selector_builder.custom_attributes
+        custom_attributes = !defined?(@locator) || @locator.nil? ? [] : selector_builder.custom_attributes
         unless custom_attributes.empty?
           msg += "; Watir treated #{custom_attributes} as a non-HTML compliant attribute, ensure that was intended"
         end
         raise unknown_exception, msg
-      rescue Selenium::WebDriver::Error::StaleElementReferenceError
+      rescue Selenium::WebDriver::Error::StaleElementReferenceError, Selenium::WebDriver::Error::NoSuchElementError
         reset!
         retry
-      rescue Selenium::WebDriver::Error::ElementNotVisibleError, Selenium::WebDriver::Error::ElementNotInteractableError
-        raise_present unless Wait.timer.remaining_time.positive?
+        # TODO: - InvalidElementStateError is deprecated, so no longer calling `raise_disabled`
+        # need a better way to handle this
+      rescue Selenium::WebDriver::Error::ElementNotInteractableError
+        raise_present unless browser.timer.remaining_time.positive?
         raise_present unless %i[wait_for_present wait_for_enabled wait_for_writable].include?(precondition)
         retry
-      rescue Selenium::WebDriver::Error::InvalidElementStateError
-        raise_disabled unless Wait.timer.remaining_time.positive?
-        raise_disabled unless %i[wait_for_present wait_for_enabled wait_for_writable].include?(precondition)
-        retry
       rescue Selenium::WebDriver::Error::NoSuchWindowError
         raise NoMatchingWindowFoundException, 'browser window was closed'
       ensure
         Watir.logger.debug "<- `Completed #{inspect}##{caller}`"
-        Wait.timer.reset! unless already_locked
+        browser.timer.reset! unless already_locked
       end
     end
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity
-    # rubocop:enable Metrics/CyclomaticComplexity:
 
     def check_condition(condition, caller)
       Watir.logger.debug "<- `Verifying precondition #{inspect}##{condition} for #{caller}`"