watir 7.2.2 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 635faa9aa111937b2d90f6ab1585a148d8eea5cf375b4a1dc4d3e164b3e24c38
-  data.tar.gz: 31bb99fbba606a62c369c4a89b8c12764e00feff89048179e5958bf4b0abca3d
+  metadata.gz: a0bd050e4d97703802051446eb12d01751b5e63a10fe70353f0f955ac2bb9424
+  data.tar.gz: e573957fe4cd87d311af62b9a77ec8c6383f65f1e4ead17e5f117c40f31f87f8
 SHA512:
-  metadata.gz: 131f2cccc8debc1afd14462f90fbafff4d5f349b4caa193247f2adf8efa6f91e03c8218ff8bec23a86d8c4c8e4de18b1c63b38f6cc5c9c878420a9bc01d816f3
-  data.tar.gz: c4f5abb5e301fcee62f25a091f299933f2c10e1b703a3378fcd6d850012d989f3e5ac2f9d8fcec170fee44f97ec4758c5894d85e7a7a62d3efaf2f609a733676
+  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.2 ]
+        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.2 ]
+        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.2 ]
+        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.2 ]
+        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.2 ]
+        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', '3.2', 'jruby-9.4.0.0', 'truffleruby-22.3.0']
+        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

@@ -6,17 +6,20 @@ require:
   - 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
 
 Metrics/AbcSize:
-  Max: 22
+  Max: 23
   Exclude:
     - 'lib/watir/locators/element/selector_builder.rb'
     - 'lib/watir/locators/element/selector_builder/*.rb'
@@ -72,6 +75,9 @@ RSpec/BeforeAfterAll:
 RSpec/ExampleLength:
   Enabled: false
 
+RSpec/IndexedLet:
+  Enabled: false
+
 RSpec/MultipleExpectations:
   Enabled: false
 
@@ -83,6 +89,9 @@ RSpec/NoExpectationExample:
   Exclude:
     - 'spec/watirspec/cookies_spec.rb'
 
+Style/ArgumentsForwarding:
+  Enabled: false
+
 Style/BlockDelimiters:
   EnforcedStyle: braces_for_chaining
 

data/CHANGES.md

@@ -1,3 +1,10 @@
+### 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

data/lib/watir/capabilities.rb

@@ -105,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|
@@ -139,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

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

data/lib/watir/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Watir
-  VERSION = '7.2.2'
+  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
 
@@ -59,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
 

data/spec/unit/capabilities_spec.rb

@@ -31,8 +31,7 @@ module Watir
 
     def halt_service(browser)
       allow(Selenium::WebDriver::Platform).to receive(:find_binary).and_return(true)
-      allow(File).to receive(:file?).and_return(true)
-      allow(File).to receive(:executable?).and_return(true)
+      allow(File).to receive_messages(file?: true, executable?: true)
       service_class(browser).driver_path = nil
     end
 
@@ -75,7 +74,7 @@ module Watir
       end
 
       it 'just capabilities has client & capabilities but not service' do
-        caps = Selenium::WebDriver::Remote::Capabilities.send(browser_symbol)
+        caps = Selenium::WebDriver::Remote::Capabilities.new(browser_name: expected_browser(browser_symbol))
         capabilities = described_class.new(capabilities: caps)
         args = []
         expect {
@@ -110,7 +109,7 @@ module Watir
           actual_service = args.last[:service]
           expect(actual_service.instance_variable_get(:@port)).to eq 1234
           expect(actual_service.instance_variable_get(:@executable_path)).to eq '/path/to/driver'
-          expect(actual_service.instance_variable_get(:@extra_args)).to include '--foo', '--bar'
+          expect(actual_service.instance_variable_get(:@args)).to include '--foo', '--bar'
         end
 
         it 'is a bad argument to service' do
@@ -159,7 +158,7 @@ module Watir
       end
 
       it 'accepts both capabilities and Options' do
-        caps = Selenium::WebDriver::Remote::Capabilities.send(browser_symbol)
+        caps = Selenium::WebDriver::Remote::Capabilities.new(browser_name: expected_browser(browser_symbol))
         opts = options_class(browser_symbol).new
 
         expect {
@@ -392,7 +391,7 @@ module Watir
       it 'accepts capabilities object' do
         caps = described_class.new(:chrome,
                                    url: 'https://example.com/wd/hub',
-                                   capabilities: Selenium::WebDriver::Remote::Capabilities.chrome)
+                                   capabilities: Selenium::WebDriver::Remote::Capabilities.new(browser_name: 'chrome'))
         args = []
         expect {
           args = caps.to_args
@@ -408,7 +407,7 @@ module Watir
         client = HttpClient.new
         caps = described_class.new(:chrome,
                                    url: 'https://example.com/wd/hub',
-                                   capabilities: Selenium::WebDriver::Remote::Capabilities.chrome,
+                                   capabilities: Selenium::WebDriver::Remote::Capabilities.new(browser_name: 'chrome'),
                                    http_client: client)
         args = []
         expect {
@@ -451,7 +450,7 @@ module Watir
         expect {
           described_class.new(:chrome,
                               url: 'https://example.com/wd/hub',
-                              capabilities: Selenium::WebDriver::Remote::Capabilities.chrome,
+                              capabilities: Selenium::WebDriver::Remote::Capabilities.new(browser_name: 'chrome'),
                               options: options)
         }.to raise_exception(ArgumentError, ':capabilities and :options are not both allowed')
       end

data/spec/unit/selector_builder/element_spec.rb

@@ -666,8 +666,7 @@ module Watir
             let(:scope_built) { {xpath: ".//*[local-name()='div'][@id='table-rows-test']"} }
 
             before do
-              allow(query_scope).to receive(:selector_builder).and_return(selector_builder)
-              allow(query_scope).to receive(:browser).and_return(browser)
+              allow(query_scope).to receive_messages(selector_builder: selector_builder, browser: browser)
               allow(selector_builder).to receive(:built).and_return(scope_built)
             end
 
@@ -742,8 +741,7 @@ module Watir
               selector_builder = described_class.new(attributes, query_scope)
 
               allow(selector_builder).to receive(:built).and_return(scope_built)
-              allow(query_scope).to receive(:selector_builder).and_return(selector_builder)
-              allow(query_scope).to receive(:browser).and_return(browser)
+              allow(query_scope).to receive_messages(selector_builder: selector_builder, browser: browser)
               allow(query_scope).to receive(:is_a?).with(Watir::Browser).and_return(false)
               allow(query_scope).to receive(:is_a?).with(Watir::ShadowRoot).and_return(false)
               allow(query_scope).to receive(:is_a?).with(Watir::IFrame).and_return(true)

data/spec/watirspec/browser_spec.rb

@@ -353,7 +353,7 @@ module Watir
 
       it 'updates the page when location is changed with setTimeout + window.location' do
         browser.goto(WatirSpec.url_for('timeout_window_location.html'))
-        browser.wait_while { |b| b.url.include? 'timeout_window_location.html' }
+        browser.wait_while { |b| b.url.match?(/timeout_window_location|blank/) }
         expect(browser.url).to include('non_control_elements.html')
       end
     end
@@ -387,7 +387,7 @@ module Watir
 
       it 'returns correct Ruby objects' do
         expect(browser.execute_script('return {a: 1, "b": 2}')).to eq({'a' => 1, 'b' => 2})
-        expect(browser.execute_script('return [1, 2, "3"]')).to match_array([1, 2, '3'])
+        expect(browser.execute_script('return [1, 2, "3"]')).to contain_exactly(1, 2, '3')
         expect(browser.execute_script('return 1.2 + 1.3')).to eq 2.5
         expect(browser.execute_script('return 2 + 2')).to eq 4
         expect(browser.execute_script('return "hello"')).to eq 'hello'
@@ -424,7 +424,9 @@ module Watir
         expect(hash['element']).to be_a(Watir::Body)
       end
 
-      it 'wraps elements in a deep object' do
+      it 'wraps elements in a deep object',
+         except: {browser: %i[chrome edge],
+                  reason: 'https://bugs.chromium.org/p/chromedriver/issues/detail?id=4536'} do
         hash = browser.execute_script('return {elements: [document.body], body: {element: document.body }}')
 
         expect(hash['elements'].first).to be_a(Watir::Body)

data/spec/watirspec/capabilities_spec.rb

@@ -21,7 +21,7 @@ module Watir
     let(:browser_symbol) { WatirSpec.implementation.browser_args.first }
     let(:actual_capabilities) { @browser.wd.capabilities }
     let(:actual_http) { @browser.wd.instance_variable_get(:@bridge).instance_variable_get(:@http) }
-    let(:actual_service) { @browser.wd.instance_variable_get(:@service) }
+    let(:actual_service) { @browser.wd.instance_variable_get(:@service_manager) }
     let(:actual_listener) { @browser.wd.instance_variable_get(:@bridge).instance_variable_get(:@listener) }
 
     before(:all) do
@@ -83,7 +83,8 @@ module Watir
         end
 
         describe 'capabilities' do
-          it 'accepts namespaced value' do
+          it 'accepts namespaced value', except: {browser: :ie,
+                                                  reason: 'IE is more strict'} do
             options = {'key:value' => 'something'}
             @browser = described_class.new(browser_symbol, options: options)
 
@@ -110,18 +111,6 @@ module Watir
             expect(actual_http).to eq client
           end
 
-          it 'just capabilities has capabilities and watir client without service' do
-            caps = Remote::Capabilities.new(browser_name: browser_name)
-
-            expect {
-              @browser = described_class.new(capabilities: caps)
-            }.to have_deprecated(:capabilities)
-
-            expect(selenium_args[:capabilities]).to eq(caps)
-            expect(selenium_args).not_to include(:service)
-            expect(actual_http).to be_a HttpClient
-          end
-
           it 'accepts page load and script timeouts in seconds' do
             options = {page_load_timeout: 11,
                        script_timeout: 12}
@@ -205,7 +194,8 @@ module Watir
           expect(actual_listener).to eq listener
         end
 
-        describe 'proxy' do
+        describe 'proxy', except: {browser: :ie,
+                                   reason: 'Bug in Selenium 4.11 Selenium Manager'} do
           it 'adds Selenium Proxy to empty Options', except: {browser: :safari,
                                                               reason: 'Safari does not like proxies'} do
             proxy = Selenium::WebDriver::Proxy.new(http: '127.0.0.1:8080', ssl: '127.0.0.1:443')

data/spec/watirspec/cookies_spec.rb

@@ -80,6 +80,33 @@ module Watir
       expect(cookie[:path]).to eq '/set_cookie'
     end
 
+    it 'adds a cookie with samesite value' do
+      browser.goto WatirSpec.url_for 'index.html'
+
+      options = {same_site: 'Strict'}
+      browser.cookies.add 'samesite', 'strict', options
+
+      cookie = browser.cookies.to_a.find { |e| e[:name] == 'samesite' }
+
+      expect(cookie[:name]).to eq 'samesite'
+      expect(cookie[:value]).to eq 'strict'
+      expect(cookie[:same_site]).to eq 'Strict'
+    end
+
+    it 'adds a cookie with httponly value' do
+      browser.goto WatirSpec.url_for 'index.html'
+
+      options = {http_only: true}
+      browser.cookies.add 'httponly', 'true', options
+
+      cookie = browser.cookies.to_a.find { |e| e[:name] == 'httponly' }
+
+      expect(cookie[:name]).to eq 'httponly'
+      expect(cookie[:value]).to eq 'true'
+      expect(cookie[:http_only]).to be true
+      expect(browser.execute_script('return document.cookie')).to be_empty
+    end
+
     it 'adds a cookie with expiration' do
       browser.goto WatirSpec.url_for 'index.html'
 
@@ -145,7 +172,7 @@ module Watir
           browser.cookies.clear
           browser.cookies.load file
           expected = browser.cookies.to_a
-          actual = YAML.safe_load(File.read(file), permitted_classes: [::Symbol])
+          actual = YAML.safe_load_file(file, permitted_classes: [::Symbol])
 
           expected.each { |cookie| cookie.delete(:expires) }
           actual.each { |cookie| cookie.delete(:expires) }

data/spec/watirspec/elements/date_field_spec.rb

@@ -124,12 +124,29 @@ module Watir
 
     # Manipulation methods
     describe '#value=' do
-      it 'sets the value of the element' do
+      it 'sets the value of the element to a Date' do
         date = browser.date_field(id: 'html5_date')
         date.value = Date.today
         expect(Date.parse(date.value)).to eq Date.today
       end
 
+      it 'sets the value of the element to a Time' do
+        date = browser.date_field(id: 'html5_date')
+        date.value = ::Time.now
+        expect(Date.parse(date.value)).to eq Date.today
+      end
+
+      it 'sets the value of the element to an arbitrary class that responds to #strftime' do
+        instance_like_date = ::Object.new
+        def instance_like_date.strftime(_)
+          '2022-10-11'
+        end
+
+        date = browser.date_field(id: 'html5_date')
+        date.value = instance_like_date
+        expect(date.value).to eq '2022-10-11'
+      end
+
       it 'sets the value when accessed through the enclosing Form' do
         date_field = browser.form(id: 'new_user').date_field(id: 'html5_date')
         date_field.value = Date.today

data/spec/watirspec/elements/date_time_field_spec.rb

@@ -124,7 +124,7 @@ module Watir
 
     # Manipulation methods
     describe '#value=' do
-      it 'sets the value of the element' do
+      it 'sets the value of the element to a Time' do
         date_time = ::Time.now
         date_time_field = browser.date_time_field(id: 'html5_datetime-local')
         date_time_field.value = date_time
@@ -132,6 +132,25 @@ module Watir
           .to eq date_time.strftime('%Y-%m-%dT%H:%M')
       end
 
+      it 'sets the value of the element to a DateTime' do
+        date_time = DateTime.now
+        date_time_field = browser.date_time_field(id: 'html5_datetime-local')
+        date_time_field.value = date_time
+        expect(::Time.parse(date_time_field.value).strftime('%Y-%m-%dT%H:%M'))
+          .to eq date_time.strftime('%Y-%m-%dT%H:%M')
+      end
+
+      it 'sets the value of the element to an arbitrary class that responds to #strftime' do
+        date_time = ::Object.new
+        def date_time.strftime(_)
+          '2022-10-11T12:13'
+        end
+
+        date_time_field = browser.date_time_field(id: 'html5_datetime-local')
+        date_time_field.value = date_time
+        expect(date_time_field.value).to eq '2022-10-11T12:13'
+      end
+
       it 'sets the value when accessed through the enclosing Form' do
         date_time = ::Time.now
         date_time_field = browser.form(id: 'new_user').date_time_field(id: 'html5_datetime-local')

data/spec/watirspec/shadow_root_spec.rb

@@ -39,7 +39,7 @@ module Watir
         end
       end
 
-      describe 'locating', except: {browser: :firefox, reason: 'location not supported yet'} do
+      describe 'locating' do
         it 'locates a nested element' do
           shadow_root = browser.div(id: 'shadow_host').shadow_root
           expect(shadow_root.element.id).to eq('shadow_content')
@@ -85,6 +85,8 @@ module Watir
         it 'click! elements within the shadow dom' do
           shadow_root = browser.div(id: 'shadow_host').shadow_root
           shadow_root.link.click!
+
+          browser.wait_while(url: /shadow_dom|blank/)
           expect(browser.url).to include('scroll.html')
         end
 

data/spec/watirspec/support/rspec_matchers.rb

@@ -1,36 +1,45 @@
 # frozen_string_literal: true
 
 if defined?(RSpec)
-  RSpec::Matchers.define :have_deprecated do |deprecation|
-    match do |actual|
-      # Suppresses logging output to stdout while ensuring that it is still happening
-      default_output = Selenium::WebDriver.logger.io
-      io = StringIO.new
-      Watir.logger.output = io
+  LEVELS = %w[warning info deprecated].freeze
 
-      actual.call
+  LEVELS.each do |level|
+    RSpec::Matchers.define "have_#{level}" do |entry|
+      match do |actual|
+        # Suppresses logging output to stdout while ensuring that it is still happening
+        default_output = Watir.logger.io
+        io = StringIO.new
+        Watir.logger.output = io
 
-      Watir.logger.output = default_output
-      @deprecations_found = (io.rewind && io.read).scan(/DEPRECATION\] \[:([^\]]*)\]/).flatten.map(&:to_sym)
-      expect(Array(deprecation).sort).to eq(@deprecations_found.sort)
-    end
+        begin
+          actual.call
+        rescue StandardError => e
+          raise e, 'Can not evaluate output when statement raises an exception'
+        ensure
+          Watir.logger.output = default_output
+        end
 
-    failure_message do
-      but_message = if @deprecations_found.nil? || @deprecations_found.empty?
-                      'no deprecations were found'
-                    else
-                      "instead these deprecations were found: [#{@deprecations_found.join(', ')}]"
-                    end
-      "expected :#{deprecation} to have been deprecated, but #{but_message}"
-    end
+        @entries_found = (io.rewind && io.read).scan(/\[:([^\]]*)\]/).flatten.map(&:to_sym)
+        expect(Array(entry).sort).to eq(@entries_found.sort)
+      end
 
-    failure_message_when_negated do
-      but_message = "it was found among these deprecations: [#{@deprecations_found.join(', ')}]"
-      "expected :#{deprecation} not to have been deprecated, but #{but_message}"
-    end
+      failure_message do
+        but_message = if @entries_found.nil? || @entries_found.empty?
+                        "no #{entry} entries were reported"
+                      else
+                        "instead these entries were found: [#{@entries_found.join(', ')}]"
+                      end
+        "expected :#{entry} to have been logged, but #{but_message}"
+      end
 
-    def supports_block_expectations?
-      true
+      failure_message_when_negated do
+        but_message = "it was found among these entries: [#{@entries_found.join(', ')}]"
+        "expected :#{entry} not to have been logged, but #{but_message}"
+      end
+
+      def supports_block_expectations?
+        true
+      end
     end
   end
 

data/spec/watirspec/window_switching_spec.rb

@@ -146,6 +146,7 @@ module Watir
         browser.goto WatirSpec.url_for('window_switching.html')
         browser.a(id: 'open').click
         browser.windows.wait_until(size: 2)
+        browser.wait_until { |b| !b.window(title: 'about:blank').exist? }
       end
 
       it 'allows actions on first window after opening second',
@@ -474,7 +475,7 @@ module Watir
 
         browser.window.minimize
 
-        browser.wait_until { |b| b.execute_script('return document.visibilityState;') != 'visible' }
+        browser.wait_until { |b| !%w[visible normal].include?(b.execute_script('return document.visibilityState;')) }
 
         expect(browser.execute_script('return document.visibilityState;')).to eq 'hidden'
         browser.window.maximize

data/watir.gemspec

@@ -8,7 +8,7 @@ require 'watir/version'
 Gem::Specification.new do |s|
   s.name = 'watir'
   s.version = Watir::VERSION
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 3.0.0'
 
   s.platform = Gem::Platform::RUBY
   s.authors = ['Alex Rodionov', 'Titus Fortner', 'Justin Ko']
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop-rake', '~> 0.6'
   s.add_development_dependency 'rubocop-rspec', '~> 2.16'
   s.add_development_dependency 'selenium_statistics'
-  s.add_development_dependency 'selenium-webdriver', '~> 4.7'
+  s.add_development_dependency 'selenium-webdriver', '~> 4.11'
   s.add_development_dependency 'simplecov-console'
   s.add_development_dependency 'webidl', '>= 0.2.2'
   s.add_development_dependency 'yard', '> 0.9.11'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 7.2.2
+  version: 7.3.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regexp_parser
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.11'
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
@@ -627,7 +627,6 @@ files:
 - spec/watirspec/window_switching_spec.rb
 - spec/watirspec_helper.rb
 - support/doctest_helper.rb
-- support/travis.sh
 - support/version_differ.rb
 - watir.gemspec
 homepage: https://github.com/watir/watir
@@ -643,7 +642,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/support/travis.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-sh -e /etc/init.d/xvfb start
-
-if [[ "$RAKE_TASK" = "yard:doctest" ]]; then
-  mkdir ~/.yard
-  bundle exec yard config -a autoload_plugins yard-doctest
-fi
-
-pwd
-echo "$RUBY_VERSION" >> .ruby-version
-cat .ruby-version