Merge pull request #2832 from wynksaiddestroy/ruby-4-fix-test-suite-and-ci

twalpole · web-flow · commit fcd2c2fbb872 · 2026-07-06T14:28:54.000-07:00
Ensure Ruby 4 compatibility: fix test suite and CI
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,11 +23,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.2", "3.3", "3.4"]
+        ruby: ["3.2", "3.3", "3.4", "4.0"]
         task: ["rack_smoke", "cucumber"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -47,11 +47,11 @@ jobs:
       # Ensure all jobs are run to completion
       fail-fast: false
       matrix:
-        ruby: ["3.2"]
+        ruby: ["4.0"]
         task: ["spec_chrome", "spec_firefox"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -72,11 +72,11 @@ jobs:
       # Ensure all jobs are run to completion
       fail-fast: false
       matrix:
-        ruby: ["3.2"]
+        ruby: ["4.0"]
         task: ["spec_chrome", "spec_firefox"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install non-ruby dependencies
         run: |
           sudo apt-get update
@@ -98,7 +98,7 @@ jobs:
   #       ruby: ["3.0"]
 
   #   steps:
-  #     - uses: actions/checkout@v4
+  #     - uses: actions/checkout@v6
 
   #     - name: Set up Ruby
   #       uses: ruby/setup-ruby@v1
@@ -118,7 +118,7 @@ jobs:
   #       ruby: ["3.1"]
 
   #   steps:
-  #     - uses: actions/checkout@v4
+  #     - uses: actions/checkout@v6
 
   #     - name: Set up Ruby
   #       uses: ruby/setup-ruby@v1
@@ -137,11 +137,11 @@ jobs:
       # Ensure all jobs are run to completion
       fail-fast: false
       matrix:
-        ruby: ["3.2"]
+        ruby: ["4.0"]
         task: ["spec_chrome", "spec_firefox"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install non-ruby dependencies
         run: |
           sudo apt-get update
@@ -165,11 +165,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.4"]
+        ruby: ["4.0"]
         task: ["spec_rack"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -78,6 +78,10 @@ Layout/LineLength:
 
 #################### Lint ####################
 
+Lint/Debugger:
+  Exclude:
+    - 'lib/capybara/session.rb'
+
 Lint/EmptyBlock:
   Exclude:
     - 'lib/capybara/spec/**/*'
@@ -171,6 +175,10 @@ RSpec/ExampleWording:
 RSpec/InstanceVariable:
   AssignmentOnly: true
 
+RSpec/LeakyLocalVariable:
+  Exclude:
+    - 'spec/selenium_spec_firefox.rb'
+
 RSpec/MultipleExpectations:
   Enabled: false
 
@@ -180,6 +188,11 @@ RSpec/NestedGroups:
 RSpec/NoExpectationExample:
   Enabled: false
 
+RSpec/Output:
+  Exclude:
+    - 'spec/selenium_spec_chrome_remote.rb'
+    - 'spec/selenium_spec_firefox_remote.rb'
+
 RSpec/PredicateMatcher:
   Exclude:
     - 'spec/basic_node_spec.rb'
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'bundler', '< 3.0'
+gem 'bundler'
 gemspec
 
 gem 'xpath', github: 'teamcapybara/xpath'
diff --git a/capybara.gemspec b/capybara.gemspec
@@ -39,13 +39,15 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('regexp_parser', ['>=1.5', '<3.0'])
   s.add_runtime_dependency('xpath', ['~>3.2'])
 
+  s.add_development_dependency('benchmark')
   s.add_development_dependency('byebug') unless RUBY_PLATFORM == 'java'
   s.add_development_dependency('coveralls')
   s.add_development_dependency('cucumber', ['>= 2.3.0'])
   s.add_development_dependency('erubi') # dependency specification needed by rbx
   s.add_development_dependency('irb')
   s.add_development_dependency('launchy', ['>= 2.0.4'])
   s.add_development_dependency('minitest')
+  s.add_development_dependency('ostruct')
   s.add_development_dependency('puma')
   s.add_development_dependency('rackup')
   s.add_development_dependency('rake')
diff --git a/gemfiles/Gemfile.base-versions b/gemfiles/Gemfile.base-versions
@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'bundler', '< 3.0'
+gem 'bundler'
 gemspec path: '..'
 
 gem 'rack', '~>2.0.0'
 gem 'nokogiri', '~>1.11.0'
 gem 'xpath', '~>3.2.0'
-gem 'rspec', '~>3.5.0'
+gem 'rspec', '~>3.13.0'
 gem 'selenium-webdriver', '~>4.11.0'
 gem 'irb', '~>1.1.1'
diff --git a/gemfiles/Gemfile.beta-versions b/gemfiles/Gemfile.beta-versions
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'bundler', '< 3.0'
+gem 'bundler'
 gemspec path: '..'
 
 gem 'pkg-config' # needed by nokogiri
diff --git a/gemfiles/Gemfile.chrome_edge b/gemfiles/Gemfile.chrome_edge
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'bundler', '< 3.0'
+gem 'bundler'
 gemspec path: '..'
 
 gem 'xpath', github: 'teamcapybara/xpath'
diff --git a/gemfiles/Gemfile.edge-firefox b/gemfiles/Gemfile.edge-firefox
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'bundler', '< 3.0'
+gem 'bundler'
 gemspec path: '..'
 
 gem 'xpath', github: 'teamcapybara/xpath'
diff --git a/gemfiles/Gemfile.ie b/gemfiles/Gemfile.ie
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'bundler', '< 3.0'
+gem 'bundler'
 gemspec path: '..'
diff --git a/gemfiles/Gemfile.rack2 b/gemfiles/Gemfile.rack2
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'bundler', '< 3.0'
+gem 'bundler'
 gemspec path: '..'
 
 gem 'rack', '~>2.0'
diff --git a/gemfiles/Gemfile.rack3 b/gemfiles/Gemfile.rack3
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'bundler', '< 3.0'
+gem 'bundler'
 gemspec path: '..'
 
 gem 'rack', '~>3.0'
diff --git a/lib/capybara/queries/base_query.rb b/lib/capybara/queries/base_query.rb
@@ -47,7 +47,7 @@ def expects_none?
       # @param [Integer] count     The actual number. Should be coercible via Integer()
       #
       def matches_count?(count)
-        return (Integer(options[:count]) == count) if options[:count]
+        return Integer(options[:count]) == count if options[:count]
         return false if options[:maximum] && (Integer(options[:maximum]) < count)
         return false if options[:minimum] && (Integer(options[:minimum]) > count)
         return false if options[:between] && !options[:between].include?(count)
diff --git a/lib/capybara/selenium/nodes/chrome_node.rb b/lib/capybara/selenium/nodes/chrome_node.rb
@@ -70,18 +70,18 @@ def visible?
   def send_keys(*args)
     args.chunk { |inp| inp.is_a?(String) && inp.match?(/\p{Emoji Presentation}/) }
         .each do |contains_emoji, inputs|
-      if contains_emoji
-        inputs.join.grapheme_clusters.chunk { |gc| gc.match?(/\p{Emoji Presentation}/) }
-              .each do |emoji, clusters|
-          if emoji
-            driver.send(:execute_cdp, 'Input.insertText', text: clusters.join)
+          if contains_emoji
+            inputs.join.grapheme_clusters.chunk { |gc| gc.match?(/\p{Emoji Presentation}/) }
+                  .each do |emoji, clusters|
+                    if emoji
+                      driver.send(:execute_cdp, 'Input.insertText', text: clusters.join)
+                    else
+                      super(clusters.join)
+                    end
+            end
           else
-            super(clusters.join)
+            super(*inputs)
           end
-        end
-      else
-        super(*inputs)
-      end
     end
   end
 
diff --git a/lib/capybara/selenium/nodes/edge_node.rb b/lib/capybara/selenium/nodes/edge_node.rb
@@ -74,18 +74,18 @@ def visible?
   def send_keys(*args)
     args.chunk { |inp| inp.is_a?(String) && inp.match?(/\p{Emoji Presentation}/) }
         .each do |contains_emoji, inputs|
-      if contains_emoji
-        inputs.join.grapheme_clusters.chunk { |gc| gc.match?(/\p{Emoji Presentation}/) }
-              .each do |emoji, clusters|
-          if emoji
-            driver.send(:execute_cdp, 'Input.insertText', text: clusters.join)
+          if contains_emoji
+            inputs.join.grapheme_clusters.chunk { |gc| gc.match?(/\p{Emoji Presentation}/) }
+                  .each do |emoji, clusters|
+                    if emoji
+                      driver.send(:execute_cdp, 'Input.insertText', text: clusters.join)
+                    else
+                      super(clusters.join)
+                    end
+            end
           else
-            super(clusters.join)
+            super(*inputs)
           end
-        end
-      else
-        super(*inputs)
-      end
     end
   end
 
diff --git a/lib/capybara/spec/session/assert_style_spec.rb b/lib/capybara/spec/session/assert_style_spec.rb
@@ -12,7 +12,7 @@
     @session.visit('/with_html')
     expect do
       @session.find(:css, '#first').assert_matches_style(display: 'inline')
-    end.to raise_error(Capybara::ExpectationNotMet, 'Expected node to have styles {"display"=>"inline"}. Actual styles were {"display"=>"block"}')
+    end.to raise_error(Capybara::ExpectationNotMet, 'Expected node to have styles {"display" => "inline"}. Actual styles were {"display" => "block"}')
   end
 
   it 'should wait for style', requires: %i[css js] do
diff --git a/lib/capybara/spec/session/has_css_spec.rb b/lib/capybara/spec/session/has_css_spec.rb
@@ -62,7 +62,7 @@
 
       expect do
         expect(@session).to have_css('p', style: { 'line-height': '30px' })
-      end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /with styles \{:"line-height"=>"30px"\}/)
+      end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /with styles \{:"line-height" => "30px"\}/)
     end
   end
 
diff --git a/spec/minitest_spec.rb b/spec/minitest_spec.rb
@@ -15,7 +15,7 @@ def teardown
     Capybara.reset_sessions!
   end
 
-  def self.test_order
+  def self.run_order
     :sorted
   end
 
@@ -168,7 +168,7 @@ def test_assert_sibling
     output = StringIO.new
     reporter = Minitest::SummaryReporter.new(output)
     reporter.start
-    MinitestTest.run reporter, {}
+    MinitestTest.run_suite reporter
     reporter.report
     expect(output.string).to include('23 runs, 56 assertions, 0 failures, 0 errors, 1 skips')
   end
diff --git a/spec/minitest_spec_spec.rb b/spec/minitest_spec_spec.rb
@@ -16,7 +16,7 @@ class MinitestSpecTest < Minitest::Spec
     Capybara.reset_sessions!
   end
 
-  def self.test_order
+  def self.run_order
     :sorted
   end
 
@@ -157,7 +157,7 @@ def self.test_order
     output = StringIO.new
     reporter = Minitest::SummaryReporter.new(output)
     reporter.start
-    MinitestSpecTest.run reporter, {}
+    MinitestSpecTest.run_suite reporter, {}
     reporter.report
     expect(output.string).to include('22 runs, 44 assertions, 1 failures, 0 errors, 1 skips')
     # Make sure error messages are displayed
