watir 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e21571e92209dad62a8048886e0d383b0a2d8c720b2fa42cdb8d23c0f790a28
-  data.tar.gz: 2ebaf5e9faf6aa665986cb333b264e29a1b3400438f8eabecdc91ec42ce640b3
+  metadata.gz: ec69631e8533b0c1f5a428fd9ae4e65ed1b6400d194f8d3ba7608de1e29704de
+  data.tar.gz: e45269a6afa488650533d56afd20d12ad542e9557b96b084c16c13db6b746bcf
 SHA512:
-  metadata.gz: b631f01f18c1741b4949188ead10e9f42dd9e7f20853e6a11a4563c1cfeca71efd9cc4dc5d186ab9021f7b8134d73760519d34a765cd21498a4e454361d23ae9
-  data.tar.gz: 433d5075795f765aa516811c956573670f97efe667e2fbadb7a41be9acc96ad3a85df712b21ed23f73dcd8c7f0f70a15ad1db2c4a888f3a92ab2a1380c6f0e8b
+  metadata.gz: c9dd6b62ab7a055f8dcf5630a387f9023ac3041934c0d14a41eb3812b300f73756ba298e0c81eb7a5cb7b4f2fd289249e945bf6bbe8500eb1097e903b08b3d05
+  data.tar.gz: ea9a050b5a5dd631fa6403c48f4cb641987a94f10b72e37d9afa6648f02f0eba2a5cb91fa795fefb5132e6b47fffe39d917216ab34bc29cca9174e1435fbb8dd

data/.github/workflows/chrome.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        ruby: [ 2.7, 3.1 ]
+        ruby: [ 2.7, 3.2 ]
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v2

data/.github/workflows/edge.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest]
-        ruby: [ 2.7, 3.1 ]
+        ruby: [ 2.7, 3.2 ]
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v2

data/.github/workflows/firefox.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        ruby: [ 2.7, 3.1 ]
+        ruby: [ 2.7, 3.2 ]
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v2

data/.github/workflows/ie.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.7, 3.1 ]
+        ruby: [ 2.7, 3.2 ]
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v2

data/.github/workflows/safari.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.7, 3.1 ]
+        ruby: [ 2.7, 3.2 ]
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v2

data/.github/workflows/unit.yml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7', '3.0', '3.1']
+        ruby: ['2.7', '3.0', '3.1', '3.2', 'jruby-9.4.0.0', 'truffleruby-22.3.0']
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v2

data/.rubocop.yml

@@ -3,6 +3,7 @@ inherit_from: .rubocop_todo.yml
 require:
   - rubocop-performance
   - rubocop-rake
+  - rubocop-rspec
 
 AllCops:
   TargetRubyVersion: 2.7
@@ -14,10 +15,6 @@ AllCops:
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-Lint/UnifiedInteger:
-  Exclude:
-  - 'lib/watir/locators/element/selector_builder.rb'
-
 Metrics/AbcSize:
   Max: 22
   Exclude:
@@ -28,15 +25,10 @@ Metrics/AbcSize:
 
 Metrics/BlockLength:
   Exclude:
-    - 'spec/**/*'
     - 'support/doctest_helper.rb'
     - 'watir.gemspec'
     - 'Rakefile'
 
-Metrics/ModuleLength:
-  Exclude:
-    - 'spec/**/*'
-
 Metrics/ClassLength:
   Max: 93
   Exclude:
@@ -50,6 +42,7 @@ Metrics/ClassLength:
     - 'lib/watir/elements/select.rb'
     - 'lib/watir/generator/base/spec_extractor.rb'
     - 'lib/watir/element_collection.rb'
+    - 'spec/**/*_spec.rb'
 
 Metrics/CyclomaticComplexity:
   Max: 9
@@ -61,14 +54,34 @@ 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'
 
+Metrics/ModuleLength:
+  Exclude:
+    - 'spec/**/*'
+
 Metrics/PerceivedComplexity:
   Max: 10
 
-Performance/CollectionLiteralInLoop:
-  MinSize: 3
+RSpec/AnyInstance:
+  Enabled: false
+
+RSpec/BeforeAfterAll:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Exclude:
+    - 'spec/watirspec/capabilities_spec.rb'
+
+RSpec/NoExpectationExample:
+  Exclude:
+    - 'spec/watirspec/cookies_spec.rb'
 
 Style/BlockDelimiters:
   EnforcedStyle: braces_for_chaining

data/.rubocop_todo.yml

@@ -1,10 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-08-27 01:55:04 UTC using RuboCop version 0.89.1.
+# on 2022-12-31 19:29:43 UTC using RuboCop version 1.40.0.
 # 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: 1
+RSpec/PendingWithoutReason:
+  Exclude:
+    - 'spec/watirspec/browser_spec.rb'
+
+# Offense count: 114
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false

data/CHANGES.md

@@ -1,4 +1,9 @@
-### 7.2.0 (2022-12-22)
+### 7.2.1 (2023-01-02)
+
+* Fix bug for building locators with JRuby
+* Fix bug for inferring internet explorer browser name from options
+
+### 7.2.0 (2022-12-24)
 
 * Implement Shadow DOM support (#953)
 * Implement existing `Scroll#by` with Selenium Actions Class instead of JavaScript

data/LICENSE

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

data/lib/watir/capabilities.rb

@@ -172,7 +172,7 @@ module Watir
                  elsif options[:options].is_a?(Selenium::WebDriver::Options)
                    options[:options].class.to_s.split('::')[-2].downcase.to_sym
                  elsif options.key?(:options)
-                   options.dig(:options, :browser_name).downcase.to_sym
+                   options.dig(:options, :browser_name).tr(' ', '_').downcase.to_sym
                  else
                    :chrome
                  end

data/lib/watir/locators/anchor/selector_builder.rb

@@ -4,6 +4,9 @@ module Watir
   module Locators
     class Anchor
       class SelectorBuilder < Element::SelectorBuilder
+        class XPath < Element::SelectorBuilder::XPath
+        end
+
         private
 
         def build_wd_selector(selector)

data/lib/watir/locators/element/matcher.rb

@@ -58,11 +58,12 @@ module Watir
         end
 
         def elements_match?(element, values_to_match)
+          class_keys = %i[class class_name]
           values_to_match.all? do |how, expected|
             if how == :tag_name
               validate_tag(element, expected)
               # TODO: Can this be class_name here or does that get converted?
-            elsif %i[class class_name].include?(how)
+            elsif class_keys.include?(how)
               value = fetch_value(element, how)
               [expected].flatten.all? do |match|
                 value.split.any? do |class_value|

data/lib/watir/locators/element/selector_builder/regexp_disassembler.rb

@@ -36,12 +36,13 @@ module Watir
           end
 
           def extract_strings(expression, strings)
+            meta_set = %i[meta set]
             expression.each do |exp|
               if optional?(exp)
                 strings.push(+'')
                 next
               end
-              if %i[meta set].include?(exp.type)
+              if meta_set.include?(exp.type)
                 strings.push(+'')
                 next
               end

data/lib/watir/locators/text_field/matcher.rb

@@ -27,10 +27,6 @@ module Watir
           super
         end
 
-        def text_regexp_deprecation(*)
-          # does not apply to text_field
-        end
-
         def validate_tag(element, _expected)
           tag_name = fetch_value(element, :tag_name)
           matches_values?(tag_name, 'input')

data/lib/watir/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Watir
-  VERSION = '7.2.0'
+  VERSION = '7.2.1'
 end

data/spec/locator_spec_helper.rb

@@ -39,14 +39,6 @@ module LocatorSpecHelper
     Watir::Locators::Element::Locator.new(element_matcher)
   end
 
-  def expect_one(*args)
-    expect(driver).to receive(:find_element).with(*args)
-  end
-
-  def expect_all(*args)
-    expect(driver).to receive(:find_elements).with(*args)
-  end
-
   def locate_one(selector = nil)
     selector ||= @locator || {}
     locator.locate ordered_hash(selector)