watir 7.2.0 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e21571e92209dad62a8048886e0d383b0a2d8c720b2fa42cdb8d23c0f790a28
-  data.tar.gz: 2ebaf5e9faf6aa665986cb333b264e29a1b3400438f8eabecdc91ec42ce640b3
+  metadata.gz: a0bd050e4d97703802051446eb12d01751b5e63a10fe70353f0f955ac2bb9424
+  data.tar.gz: e573957fe4cd87d311af62b9a77ec8c6383f65f1e4ead17e5f117c40f31f87f8
 SHA512:
-  metadata.gz: b631f01f18c1741b4949188ead10e9f42dd9e7f20853e6a11a4563c1cfeca71efd9cc4dc5d186ab9021f7b8134d73760519d34a765cd21498a4e454361d23ae9
-  data.tar.gz: 433d5075795f765aa516811c956573670f97efe667e2fbadb7a41be9acc96ad3a85df712b21ed23f73dcd8c7f0f70a15ad1db2c4a888f3a92ab2a1380c6f0e8b
+  metadata.gz: 9409ddc8d5914e07ce3f8ef316be713d09bdbea6d130dc1bdf6be693930825b25baefd9dc200f5386a1a53955b2bbef7f48375e911897db2db33be4a337b85f3
+  data.tar.gz: fe6668eae425bc81e1a396dd81f41196d72d217eedca95a752e20c038fa43e55c87a951620ae37fc834517cbadf4b7e42b360b86adcdbba0798f929caf2ec866

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: [ 3.0, 3.2 ]
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v2
@@ -41,6 +41,14 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
       - name: Install gems
         run: bundle install
+      - name: Remove driver directories Windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          rm "$env:ChromeWebDriver" -r -v
+      - name: Remove driver directories Non-Windows
+        if: matrix.os != 'windows-latest'
+        run: |
+          sudo rm -rf $CHROMEWEBDRIVER
       - name: Run tests
         run: bundle exec rake spec:chrome
         env:

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: [ 3.0, 3.2 ]
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v2
@@ -32,5 +32,13 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
       - name: Install gems
         run: bundle install
+      - name: Remove driver directories Windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          rm "$env:EdgeWebDriver" -r -v
+      - name: Remove driver directories Non-Windows
+        if: matrix.os != 'windows-latest'
+        run: |
+          sudo rm -rf $EDGEWEBDRIVER
       - name: Run tests
-        run: bundle exec rake spec:chrome
+        run: bundle exec rake spec:edge

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: [ 3.0, 3.2 ]
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v2
@@ -41,7 +41,15 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
       - name: Install gems
         run: bundle install
+      - name: Remove driver directories Windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          rm "$env:GeckoWebDriver" -r -v
+      - name: Remove driver directories Non-Windows
+        if: matrix.os != 'windows-latest'
+        run: |
+          sudo rm -rf $GECKOWEBDRIVER
       - name: Run tests
-        run: bundle exec rake spec:chrome
+        run: bundle exec rake spec:firefox
         env:
           DISPLAY: :99

data/.github/workflows/ie.yml

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

data/.github/workflows/unit.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.0
       - name: Install gems
         run: bundle install
       - name: Run tests
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7', '3.0', '3.1']
+        ruby: ['3.0', '3.1', '3.2', 'jruby-9.4.0.0', 'truffleruby-22.3.0']
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v2
@@ -54,7 +54,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.0
       - name: Install gems
         run: bundle install
       - run: bundle exec rubocop

data/.rubocop.yml

@@ -3,23 +3,23 @@ inherit_from: .rubocop_todo.yml
 require:
   - rubocop-performance
   - rubocop-rake
+  - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   NewCops: enable
   Exclude:
     - 'lib/watir/elements/html_elements.rb'
     - 'lib/watir/elements/svg_elements.rb'
 
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-Lint/UnifiedInteger:
-  Exclude:
-  - 'lib/watir/locators/element/selector_builder.rb'
-
 Metrics/AbcSize:
-  Max: 22
+  Max: 23
   Exclude:
     - 'lib/watir/locators/element/selector_builder.rb'
     - 'lib/watir/locators/element/selector_builder/*.rb'
@@ -28,15 +28,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 +45,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 +57,40 @@ 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/IndexedLet:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Exclude:
+    - 'spec/watirspec/capabilities_spec.rb'
+
+RSpec/NoExpectationExample:
+  Exclude:
+    - 'spec/watirspec/cookies_spec.rb'
+
+Style/ArgumentsForwarding:
+  Enabled: false
 
 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,20 @@
-### 7.2.0 (2022-12-22)
+### 7.3.0 (2023-08-04)
+
+* Fix implementation of headless to work with Selenium 4.11
+* Remove support for Ruby 2.7
+* `DateField` and `DateTimeField` accept inputs that behave like Date (#969)
+* Add support for `http_only` and `same_site` cookie values (thanks Alexandre ZANNI #968)
+
+### 7.2.2 (2023-01-03)
+
+* Fix bug with processing vendor name-spaced capabilities
+
+### 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

@@ -89,9 +89,6 @@ module Watir
       process_proxy_options(options)
       browser_specific_options(options)
 
-      vendor_opts = process_vendor_options(browser_options)
-      vendor_opts.each { |opts| options.add_option(opts) }
-
       options
     end
 
@@ -108,13 +105,6 @@ module Watir
       options.proxy = proxy
     end
 
-    def process_vendor_options(opts)
-      return [] unless opts.is_a? Hash
-
-      vendor = opts.select { |key, _val| key.to_s.include?(':') && opts.delete(key) }
-      vendor.map { |k, v| Selenium::WebDriver::Remote::Capabilities.new(k => v) }
-    end
-
     def convert_timeouts(browser_options)
       browser_options[:timeouts] ||= {}
       browser_options[:timeouts].each_key do |key|
@@ -142,7 +132,7 @@ module Watir
           options.args << '--no-sandbox'
         end
       when :firefox
-        options.headless! if @options.delete(:headless)
+        options.args << '-headless' if @options.delete(:headless)
       when :safari
         Selenium::WebDriver::Safari.technology_preview! if @options.delete(:technology_preview)
       end
@@ -172,7 +162,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/cookies.rb

@@ -43,16 +43,19 @@ module Watir
     # Adds new cookie.
     #
     # @example
-    #   browser.cookies.add 'my_session', 'BAh7B0kiD3Nlc3Npb25faWQGOgZFRkk', secure: true
+    #   browser.cookies.add 'my_session', 'BAh7B0kiD3Nlc3Npb25faWQGOgZFRkk', secure: true, http_only: true
     #
     # @param [String] name
     # @param [String] value
     # @param [Hash] opts
     # @option opts [Boolean] :secure
+    # @option opts [Boolean] :http_only
     # @option opts [String] :path
+    # @option opts [String] :same_site
     # @option opts [Time, DateTime, NilClass] :expires
     # @option opts [String] :domain
     #
+    # @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie
 
     def add(name, value, opts = {})
       cookie = {
@@ -60,7 +63,9 @@ module Watir
         value: value
       }
       cookie[:secure] = opts[:secure] if opts.key?(:secure)
+      cookie[:http_only] = opts[:http_only] if opts.key?(:http_only)
       cookie[:path] = opts[:path] if opts.key?(:path)
+      cookie[:same_site] = opts[:same_site] if opts.key?(:same_site)
       expires = opts[:expires]
       if expires
         cookie[:expires] = expires.is_a?(String) ? ::Time.parse(expires) : expires
@@ -117,7 +122,7 @@ module Watir
     #
 
     def load(file = '.cookies')
-      YAML.safe_load(File.read(file), permitted_classes: [::Symbol, ::Time]).each do |c|
+      YAML.safe_load_file(file, permitted_classes: [::Symbol, ::Time]).each do |c|
         add(c.delete(:name), c.delete(:value), c)
       end
     end

data/lib/watir/elements/date_field.rb

@@ -9,8 +9,8 @@ module Watir
     def set!(date)
       date = Date.parse date if date.is_a?(String)
 
-      message = "DateField##{__callee__} only accepts instances of Date or Time"
-      raise ArgumentError, message unless [Date, ::Time].include?(date.class)
+      message = "DateField##{__callee__} only accepts instances that respond to #strftime"
+      raise ArgumentError, message unless date.respond_to?(:strftime)
 
       date_string = date.strftime('%Y-%m-%d')
       element_call(:wait_for_writable) do

data/lib/watir/elements/date_time_field.rb

@@ -9,8 +9,8 @@ module Watir
     def set!(date)
       date = ::Time.parse date if date.is_a?(String)
 
-      message = "DateTimeField##{__callee__} only accepts instances of DateTime or Time"
-      raise ArgumentError, message unless [DateTime, ::Time].include?(date.class)
+      message = "DateTimeField##{__callee__} only accepts instances that respond to #strftime"
+      raise ArgumentError, message unless date.respond_to?(:strftime)
 
       date_time_string = date.strftime('%Y-%m-%dT%H:%M')
       element_call(:wait_for_writable) do

data/lib/watir/elements/select.rb

@@ -114,9 +114,9 @@ module Watir
     def parse_select_args(str_or_rx, text, value, label)
       selectors = {}
       selectors[:any] = str_or_rx unless str_or_rx.empty?
-      selectors[:text] = Array[text] if text
-      selectors[:value] = Array[value] if value
-      selectors[:label] = Array[label] if label
+      selectors[:text] = [text] if text
+      selectors[:value] = [value] if value
+      selectors[:label] = [label] if label
 
       raise ArgumentError, "too many arguments used for Select#select: #{selectors}" if selectors.size > 1
 

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/element/selector_builder.rb

@@ -7,7 +7,7 @@ module Watir
         include Exception
         attr_reader :custom_attributes, :built
 
-        WILDCARD_ATTRIBUTE = /^(aria|data)_(.+)$/.freeze
+        WILDCARD_ATTRIBUTE = /^(aria|data)_(.+)$/
         VALID_WHATS = Hash.new([String, Regexp, TrueClass, FalseClass]).merge(adjacent: [::Symbol],
                                                                               xpath: [String],
                                                                               css: [String],

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

@@ -21,16 +21,12 @@ module Watir
               values_to_match[:text] = values_to_match.delete(key)
             end
           else
-            return
+            return false
           end
 
           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.3.0'
 end

data/lib/watir.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'net/http'
 require 'selenium-webdriver'
 require 'time'
 

data/lib/watirspec/implementation.rb

@@ -39,7 +39,7 @@ module WatirSpec
     end
 
     def inspect_args
-      selenium_opts = browser_args.last
+      selenium_opts = browser_args.last.dup
 
       options = selenium_opts.delete(:options)
       args = ["#{browser_args.first} tests:\n"]

data/lib/watirspec.rb

@@ -33,7 +33,7 @@ module WatirSpec
 
     def load_support
       root = File.expand_path('../spec/watirspec', __dir__)
-      Dir.glob("#{root}/support/**/*.rb").sort.each do |file|
+      Dir.glob("#{root}/support/**/*.rb").each do |file|
         require file
       end
     end

data/spec/locator_spec_helper.rb

@@ -3,9 +3,8 @@
 module LocatorSpecHelper
   def browser
     @browser ||= instance_double(Watir::Browser, wd: driver)
-    allow(@browser).to receive(:browser).and_return(@browser)
+    allow(@browser).to receive_messages(browser: @browser, locator_namespace: @locator_namespace || Watir::Locators)
     allow(@browser).to receive(:is_a?).with(Watir::Browser).and_return(true)
-    allow(@browser).to receive(:locator_namespace).and_return(@locator_namespace || Watir::Locators)
     @browser
   end
 
@@ -30,8 +29,7 @@ module LocatorSpecHelper
 
   def element_matcher
     @element_matcher ||= instance_double(Watir::Locators::Element::Matcher)
-    allow(@element_matcher).to receive(:query_scope).and_return(browser)
-    allow(@element_matcher).to receive(:selector).and_return(@locator || {})
+    allow(@element_matcher).to receive_messages(query_scope: browser, selector: @locator || {})
     @element_matcher
   end
 
@@ -39,14 +37,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)
@@ -67,10 +57,8 @@ module LocatorSpecHelper
     klass = opts.delete(:watir_element) || Watir::HTMLElement
     el = instance_double(klass, opts)
 
-    allow(el).to receive(:enabled?).and_return true
-    allow(el).to receive(:selector_builder).and_return(selector_builder)
+    allow(el).to receive_messages(enabled?: true, selector_builder: selector_builder, selector: @selector || {})
     allow(el).to receive(:wd).and_return wd_element unless opts.key?(:wd)
-    allow(el).to receive(:selector).and_return(@selector || {})
     el
   end