Merge pull request #2815 from teamcapybara/first_free_time_in_a_year

twalpole · web-flow · commit 4e0288c3cf5c · 2025-08-09T13:21:07.000-07:00
Start getting this repo back to where it should be
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0", "3.1", "3.2"]
+        ruby: ["3.2", "3.3", "3.4"]
         task: ["rack_smoke", "cucumber"]
 
     steps:
@@ -72,7 +72,7 @@ jobs:
       # Ensure all jobs are run to completion
       fail-fast: false
       matrix:
-        ruby: ["3.0"]
+        ruby: ["3.2"]
         task: ["spec_chrome", "spec_firefox"]
 
     steps:
@@ -137,7 +137,7 @@ jobs:
       # Ensure all jobs are run to completion
       fail-fast: false
       matrix:
-        ruby: ["3.0"]
+        ruby: ["3.2"]
         task: ["spec_chrome", "spec_firefox"]
 
     steps:
@@ -165,7 +165,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.2"]
+        ruby: ["3.4"]
         task: ["spec_rack"]
 
     steps:
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,14 +1,14 @@
-require:
+plugins:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rake
-  - rubocop-rspec
   - rubocop-capybara
+  - rubocop-rspec
 
 AllCops:
   NewCops: enable
   DisabledByDefault: false
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
   Exclude:
       - 'vendor/**/*'
       - 'gemfiles/vendor/**/*'
@@ -24,6 +24,12 @@ RSpec/SpecFilePathFormat:
 RSpec/SpecFilePathSuffix:
   Enabled: false
 
+Capybara/FindAllFirst:
+  Enabled: false
+
+Capybara/NegationMatcherAfterVisit:
+  Enabled: false
+
 Capybara/RSpec/HaveSelector:
   Enabled: false
 
@@ -128,9 +134,11 @@ Naming/MethodParameterName:
     - 'y'
     - 'on'
 
-Naming/PredicateName:
+Naming/PredicatePrefix:
   Exclude:
     - '**/*/*matchers.rb'
+    - '**/*/matchers/base.rb'
+    - '**/*/matchers/match_style.rb'
 
 #################### Performance ####################
 
@@ -142,8 +150,8 @@ Performance/StringIdentifierArgument:
 
 #################### RSpec ####################
 
-RSpec/Capybara/FeatureMethods:
-  Enabled: false
+# Capybara/FeatureMethods:
+#   Enabled: false
 
 RSpec/ContextWording:
   Enabled: false
@@ -157,8 +165,8 @@ RSpec/ExampleLength:
 RSpec/ExampleWording:
   Enabled: false
 
-RSpec/FilePath:
-  Enabled: false
+# RSpec/FilePath:
+#   Enabled: false
 
 RSpec/InstanceVariable:
   AssignmentOnly: true
@@ -227,3 +235,31 @@ Style/SingleLineMethods:
 Style/SpecialGlobalVars:
   Exclude:
     - 'capybara.gemspec'
+
+### Enable and fix
+Style/KeywordArgumentsMerging:
+  Enabled: false
+
+Gemspec/AddRuntimeDependency:
+  Enabled: false
+
+Lint/UselessConstantScoping:
+  Enabled: false
+
+Naming/PredicateMethod:
+  Enabled: false
+
+RSpec/IncludeExamples:
+  Enabled: false
+
+Style/SuperArguments:
+  Enabled: false
+
+Style/FileNull:
+  Enabled: false
+
+Naming/BlockForwarding:
+  Enabled: false
+
+Style/ArrayIntersect:
+  Enabled: false
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,6 @@ gem 'bundler', '< 3.0'
 gemspec
 
 gem 'xpath', github: 'teamcapybara/xpath'
-
 # gem 'rack-test', github: 'rack/rack-test'
 
 group :doc do
diff --git a/Rakefile b/Rakefile
@@ -10,7 +10,7 @@ RuboCop::RakeTask.new
 
 desc 'Run all examples with Firefox'
 
-rspec_opts = %w[--color]
+rspec_opts = '--color'
 
 RSpec::Core::RakeTask.new(:spec_firefox) do |t|
   t.rspec_opts = rspec_opts
diff --git a/capybara.gemspec b/capybara.gemspec
@@ -8,7 +8,7 @@ require 'capybara/version'
 Gem::Specification.new do |s|
   s.name = 'capybara'
   s.version = Capybara::VERSION
-  s.required_ruby_version = '>= 3.0.0'
+  s.required_ruby_version = '>= 3.2.0'
   s.license = 'MIT'
 
   s.authors = ['Thomas Walpole', 'Jonas Nicklas']
@@ -52,10 +52,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', ['>= 3.5.0'])
   s.add_development_dependency('rspec-instafail')
   s.add_development_dependency('rubocop', ['~>1.1'])
+  s.add_development_dependency('rubocop-capybara')
   s.add_development_dependency('rubocop-minitest')
   s.add_development_dependency('rubocop-performance')
   s.add_development_dependency('rubocop-rake')
-  s.add_development_dependency('rubocop-rspec', ['~>2.0'])
+  s.add_development_dependency('rubocop-rspec', ['~>3.0'])
   s.add_development_dependency('sauce_whisk')
   s.add_development_dependency('selenium_statistics')
   s.add_development_dependency('selenium-webdriver', ['~>4.8'])
diff --git a/gemfiles/Gemfile.base-versions b/gemfiles/Gemfile.base-versions
@@ -7,6 +7,6 @@ gem 'rack', '~>2.0.0'
 gem 'nokogiri', '~>1.11.0'
 gem 'xpath', '~>3.2.0'
 gem 'rspec', '~>3.5.0'
-gem 'selenium-webdriver', '~>4.8.0'
+gem 'selenium-webdriver', '~>4.11.0'
 gem 'irb', '~>1.1.1'
 gem 'webdrivers', '~>5.0.0'
diff --git a/lib/capybara/node/actions.rb b/lib/capybara/node/actions.rb
@@ -358,7 +358,7 @@ def _update_style(element, style)
 
       def _reset_style(element)
         element.execute_script(RESET_STYLE_SCRIPT)
-      rescue StandardError # rubocop:disable Lint/SuppressedException swallow extra errors
+      rescue StandardError # rubocop:disable Lint/SuppressedException -- swallow extra errors
       end
 
       def _check_with_label(selector, checked, locator,
diff --git a/lib/capybara/queries/base_query.rb b/lib/capybara/queries/base_query.rb
@@ -60,11 +60,11 @@ def matches_count?(count)
       # Generates a failure message from the query description and count options.
       #
       def failure_message
-        +"expected to find #{description}" << count_message
+        "expected to find #{description}" << count_message
       end
 
       def negative_failure_message
-        +"expected not to find #{description}" << count_message
+        "expected not to find #{description}" << count_message
       end
 
     private
diff --git a/lib/capybara/queries/selector_query.rb b/lib/capybara/queries/selector_query.rb
@@ -177,11 +177,11 @@ def supports_exact?
       end
 
       def failure_message
-        +"expected to find #{applied_description}" << count_message
+        "expected to find #{applied_description}" << count_message
       end
 
       def negative_failure_message
-        +"expected not to find #{applied_description}" << count_message
+        "expected not to find #{applied_description}" << count_message
       end
 
     private
diff --git a/lib/capybara/queries/style_query.rb b/lib/capybara/queries/style_query.rb
@@ -27,8 +27,8 @@ def resolves_for?(node)
       end
 
       def failure_message
-        +"Expected node to have styles #{@expected_styles.inspect}. " \
-         "Actual styles were #{@actual_styles.inspect}"
+        "Expected node to have styles #{@expected_styles.inspect}. " \
+          "Actual styles were #{@actual_styles.inspect}"
       end
 
     private
diff --git a/lib/capybara/rack_test/node.rb b/lib/capybara/rack_test/node.rb
@@ -225,7 +225,7 @@ def set_input(value) # rubocop:disable Naming/AccessorMethodName
       native.remove
     else
       value.to_s.tap do |set_value|
-        if set_value.end_with?("\n") && form&.css('input, textarea')&.count == 1
+        if set_value.end_with?("\n") && (form&.css('input, textarea')&.count == 1) # rubocop:disable Style/CollectionQuerying
           native['value'] = set_value.to_s.chop
           Capybara::RackTest::Form.new(driver, form).submit(self)
         else
@@ -293,7 +293,7 @@ def radio?
   end
 
   def text_or_password?
-    input_field? && (type == 'text' || type == 'password')
+    input_field? && %w[text password].include?(type)
   end
 
   def input_field?
diff --git a/lib/capybara/registrations/drivers.rb b/lib/capybara/registrations/drivers.rb
@@ -36,6 +36,11 @@
     opts.add_argument('--disable-gpu') if Gem.win_platform?
     # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary
     opts.add_argument('--disable-site-isolation-trials')
+
+    # https://github.com/teamcapybara/capybara/issues/2796#issuecomment-2678172710
+    opts.add_argument('disable-background-timer-throttling')
+    opts.add_argument('disable-backgrounding-occluded-windows')
+    opts.add_argument('disable-renderer-backgrounding')
   end
 
   Capybara::Selenium::Driver.new(app, **{ :browser => :chrome, options_key => browser_options })
diff --git a/lib/capybara/rspec/matchers/have_selector.rb b/lib/capybara/rspec/matchers/have_selector.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable Naming/PredicatePrefix
+
 require 'capybara/rspec/matchers/base'
 
 module Capybara
@@ -67,3 +69,5 @@ def description = 'have any selectors'
     end
   end
 end
+
+# rubocop:enable Naming/PredicatePrefix
diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb
@@ -367,6 +367,8 @@ def clear_session_storage
   end
 
   def clear_local_storage
+    # selenium-webdriver 4.30.0 removed HTML5 storage accessors -- not really sure why
+    # can we replicate this robustly via CDP?
     if @browser.respond_to? :local_storage
       @browser.local_storage.clear
     else
diff --git a/lib/capybara/selenium/extensions/find.rb b/lib/capybara/selenium/extensions/find.rb
@@ -102,7 +102,7 @@ def es_context
         respond_to?(:execute_script) ? self : driver
       end
 
-      def is_displayed_atom # rubocop:disable Naming/PredicateName
+      def is_displayed_atom # rubocop:disable Naming/PredicatePrefix
         @@is_displayed_atom ||= begin # rubocop:disable Style/ClassVars
           browser.send(:bridge).send(:read_atom, 'isDisplayed')
         rescue StandardError
diff --git a/lib/capybara/selenium/nodes/chrome_node.rb b/lib/capybara/selenium/nodes/chrome_node.rb
@@ -120,6 +120,6 @@ def chromedriver_version
   def native_displayed?
     (driver.options[:native_displayed] != false) &&
       chromedriver_supports_displayed_endpoint? &&
-      (!ENV['DISABLE_CAPYBARA_SELENIUM_OPTIMIZATIONS'])
+      !ENV['DISABLE_CAPYBARA_SELENIUM_OPTIMIZATIONS']
   end
 end
diff --git a/lib/capybara/selenium/nodes/edge_node.rb b/lib/capybara/selenium/nodes/edge_node.rb
@@ -105,6 +105,6 @@ def chrome_edge?
   def native_displayed?
     (driver.options[:native_displayed] != false) &&
       # chromedriver_supports_displayed_endpoint? &&
-      (!ENV['DISABLE_CAPYBARA_SELENIUM_OPTIMIZATIONS'])
+      !ENV['DISABLE_CAPYBARA_SELENIUM_OPTIMIZATIONS']
   end
 end
diff --git a/lib/capybara/server/animation_disabler.rb b/lib/capybara/server/animation_disabler.rb
@@ -50,7 +50,7 @@ def insert_disable(html, nonces)
       def directive_nonces(headers)
         headers.fetch('Content-Security-Policy', '')
                .split(';')
-               .map(&:split) # rubocop:disable Style/MapToHash
+               .map(&:split)
                .to_h do |s|
                  [
                    s[0], s[1..].filter_map do |value|
diff --git a/lib/capybara/spec/session/scroll_spec.rb b/lib/capybara/spec/session/scroll_spec.rb
@@ -44,7 +44,7 @@
   it 'can scroll the window to the vertical center' do
     @session.scroll_to :center
     max_scroll = @session.evaluate_script('document.documentElement.scrollHeight - document.documentElement.clientHeight')
-    expect(@session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')).to eq [0, max_scroll / 2]
+    expect(@session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')).to match [0, be_within(1).of(max_scroll / 2)]
   end
 
   it 'can scroll the window to specific location' do
@@ -75,7 +75,8 @@
     scrolling_element.scroll_to(el, align: :center)
     el_center = el.evaluate_script('(function(rect){return (rect.top + rect.bottom)/2})(this.getBoundingClientRect())')
     scrollable_center = scrolling_element.evaluate_script('(this.clientHeight / 2) + this.getBoundingClientRect().top')
-    expect(el_center).to be_within(1).of(scrollable_center)
+    # Firefox reports floats and can be slightly outside 1 difference - make 2 instaed
+    expect(el_center).to be_within(2).of(scrollable_center)
   end
 
   it 'can scroll the scrolling element to the top' do
@@ -96,7 +97,7 @@
     scrolling_element = @session.find(:css, '#scrollable')
     scrolling_element.scroll_to :center
     max_scroll = scrolling_element.evaluate_script('this.scrollHeight - this.clientHeight')
-    expect(scrolling_element.evaluate_script('[this.scrollLeft, this.scrollTop]')).to eq [0, max_scroll / 2]
+    expect(scrolling_element.evaluate_script('[this.scrollLeft, this.scrollTop]')).to match [0, be_within(1).of(max_scroll / 2)]
   end
 
   it 'can scroll the scrolling element to specific location' do
diff --git a/lib/capybara/spec/session/window/switch_to_window_spec.rb b/lib/capybara/spec/session/window/switch_to_window_spec.rb
@@ -76,7 +76,7 @@
 
     it 'should return window' do
       window = @session.switch_to_window { @session.title == 'Title of popup two' }
-      expect((@session.windows - [@window])).to include(window)
+      expect(@session.windows - [@window]).to include(window)
     end
 
     it "should raise error when invoked inside `within` as it's nonsense" do
diff --git a/lib/capybara/spec/test_app.rb b/lib/capybara/spec/test_app.rb
@@ -19,6 +19,7 @@ def initialize(string1, msg)
   set :static, true
   set :raise_errors, true
   set :show_exceptions, false
+  set :host_authorization, { permitted_hosts: [] }
 
   # Also check lib/capybara/spec/views/*.erb for pages not listed here
 
diff --git a/lib/capybara/spec/views/react.erb b/lib/capybara/spec/views/react.erb
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/react/umd/react.development.js"></script>
-    <script src="https://unpkg.com/react-dom/umd/react-dom.development.js"></script>
+    <script src="https://unpkg.com/react@18/umd/react.development.js"></script>
+    <script src="https://unpkg.com/react-dom@18/umd/react-dom.development.js"></script>
   </head>
   <body>
     <div id="root"></div>
diff --git a/spec/basic_node_spec.rb b/spec/basic_node_spec.rb
@@ -4,6 +4,7 @@
 
 RSpec.describe Capybara do
   include Capybara::RSpecMatchers
+
   describe '.string' do
     let :string do
       described_class.string <<-STRING
diff --git a/spec/rack_test_spec.rb b/spec/rack_test_spec.rb
@@ -39,6 +39,7 @@ module TestSessions
 
 RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
   include Capybara::RSpecMatchers
+
   context 'with rack test driver' do
     let(:session) { TestSessions::RackTest }
 
diff --git a/spec/selector_spec.rb b/spec/selector_spec.rb
@@ -4,6 +4,7 @@
 
 RSpec.describe Capybara do
   include Capybara::RSpecMatchers
+
   describe 'Selectors' do
     let :string do
       described_class.string <<-STRING
diff --git a/spec/selenium_spec_chrome.rb b/spec/selenium_spec_chrome.rb
diff --git a/spec/selenium_spec_chrome_remote.rb b/spec/selenium_spec_chrome_remote.rb
diff --git a/spec/selenium_spec_edge.rb b/spec/selenium_spec_edge.rb
diff --git a/spec/selenium_spec_firefox.rb b/spec/selenium_spec_firefox.rb
diff --git a/spec/selenium_spec_firefox_remote.rb b/spec/selenium_spec_firefox_remote.rb
diff --git a/spec/selenium_spec_ie.rb b/spec/selenium_spec_ie.rb
diff --git a/spec/selenium_spec_safari.rb b/spec/selenium_spec_safari.rb
diff --git a/spec/shared_selenium_session.rb b/spec/shared_selenium_session.rb
