capybara-lockstep 2.2.3 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09d7ce0bf2ef366b5839f874f614e6ddee1f71bb8ab38f7d4f42340b8d832bf5'
-  data.tar.gz: 538d699762cdb5c1d547c2feccdccbabc1d07582f32f6b6fb0b4a52b8b9b99f6
+  metadata.gz: b10f22c42f855e5a7ca55b34c6a7ab33da9712f8f345f4ff6278e93756aca6a6
+  data.tar.gz: 670652bccdf353c723d0c3466be51bcccff00f9a189306a142caed2e10714f06
 SHA512:
-  metadata.gz: 3c12ea7389c84bd96e19aa109df3065d3bc3491dccc757194d0de67396cd4a267c4cef4bcb6a5f9ac55452ece41ff2a593cd4263639c1eae033ec96d9931c84b
-  data.tar.gz: 6f53dc9d09ef6923add0774bad4dc80ab5f5da9d16ed0d8ec5fbe3fb6121963e64beec4ff4f733f2381d2c1d5a46b4e4466c3cc7f108538456b2a98be9974ef9
+  metadata.gz: ef6f4cb2a0c2c105e29a99cbaf4f8c2467526b38741dd47a8eb772a4df440c7a0ef27f8e05958d4bbc07746c4e0d9a63763ebd52372db61efbddb81b1d1e90ba
+  data.tar.gz: c309f4a88411eae4ea65645fe3d99a97a8558af368057aff51d06dd146f289c0ff8b1f3b5c48764200eeb9c221c1b5adc1ff3982428ff51b0699ebfe98f79f46

data/.github/workflows/test.yml

@@ -12,20 +12,33 @@ on:
     - main
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 3
     strategy:
       fail-fast: false
       matrix:
         include:
-        - ruby: 2.7.2
+        - ruby: 3.2.0
           gemfile: Gemfile
+          capybara_driver: selenium
         - ruby: 3.2.0
           gemfile: Gemfile
+          capybara_driver: cuprite
+        - ruby: 3.4.1
+          gemfile: Gemfile
+          capybara_driver: selenium
         - ruby: 3.4.1
           gemfile: Gemfile
+          capybara_driver: cuprite
+        - ruby: 4.0.1
+          gemfile: Gemfile
+          capybara_driver: selenium
+        - ruby: 4.0.1
+          gemfile: Gemfile
+          capybara_driver: cuprite
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
+      CAPYBARA_DRIVER: "${{ matrix.capybara_driver }}"
     steps:
     - uses: actions/checkout@v3
     - name: Install Chrome
@@ -34,6 +47,7 @@ jobs:
       run: chrome --version
     - name: Install ChromeDriver
       uses: nanasess/setup-chromedriver@master
+      if: "${{ matrix.capybara_driver == 'selenium' }}"
     - name: Install ruby
       uses: ruby/setup-ruby@v1
       with:

data/.gitignore

@@ -11,3 +11,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+.byebug_history

data/.ruby-version

@@ -1 +1 @@
-3.4.1
+4.0.1

data/CHANGELOG.md

@@ -13,6 +13,20 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 -
 
 
+## 2.3.1 - 2026-02-17
+
+### Compatible changes
+
+- Add tests for Ruby 4.0
+- Increase `required_ruby_version` and `activesupport` minimum version in gemspec so people
+  on legacy Ruby and Rails versions don't receive future upgrades
+- Drop tests and support for Ruby < 3 and Rails < 7
+- Drop dependency on `ruby2_keywords`
+
+# 2.3.0
+
+- Added support for cuprite as the capybara driver
+
 # 2.2.3
 
 - Requiring the gem no longer force-loads ActionView (#22)

data/Gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in capybara-lockstep.gemspec
 gemspec
 
-gem 'activesupport', '~> 6.0'
+gem 'activesupport', '~> 8.0'
 gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
@@ -14,9 +14,10 @@ gem 'sinatra'
 gem 'thin' # ruby 3 does not include a webserver
 gem 'puma'
 gem 'byebug'
-gem 'gemika', '>= 0.8.1'
+gem 'gemika'
 gem 'capybara', '>= 3'
 gem 'selenium-webdriver', '>= 4'
+gem 'cuprite'
 
 # The following gems were previously "default gems" (always available) and are now
 # "bundled gems" (need to be explicitly required). Not all gems in our Gemfile.lock (dev only) do that yet.
@@ -24,3 +25,6 @@ gem 'selenium-webdriver', '>= 4'
 # indirect dependencies ourselves.
 gem 'base64' # needed by selenium-webdriver (and potentially others)
 gem 'bigdecimal' # needed by activesupport (and potentially others)
+gem 'ostruct'
+gem 'logger'
+gem 'cgi'

data/Gemfile.lock

@@ -1,21 +1,26 @@
 PATH
   remote: .
   specs:
-    capybara-lockstep (2.2.3)
-      activesupport (>= 4.2)
+    capybara-lockstep (2.3.1)
+      activesupport (>= 7.0)
       capybara (>= 3.0)
-      ruby2_keywords
-      selenium-webdriver (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.1.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     base64 (0.2.0)
@@ -30,24 +35,41 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    cgi (0.5.1)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    cuprite (0.17)
+      capybara (~> 3.0)
+      ferrum (~> 0.17.0)
     daemons (1.4.1)
     diff-lcs (1.5.1)
+    drb (2.2.3)
     eventmachine (1.2.7)
-    gemika (0.8.1)
-    i18n (1.12.0)
+    ferrum (0.17.1)
+      addressable (~> 2.5)
+      base64 (~> 0.2)
+      concurrent-ruby (~> 1.1)
+      webrick (~> 1.7)
+      websocket-driver (~> 0.7)
+    gemika (2.0.0)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
+    json (2.18.1)
+    logger (1.7.0)
     matrix (0.4.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.16.3)
+    minitest (6.0.1)
+      prism (~> 1.5)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.6.1)
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    ostruct (0.6.3)
+    prism (1.9.0)
     public_suffix (5.0.4)
     puma (6.4.0)
       nio4r (~> 2.0)
@@ -77,6 +99,7 @@ GEM
       rspec (>= 3.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
+    securerandom (0.4.1)
     selenium-webdriver (4.1.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
@@ -91,23 +114,32 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     tilt (2.3.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.1.1)
+    webrick (1.9.1)
+    websocket-driver (0.8.0)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 6.0)
+  activesupport (~> 8.0)
   base64
   bigdecimal
   byebug
   capybara (>= 3)
   capybara-lockstep!
-  gemika (>= 0.8.1)
+  cgi
+  cuprite
+  gemika
+  logger
+  ostruct
   puma
   rake (~> 13.0)
   rspec (~> 3.0)

data/README.md

@@ -120,9 +120,9 @@ Installation
 Check if your application satisfies all requirements for capybara-lockstep:
 
 - Capybara 2.0 or higher.
-- Your Capybara driver must use [selenium-webdriver](https://rubygems.org/gems/selenium-webdriver/) 3.0 or higher. capybara-lockstep deactivates itself for any other driver.
+- Your Capybara driver must use [selenium-webdriver](https://rubygems.org/gems/selenium-webdriver/) (>3.0) or [cuprite](https://github.com/rubycdp/cuprite). capybara-lockstep deactivates itself for any other driver.
   There is a [fork](https://github.com/Skalar/capybara-lockstep/tree/playwright-driver) with support for [capybara-playwright-driver](https://github.com/YusukeIwaki/capybara-playwright-driver).
-- This gem was only tested with a Selenium-controlled Chrome browser. [Chrome in headless mode](https://makandracards.com/makandra/492109-running-capybara-tests-in-headless-chrome) is recommended, but not required.
+- This gem was only tested with a Chrome browser. [Chrome in headless mode](https://makandracards.com/makandra/492109-running-capybara-tests-in-headless-chrome) is recommended, but not required.
 - This gem was only tested with Rails, but there's no Rails dependency.
 
 
@@ -460,10 +460,22 @@ Pull requests are welcome on GitHub at <https://github.com/makandra/capybara-loc
 
 After checking out the repo, run `bin/setup` to install dependencies.
 
-Then, run `rake spec` to run the tests.
+For running tests see [Running tests locally](#running-tests-locally) below
 
 You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
+### Running tests locally
+
+capybara-lockstep supports both the `selenium-webdriver` and `cuprite` as drivers for capybara.
+
+Make sure, your chromedriver version is up to date.
+
+To run all the tests for all supported drivers, run `rake spec:all`.
+
+To run all the tests for a specific driver, run `rake spec:selenium` or `rake spec:cuprite`.
+
+The driver can also be specified by setting `CAPYBARA_DRIVER`, so if you want to run a single test for cuprite you can run `CAPYBARA_DRIVER=cuprite bundle exec rspec "spec/features/spec_spec.rb[1]"`.
+
 ### Manually testing a change
 
 To test an unrelased change with a test suite, we recommend to temporarily link the local repository from your test suites's `Gemfile`:
@@ -476,9 +488,12 @@ As an alternative you may also install this gem onto your local machine by runni
 
 ### Releasing a new version
 
-- Update the version number in `version.rb`
- - Run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
- - If RubyGems publishing seems to freeze, try entering your OTP code.
+- Update the version number in `version.rb`. Use Semantic Versioning.
+- Run `bundle install` so our `Gemfile.lock` (for development) gets the new version.
+- Update `CHANGELOG.md`.
+- Commit and push your changes.
+- Run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+- If RubyGems publishing seems to freeze, try entering your OTP code.
 
 
 ## License

data/Rakefile

@@ -2,6 +2,7 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require_relative "tasks/spec_tasks"
 
 RSpec::Core::RakeTask.new(:spec)
 

data/capybara-lockstep.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Synchronize Capybara commands with client-side JavaScript and AJAX requests"
   spec.homepage      = "https://github.com/makandra/capybara-lockstep"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -29,9 +29,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "capybara", ">= 3.0"
-  spec.add_dependency "selenium-webdriver", ">= 4.0"
-  spec.add_dependency "activesupport", ">= 4.2"
-  spec.add_dependency "ruby2_keywords"
+  spec.add_dependency "activesupport", ">= 7.0"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/capybara-lockstep/capybara_ext.rb

@@ -1,5 +1,3 @@
-require 'ruby2_keywords'
-
 module Capybara
   module Lockstep
     module SynchronizeMacros
@@ -13,43 +11,37 @@ module Capybara
 
       def synchronize_before(meth, lazy:)
         @synchronize_before_module.module_eval do
-          define_method meth do |*args, &block|
+          define_method meth do |*args, **kwargs, &block|
             @synchronize_before_count ||= 0
             @synchronize_before_count += 1
             Lockstep.auto_synchronize(lazy: lazy, log: "Synchronizing before ##{meth}") if @synchronize_before_count == 1
-            super(*args, &block)
+            super(*args, **kwargs, &block)
           ensure
             @synchronize_before_count -= 1
           end
-
-          ruby2_keywords meth
         end
       end
 
       def synchronize_after(meth)
         @synchronize_after_module.module_eval do
-          define_method meth do |*args, &block|
+          define_method meth do |*args, **kwargs, &block|
             @synchronize_after_count ||= 0
             @synchronize_after_count += 1
-            super(*args, &block)
+            super(*args, **kwargs, &block)
           ensure
             Lockstep.auto_synchronize(log: "Synchronizing after ##{meth}") if @synchronize_after_count == 1
             @synchronize_after_count -= 1
           end
-
-          ruby2_keywords meth
         end
       end
 
       def unsynchronize_after(meth)
         @unsynchronize_after_module.module_eval do
-          define_method meth do |*args, &block|
-            super(*args, &block)
+          define_method meth do |*args, **kwargs, &block|
+            super(*args, **kwargs, &block)
           ensure
             Lockstep.unsynchronize
           end
-
-          ruby2_keywords meth
         end
       end
     end
@@ -82,7 +74,7 @@ end
 module Capybara
   module Lockstep
     module VisitWithWaiting
-      def visit(*args, &block)
+      def visit(*args, **kwargs, &block)
         # For some reason, in Capybara proper, visit(nil) navigates to the root route.
         # We mimic this behavior for (1) parity and (2) to not crash when we inspect the URL below.
         url = args[0].presence || '/'
@@ -104,15 +96,13 @@ module Capybara
           Lockstep.auto_synchronize(lazy: false, log: "Synchronizing before visiting #{url}")
         end
 
-        super(*args, &block).tap do
+        super(*args, **kwargs, &block).tap do
           if visiting_real_url
             # We haven't yet synchronized the new screen.
             Lockstep.unsynchronize
           end
         end
       end
-
-      ruby2_keywords :visit
     end
   end
 end
@@ -127,7 +117,7 @@ module Capybara
 
       def synchronize_around_script_method(meth)
         mod = Module.new do
-          define_method meth do |script, *args, &block|
+          define_method meth do |script, *args, **kwargs, &block|
             # Synchronization uses execute_script itself, so don't synchronize when
             # we're already synchronizing.
             if !Lockstep.synchronizing?
@@ -142,7 +132,7 @@ module Capybara
               Lockstep.auto_synchronize(lazy: !script_may_navigate_away, log: "Synchronizing before script: #{script}")
             end
 
-            super(script, *args, &block)
+            super(script, *args, **kwargs, &block)
           ensure
             if !Lockstep.synchronizing?
               # We haven't yet synchronized with whatever changes the JavaScript
@@ -150,8 +140,6 @@ module Capybara
               Lockstep.unsynchronize
             end
           end
-
-          ruby2_keywords meth
         end
         prepend(mod)
       end
@@ -176,6 +164,7 @@ driver_specific_node_classes = [
   (Capybara::Selenium::SafariNode  if defined?(Capybara::Selenium::SafariNode)),
   (Capybara::Selenium::EdgeNode    if defined?(Capybara::Selenium::EdgeNode)),
   (Capybara::Selenium::IENode      if defined?(Capybara::Selenium::IENode)),
+  (Capybara::Cuprite::Node         if defined?(Capybara::Cuprite::Node)),
 ].compact.freeze
 
 # For other browsers (like the :remote browser) we instead get a generic node class.
@@ -245,16 +234,14 @@ end
 module Capybara
   module Lockstep
     module SynchronizeWithCatchUp
-      def synchronize(*args, &block)
+      def synchronize(*args, **kwargs, &block)
         # This method is called by Capybara before most interactions with
         # the browser. It is a different method than Capybara::Lockstep.synchronize!
         # We use the { lazy } option to only synchronize when we're out of sync.
         Lockstep.auto_synchronize(lazy: true, log: 'Synchronizing before node access')
 
-        super(*args, &block)
+        super(*args, **kwargs, &block)
       end
-
-      ruby2_keywords :synchronize
     end
   end
 end

data/lib/capybara-lockstep/client/cuprite.rb

@@ -0,0 +1,39 @@
+module Capybara
+  module Lockstep
+    class Client::Cuprite < Client
+
+      def with_synchronization_error_handling
+        yield
+
+      rescue ::Ferrum::ScriptTimeoutError
+        timeout_message = "Could not synchronize client within #{timeout} seconds"
+        log timeout_message
+        if timeout_with == :error
+          raise Timeout, timeout_message
+        else
+          # Don't raise an error, this may happen if the server is slow to respond.
+          # We will retry on the next Capybara synchronize call.
+        end
+
+      rescue ::Ferrum::JavaScriptError => e
+        if e.message.include?('unload')
+          log ERROR_NAVIGATED_AWAY
+        else
+          unhandled_synchronize_error(e)
+        end
+
+      rescue ::Ferrum::BrowserError => e
+        if e.message.include?('Session with given id not found.')
+          log ERROR_WINDOW_CLOSED
+          # Don't raise an error, this will happen in an innocent test where a click closes a window.
+          # We will retry on the next Capybara synchronize call.
+        else
+          unhandled_synchronize_error(e)
+        end
+      rescue StandardError => e
+        unhandled_synchronize_error(e)
+      end
+
+    end
+  end
+end

data/lib/capybara-lockstep/client/selenium.rb

@@ -0,0 +1,41 @@
+module Capybara
+  module Lockstep
+    class Client::Selenium < Client
+
+      def with_synchronization_error_handling
+        yield
+      rescue ::Selenium::WebDriver::Error::ScriptTimeoutError
+        timeout_message = "Could not synchronize client within #{timeout} seconds"
+        log timeout_message
+        if timeout_with == :error
+          raise Timeout, timeout_message
+        else
+          # Don't raise an error, this may happen if the server is slow to respond.
+          # We will retry on the next Capybara synchronize call.
+        end
+      rescue ::Selenium::WebDriver::Error::UnexpectedAlertOpenError
+        log ERROR_ALERT_OPEN
+        # Don't raise an error, this will happen in an innocent test where a click opens an alert.
+        # We will retry on the next Capybara synchronize call.
+      rescue ::Selenium::WebDriver::Error::NoSuchWindowError
+        log ERROR_WINDOW_CLOSED
+        # Don't raise an error, this will happen in an innocent test where a click closes a window.
+        # We will retry on the next Capybara synchronize call.
+      rescue ::Selenium::WebDriver::Error::JavascriptError => e
+        # When the URL changes while a script is running, my current selenium-webdriver
+        # raises a Selenium::WebDriver::Error::JavascriptError with the message:
+        # "javascript error: document unloaded while waiting for result".
+        # We will retry on the next Capybara synchronize call, by then we should see
+        # the new page.
+        if e.message.include?('unload')
+          log ERROR_NAVIGATED_AWAY
+        else
+          unhandled_synchronize_error(e)
+        end
+      rescue StandardError => e
+        unhandled_synchronize_error(e)
+      end
+
+    end
+  end
+end

data/lib/capybara-lockstep/client.rb

@@ -48,7 +48,7 @@ module Capybara
 
         start_time = Util.current_seconds
 
-        begin
+        with_synchronization_error_handling do
           Util.with_max_wait_time(timeout) do
             message_from_js = evaluate_async_script(<<~JS)
               let done = arguments[0]
@@ -84,41 +84,15 @@ module Capybara
               self.synchronized = true
             end
           end
-        rescue ::Selenium::WebDriver::Error::ScriptTimeoutError
-          timeout_message = "Could not synchronize client within #{timeout} seconds"
-          log timeout_message
-          if timeout_with == :error
-            raise Timeout, timeout_message
-          else
-            # Don't raise an error, this may happen if the server is slow to respond.
-            # We will retry on the next Capybara synchronize call.
-          end
-        rescue ::Selenium::WebDriver::Error::UnexpectedAlertOpenError
-          log ERROR_ALERT_OPEN
-          # Don't raise an error, this will happen in an innocent test where a click opens an alert.
-          # We will retry on the next Capybara synchronize call.
-        rescue ::Selenium::WebDriver::Error::NoSuchWindowError
-          log ERROR_WINDOW_CLOSED
-          # Don't raise an error, this will happen in an innocent test where a click closes a window.
-          # We will retry on the next Capybara synchronize call.
-        rescue ::Selenium::WebDriver::Error::JavascriptError => e
-          # When the URL changes while a script is running, my current selenium-webdriver
-          # raises a Selenium::WebDriver::Error::JavascriptError with the message:
-          # "javascript error: document unloaded while waiting for result".
-          # We will retry on the next Capybara synchronize call, by then we should see
-          # the new page.
-          if e.message.include?('unload')
-            log ERROR_NAVIGATED_AWAY
-          else
-            unhandled_synchronize_error(e)
-          end
-        rescue StandardError => e
-          unhandled_synchronize_error(e)
         end
       end
 
       private
 
+      def with_synchronization_error_handling
+        raise NoMethodError, "Implement in a driver specific subclass"
+      end
+
       def unhandled_synchronize_error(e)
         Lockstep.log "#{e.class.name} while synchronizing: #{e.message}"
         raise e
@@ -135,4 +109,3 @@ module Capybara
     end
   end
 end
-

data/lib/capybara-lockstep/configuration.rb

@@ -42,7 +42,7 @@ module Capybara
       end
 
       def mode
-        if javascript_driver?
+        if supported_driver?
           @mode.nil? ? :auto : @mode
         else
           :off
@@ -106,7 +106,7 @@ module Capybara
       end
 
       def send_config_to_browser(js)
-        return unless javascript_driver?
+        return unless supported_driver?
 
         begin
           Util.with_max_wait_time(2) do

data/lib/capybara-lockstep/errors.rb

@@ -2,5 +2,6 @@ module Capybara
   module Lockstep
     class Error < StandardError; end
     class Timeout < Error; end
+    class DriverNotSupportedError < StandardError; end
   end
 end

data/lib/capybara-lockstep/lockstep.rb

@@ -9,6 +9,8 @@ module Capybara
       alias synchronizing? synchronizing
 
       def unsynchronize
+        return if mode == :off
+
         client.synchronized = false
       end
 
@@ -28,7 +30,7 @@ module Capybara
 
         # The { lazy } option is a performance optimization that will prevent capybara-lockstep
         # from synchronizing multiple times in expressions like `page.find('.foo').find('.bar')`.
-        # The { lazy } option has nothing todo with :auto mode.
+        # The { lazy } option has nothing to do with :auto mode.
         #
         # With { lazy: true } we only synchronize when the Ruby-side thinks we're out of sync.
         # This saves us an expensive execute_script() roundtrip that goes to the browser and back.
@@ -69,7 +71,24 @@ module Capybara
       end
 
       def client
-        @client ||= Client.new
+        if @client.nil? || !@client.is_a?(client_class)
+          # (Re-)Initialize client if missing or the current driver changes
+          @client = client_class.new
+        end
+
+        @client
+      end
+
+      def client_class
+        if selenium_driver?
+          Client::Selenium
+        elsif cuprite_driver?
+          Client::Cuprite
+        else
+          # This should never raise, as capybara lockstep should disable itself for any unsupported driver.
+          # When it still does, there is probably a bug within capybara lockstep.
+          raise DriverNotSupportedError, "The driver #{driver.class.name} is not supported by capybara-lockstep."
+        end
       end
 
     end

data/lib/capybara-lockstep/page_access.rb

@@ -7,8 +7,8 @@ module Capybara
 
       delegate :evaluate_script, :evaluate_async_script, :execute_script, :driver, to: :page
 
-      def javascript_driver?
-        driver.is_a?(Capybara::Selenium::Driver)
+      def supported_driver?
+        selenium_driver? || cuprite_driver?
       end
 
       def alert_present?
@@ -17,12 +17,25 @@ module Capybara
         #
         # Apparently, while an alert/confirm is open, Chrome will block any requests
         # to its `getLog` API. This causes Selenium to time out with a `Net::ReadTimeout` error
+        return false unless selenium_driver? # This issue is selenium-specific.
+
         page.driver.browser.switch_to.alert
         true
       rescue Capybara::NotSupportedByDriverError, ::Selenium::WebDriver::Error::NoSuchAlertError, ::Selenium::WebDriver::Error::NoSuchWindowError
         false
       end
 
+      private
+
+      def selenium_driver?
+        defined?(Capybara::Selenium::Driver) && driver.is_a?(Capybara::Selenium::Driver)
+      end
+
+      def cuprite_driver?
+        defined?(Capybara::Cuprite::Driver) && driver.is_a?(Capybara::Cuprite::Driver)
+      end
+
+
     end
   end
 end

data/lib/capybara-lockstep/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Lockstep
-    VERSION = "2.2.3"
+    VERSION = "2.3.1"
   end
 end

data/lib/capybara-lockstep.rb

@@ -1,5 +1,21 @@
 require 'capybara'
-require 'selenium-webdriver'
+
+selenium_loaded = begin
+  require 'selenium-webdriver'
+  true
+rescue LoadError
+  false
+end
+
+cuprite_loaded = begin
+  require 'capybara/cuprite'
+  true
+rescue LoadError
+  false
+end
+
+raise LoadError, "capybara-lockstep requires either selenium-webdriver or cuprite" unless selenium_loaded || cuprite_loaded
+
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/lazy_load_hooks'
@@ -20,4 +36,6 @@ require_relative 'capybara-lockstep/capybara_ext'
 require_relative 'capybara-lockstep/helper'
 require_relative 'capybara-lockstep/server'
 require_relative 'capybara-lockstep/client'
+require_relative 'capybara-lockstep/client/selenium'
+require_relative 'capybara-lockstep/client/cuprite'
 require_relative 'capybara-lockstep/middleware'

data/tasks/spec_tasks.rb

@@ -0,0 +1,22 @@
+namespace :spec do
+  CAPYBARA_DRIVERS = %w[selenium cuprite]
+
+  desc "Run all tests for all drivers"
+  task :all do
+    CAPYBARA_DRIVERS.each do |driver|
+      run_specs driver
+    end
+  end
+
+  CAPYBARA_DRIVERS.each do |driver|
+    task driver do
+      run_specs driver
+    end
+  end
+
+  def run_specs(driver)
+    puts "Running specs using #{driver} as the capybara driver:\n"
+    sh "CAPYBARA_DRIVER=#{driver} bundle exec rake spec"
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: capybara-lockstep
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.1
 platform: ruby
 authors:
 - Henning Koch
 bindir: exe
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -23,48 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: ruby2_keywords
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
 email:
 - henning.koch@makandra.de
 executables: []
@@ -87,6 +59,8 @@ files:
 - lib/capybara-lockstep.rb
 - lib/capybara-lockstep/capybara_ext.rb
 - lib/capybara-lockstep/client.rb
+- lib/capybara-lockstep/client/cuprite.rb
+- lib/capybara-lockstep/client/selenium.rb
 - lib/capybara-lockstep/configuration.rb
 - lib/capybara-lockstep/errors.rb
 - lib/capybara-lockstep/helper.js
@@ -104,6 +78,7 @@ files:
 - media/logo.light.text.svg
 - media/makandra-with-bottom-margin.dark.svg
 - media/makandra-with-bottom-margin.light.svg
+- tasks/spec_tasks.rb
 homepage: https://github.com/makandra/capybara-lockstep
 licenses:
 - MIT
@@ -120,14 +95,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Synchronize Capybara commands with client-side JavaScript and AJAX requests
 test_files: []