watir 6.16.5 → 6.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa8314c42d13abbcf8c23676254674e9f7db6072
-  data.tar.gz: aab0634d0461fb0f67749b48625ef6b86f337929
+SHA256:
+  metadata.gz: c587621e41c1ab878d2e9ff3cfd6c5166c5df9dc66cd02c0719d492aaba48d1e
+  data.tar.gz: 509ba43afa0272d7b154eb5885e403578e2bc3956ab93803123b519093e7b430
 SHA512:
-  metadata.gz: 42511b036683635c9f960753ed429a332f91a6917af42c71b2d619f8004d1e4147f76e41f89e0eebd39a2043129662ccd7ce673521edac87ad759e52d9ba27c3
-  data.tar.gz: 3d581c12b5be6ae282824b7ec9ce9785d2a7991b95f520f108017ba2c93bb3bda6881fb535ee38799b31521319e36585e194bd230af5ae1d70f2e09f24cf3dec
+  metadata.gz: 5215ff9fc1cfce6fa050532583167e6ed16be6f74b0d305b8d186b83361162c711ae9b63689a00882bf60d559783508ea2369ed9e8d5e25b504688eb2914db01
+  data.tar.gz: 1b0ba276ea5c83f217151c125b0f645aab7011d86d9049ea7850ea83af4fbeeb9bdfa14ca60d7205c55bee3c0d6f817143bd9f979c7dc5adc368af446367ab8a

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/.travis.yml

@@ -18,15 +18,15 @@ before_script:
 script: bundle exec rake $RAKE_TASK
 
 _version:
-  three: &three
+  five: &five
     language: ruby
-    rvm: 2.3.8
-  four: &four
+    rvm: 2.5.8
+  six: &six
     language: ruby
-    rvm: 2.4.5
-  five: &five
+    rvm: 2.6.6
+  seven: &seven
     language: ruby
-    rvm: 2.5.3
+    rvm: 2.7.1
 
 _browsers:
   firefox: &firefox-latest
@@ -39,46 +39,49 @@ _browsers:
 matrix:
   include:
       - env: RAKE_TASK=spec:remote_firefox
-        <<: *five
+        <<: *seven
         <<: *firefox-latest
       - env: RAKE_TASK=spec:remote_chrome
-        <<: *five
+        <<: *seven
         <<: *chrome
       - env: RAKE_TASK=spec:firefox RELAXED_LOCATE=false
-        <<: *five
+        <<: *seven
         <<: *firefox-latest
       - env: RAKE_TASK=spec:firefox
-        <<: *five
+        <<: *seven
         <<: *firefox-latest
       - env: RAKE_TASK=spec:firefox
-        <<: *four
+        <<: *six
         <<: *firefox-latest
       - env: RAKE_TASK=spec:firefox
-        <<: *three
+        <<: *five
         <<: *firefox-latest
       - env: RAKE_TASK=spec:chrome
-        <<: *five
+        <<: *seven
         <<: *chrome
       - env: RAKE_TASK=spec:chrome
-        <<: *four
+        <<: *six
         <<: *chrome
       - env: RAKE_TASK=spec:chrome
-        <<: *three
+        <<: *five
         <<: *chrome
       - env: RAKE_TASK=spec:chrome RELAXED_LOCATE=false
-        <<: *five
+        <<: *seven
+        <<: *chrome
+      - env: RAKE_TASK=spec:chrome W3C=true
+        <<: *seven
         <<: *chrome
       - env: RAKE_TASK=spec:chrome HEADLESS=true
-        <<: *five
+        <<: *seven
         <<: *chrome
       - env: RAKE_TASK=spec:unit
-        <<: *five
+        <<: *seven
       - env: RAKE_TASK=spec:stats
-        <<: *five
+        <<: *seven
         <<: *chrome
       - env: RAKE_TASK=yard:doctest
-        <<: *five
+        <<: *seven
         <<: *chrome
       - env: RAKE_TASK=rubocop
-        <<: *three
+        <<: *five
         <<: *chrome

data/CHANGES.md

@@ -1,3 +1,19 @@
+### 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/Rakefile

@@ -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/appveyor.yml

@@ -2,7 +2,8 @@ version: "#{build}"
 build: off
 clone_depth: 100
 install:
-  - set PATH=C:\Ruby23\bin;%PATH%
+  - set PATH=C:\Ruby25\bin;%PATH%
+  - gem update --system
   - bundle install
 test_script:
   - bundle exec rake %RAKE_TASK%

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

@@ -114,7 +114,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]
+        Object.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/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
 
@@ -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::