RubyGems - capybara - Versions diffs - 3.33.0 → 3.35.3 - Mend

capybara 3.33.0 → 3.35.3

Files changed (109) hide show

checksums.yaml +4 -4
data/History.md +83 -15
data/README.md +0 -2
data/lib/capybara.rb +1 -1
data/lib/capybara/config.rb +4 -6
data/lib/capybara/driver/base.rb +4 -0
data/lib/capybara/helpers.rb +25 -1
data/lib/capybara/minitest.rb +2 -2
data/lib/capybara/minitest/spec.rb +14 -11
data/lib/capybara/node/actions.rb +1 -2
data/lib/capybara/node/base.rb +6 -6
data/lib/capybara/node/element.rb +1 -5
data/lib/capybara/node/finders.rb +7 -6
data/lib/capybara/node/matchers.rb +8 -6
data/lib/capybara/node/simple.rb +5 -1
data/lib/capybara/queries/ancestor_query.rb +1 -1
data/lib/capybara/queries/current_path_query.rb +14 -4
data/lib/capybara/queries/selector_query.rb +32 -17
data/lib/capybara/queries/sibling_query.rb +1 -1
data/lib/capybara/queries/text_query.rb +2 -2
data/lib/capybara/rack_test/browser.rb +7 -3
data/lib/capybara/rack_test/driver.rb +1 -0
data/lib/capybara/rack_test/form.rb +1 -1
data/lib/capybara/rack_test/node.rb +1 -1
data/lib/capybara/registration_container.rb +3 -3
data/lib/capybara/registrations/drivers.rb +18 -12
data/lib/capybara/registrations/patches/puma_ssl.rb +3 -1
data/lib/capybara/registrations/servers.rb +2 -1
data/lib/capybara/result.rb +6 -10
data/lib/capybara/rspec.rb +2 -0
data/lib/capybara/rspec/matcher_proxies.rb +1 -1
data/lib/capybara/rspec/matchers.rb +7 -6
data/lib/capybara/rspec/matchers/have_current_path.rb +2 -2
data/lib/capybara/rspec/matchers/match_style.rb +5 -0
data/lib/capybara/selector.rb +2 -2
data/lib/capybara/selector/builders/css_builder.rb +1 -1
data/lib/capybara/selector/builders/xpath_builder.rb +3 -1
data/lib/capybara/selector/definition.rb +6 -5
data/lib/capybara/selector/definition/button.rb +26 -15
data/lib/capybara/selector/definition/css.rb +1 -1
data/lib/capybara/selector/definition/datalist_input.rb +1 -1
data/lib/capybara/selector/definition/element.rb +2 -1
data/lib/capybara/selector/definition/label.rb +1 -1
data/lib/capybara/selector/definition/select.rb +1 -1
data/lib/capybara/selector/definition/table_row.rb +2 -2
data/lib/capybara/selector/filter_set.rb +2 -2
data/lib/capybara/selector/selector.rb +5 -1
data/lib/capybara/selenium/atoms/src/isDisplayed.js +1 -1
data/lib/capybara/selenium/driver.rb +47 -5
data/lib/capybara/selenium/driver_specializations/chrome_driver.rb +3 -3
data/lib/capybara/selenium/driver_specializations/edge_driver.rb +3 -3
data/lib/capybara/selenium/driver_specializations/firefox_driver.rb +1 -1
data/lib/capybara/selenium/extensions/find.rb +4 -4
data/lib/capybara/selenium/extensions/scroll.rb +8 -10
data/lib/capybara/selenium/logger_suppressor.rb +8 -2
data/lib/capybara/selenium/node.rb +6 -3
data/lib/capybara/selenium/nodes/chrome_node.rb +23 -5
data/lib/capybara/selenium/nodes/firefox_node.rb +6 -1
data/lib/capybara/selenium/nodes/safari_node.rb +1 -1
data/lib/capybara/selenium/patches/atoms.rb +4 -4
data/lib/capybara/selenium/patches/logs.rb +4 -4
data/lib/capybara/server/animation_disabler.rb +8 -3
data/lib/capybara/server/middleware.rb +4 -2
data/lib/capybara/session.rb +20 -11
data/lib/capybara/session/matchers.rb +11 -11
data/lib/capybara/spec/public/test.js +6 -1
data/lib/capybara/spec/session/accept_alert_spec.rb +1 -1
data/lib/capybara/spec/session/check_spec.rb +6 -0
data/lib/capybara/spec/session/click_link_or_button_spec.rb +9 -0
data/lib/capybara/spec/session/current_url_spec.rb +11 -1
data/lib/capybara/spec/session/has_button_spec.rb +35 -0
data/lib/capybara/spec/session/has_css_spec.rb +2 -1
data/lib/capybara/spec/session/has_current_path_spec.rb +13 -0
data/lib/capybara/spec/session/has_text_spec.rb +0 -11
data/lib/capybara/spec/session/html_spec.rb +1 -1
data/lib/capybara/spec/session/matches_style_spec.rb +2 -2
data/lib/capybara/spec/session/node_spec.rb +23 -3
data/lib/capybara/spec/session/refresh_spec.rb +2 -1
data/lib/capybara/spec/session/save_page_spec.rb +4 -4
data/lib/capybara/spec/session/window/switch_to_window_spec.rb +1 -1
data/lib/capybara/spec/session/window/window_opened_by_spec.rb +1 -1
data/lib/capybara/spec/session/window/window_spec.rb +1 -1
data/lib/capybara/spec/session/window/windows_spec.rb +1 -1
data/lib/capybara/spec/spec_helper.rb +11 -12
data/lib/capybara/spec/test_app.rb +9 -3
data/lib/capybara/spec/views/form.erb +23 -1
data/lib/capybara/spec/views/with_animation.erb +8 -0
data/lib/capybara/spec/views/with_jquery_animation.erb +24 -0
data/lib/capybara/spec/views/with_js.erb +2 -0
data/lib/capybara/spec/views/with_sortable_js.erb +1 -1
data/lib/capybara/version.rb +1 -1
data/lib/capybara/window.rb +3 -7
data/spec/basic_node_spec.rb +9 -8
data/spec/dsl_spec.rb +1 -1
data/spec/fixtures/selenium_driver_rspec_success.rb +1 -1
data/spec/minitest_spec.rb +2 -1
data/spec/rack_test_spec.rb +15 -5
data/spec/rspec/features_spec.rb +3 -1
data/spec/rspec/scenarios_spec.rb +4 -0
data/spec/rspec/shared_spec_matchers.rb +2 -2
data/spec/rspec_spec.rb +4 -0
data/spec/selector_spec.rb +16 -1
data/spec/selenium_spec_chrome.rb +39 -18
data/spec/selenium_spec_chrome_remote.rb +5 -1
data/spec/selenium_spec_firefox.rb +15 -13
data/spec/server_spec.rb +19 -0
data/spec/shared_selenium_session.rb +74 -1
metadata +47 -13
data/lib/capybara/spec/session/source_spec.rb +0 -0

data/lib/capybara/spec/views/with_animation.erb CHANGED

@@ -18,6 +18,14 @@
       });
     </script>
     <style>
+      html {
+        scroll-behavior: smooth;
+      }
+      body {
+        min-height: 2000px;
+      }
       .transition.away {
           width: 0%;
       }

data/lib/capybara/spec/views/with_jquery_animation.erb ADDED

@@ -0,0 +1,24 @@
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>with_jquery_animation</title>
+    <style>
+      body {
+        height: 2000px;
+      }
+    </style>
+  </head>
+  <body id="with_animation">
+    <a href="#" id='scroll'>scroll top 500</a>
+    <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script type='text/javascript'>
+      $('#scroll').click(function(e){
+        e.preventDefault();
+        $('html, body').animate({ scrollTop: 500 }, 'slow');
+      });
+    </script>
+  </body>
+</html>

data/lib/capybara/spec/views/with_js.erb CHANGED

@@ -36,6 +36,7 @@
     <p><a href="#" id="clickable">Click me</a></p>
     <p><a href="#" id="slow-click">Slowly</a></p>
     <p><span id="aria-button" role="button">ARIA button</span></p>
+    <p><span role="button">ARIA button2</span></p>
     <p>
       <select id="waiter">
@@ -152,6 +153,7 @@
       <p>This is an HTML5 draggable element.</p>
     </div>
+    <div id="shadow"></div>
     <script type="text/javascript">
       // a javascript comment
       var aVar = 123;

data/lib/capybara/spec/views/with_sortable_js.erb CHANGED

@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_sortable_js</title>
-    <script src="https://sortablejs.github.io/Sortable/Sortable.js" type="text/javascript"></script>
+    <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.12.0/dist/sortable.umd.min.js" type="text/javascript"></script>
   </head>
   <body id="with_sortable_js">

data/lib/capybara/version.rb CHANGED

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '3.33.0'
+  VERSION = '3.35.3'
 end

data/lib/capybara/window.rb CHANGED

@@ -4,7 +4,7 @@ module Capybara
   ##
   # The {Window} class represents a browser window.
   #
-  # You can get an instance of the class by calling either of:
+  # You can get an instance of the class by calling any of:
   #
   # * {Capybara::Session#windows}
   # * {Capybara::Session#current_window}
@@ -82,8 +82,8 @@ module Capybara
     # Resize window.
     #
     # @macro about_current
-    # @param width [String]  the new window width in pixels
-    # @param height [String]  the new window height in pixels
+    # @param width [Integer]  the new window width in pixels
+    # @param height [Integer]  the new window height in pixels
     #
     def resize_to(width, height)
       wait_for_stable_size { @driver.resize_window_to(handle, width, height) }
@@ -138,9 +138,5 @@ module Capybara
       end
       raise Capybara::WindowError, "Window size not stable within #{seconds} seconds."
     end
-    def raise_unless_current(what)
-      raise Capybara::WindowError, "#{what} not current window is not possible." unless current?
-    end
   end
 end

data/spec/basic_node_spec.rb CHANGED

@@ -3,6 +3,7 @@
 require 'spec_helper'
 RSpec.describe Capybara do
+  include Capybara::RSpecMatchers
   describe '.string' do
     let :string do
       described_class.string <<-STRING
@@ -129,25 +130,25 @@ RSpec.describe Capybara do
     describe '#has_title?' do
       it 'returns whether the page has the given title' do
-        expect(string.has_title?('simple_node')).to be_truthy
-        expect(string.has_title?('monkey')).to be_falsey
+        expect(string.has_title?('simple_node')).to be true
+        expect(string.has_title?('monkey')).to be false
       end
       it 'allows regexp matches' do
-        expect(string.has_title?(/s[a-z]+_node/)).to be_truthy
-        expect(string.has_title?(/monkey/)).to be_falsey
+        expect(string.has_title?(/s[a-z]+_node/)).to be true
+        expect(string.has_title?(/monkey/)).to be false
       end
     end
     describe '#has_no_title?' do
       it 'returns whether the page does not have the given title' do
-        expect(string.has_no_title?('simple_node')).to be_falsey
-        expect(string.has_no_title?('monkey')).to be_truthy
+        expect(string.has_no_title?('simple_node')).to be false
+        expect(string.has_no_title?('monkey')).to be true
       end
       it 'allows regexp matches' do
-        expect(string.has_no_title?(/s[a-z]+_node/)).to be_falsey
-        expect(string.has_no_title?(/monkey/)).to be_truthy
+        expect(string.has_no_title?(/s[a-z]+_node/)).to be false
+        expect(string.has_no_title?(/monkey/)).to be true
       end
     end
   end

data/spec/dsl_spec.rb CHANGED

@@ -8,7 +8,7 @@ class TestClass
 end
 Capybara::SpecHelper.run_specs TestClass.new, 'DSL', capybara_skip: %i[
-  js modals screenshot frames windows send_keys server hover about_scheme psc download css driver scroll spatial html_validation
+  js modals screenshot frames windows send_keys server hover about_scheme psc download css driver scroll spatial html_validation shadow_dom
 ] do |example|
   case example.metadata[:full_description]
   when /has_css\? should support case insensitive :class and :id options/

data/spec/fixtures/selenium_driver_rspec_success.rb CHANGED

@@ -6,7 +6,7 @@ require 'selenium-webdriver'
 RSpec.describe Capybara::Selenium::Driver do
   it 'should exit with a zero exit status' do
     options = { browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym }
-    browser = described_class.new(TestApp, options).browser
+    browser = described_class.new(TestApp, **options).browser
     expect(browser).to be_truthy
     expect(true).to eq(true) # rubocop:disable RSpec/ExpectActual
   end

data/spec/minitest_spec.rb CHANGED

@@ -30,6 +30,7 @@ class MinitestTest < Minitest::Test
   def test_assert_current_path
     assert_current_path('/form')
+    assert_current_path('/form') { |url| url.query.nil? }
     assert_no_current_path('/not_form')
     refute_current_path('/not_form')
   end
@@ -158,6 +159,6 @@ RSpec.describe 'capybara/minitest' do
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include('22 runs, 52 assertions, 0 failures, 0 errors, 1 skips')
+    expect(output.string).to include('22 runs, 53 assertions, 0 failures, 0 errors, 1 skips')
   end
 end

data/spec/rack_test_spec.rb CHANGED

@@ -2,11 +2,11 @@
 require 'spec_helper'
 nokogumbo_required = begin
-                       require 'nokogumbo'
-                       true
-                     rescue LoadError
-                       false
-                     end
+  require 'nokogumbo'
+  true
+rescue LoadError
+  false
+end
 module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
@@ -27,6 +27,7 @@ skipped_tests = %i[
   scroll
   spatial
   html_validation
+  shadow_dom
 ]
 Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
@@ -38,6 +39,7 @@ Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip
 end
 RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
+  include Capybara::RSpecMatchers
   context 'with rack test driver' do
     let(:session) { TestSessions::RackTest }
@@ -143,6 +145,14 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
       end
     end
+    describe '#send_keys' do
+      it 'raises an UnsupportedMethodError' do
+        session.visit('/form')
+        expect { session.send_keys(:tab) }.to raise_error(Capybara::NotSupportedByDriverError)
+      end
+    end
     describe '#text' do
       it 'should return original text content for textareas' do
         session.visit('/with_html')

data/spec/rspec/features_spec.rb CHANGED

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
+# rubocop:disable RSpec/MultipleDescribes
 require 'spec_helper'
 require 'capybara/rspec'
@@ -96,4 +98,4 @@ ffeature 'if ffeature aliases focused tag then' do # rubocop:disable RSpec/Focus
     expect(example.metadata[:focus]).to eq true
   end
 end
-# rubocop:enable RSpec/RepeatedExample
+# rubocop:enable RSpec/RepeatedExample, RSpec/MultipleDescribes

data/spec/rspec/scenarios_spec.rb CHANGED

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
+# rubocop:disable RSpec/MultipleDescribes
 require 'spec_helper'
 require 'capybara/rspec'
@@ -17,3 +19,5 @@ feature 'if xscenario aliases to pending then' do
   xscenario "this test should be 'temporarily disabled with xscenario'" do
   end
 end
+# rubocop:enable RSpec/MultipleDescribes

data/spec/rspec/shared_spec_matchers.rb CHANGED

@@ -840,10 +840,10 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
     it 'gives proper description when :visible option passed' do
-      expect(have_table('Lovely table', visible: true).description).to eq('have visible table "Lovely table"') # rubocop:disable Capybara/VisibilityMatcher
+      expect(have_table('Lovely table', visible: true).description).to eq('have visible table "Lovely table"')
       expect(have_table('Lovely table', visible: :hidden).description).to eq('have non-visible table "Lovely table"')
       expect(have_table('Lovely table', visible: :all).description).to eq('have table "Lovely table"')
-      expect(have_table('Lovely table', visible: false).description).to eq('have table "Lovely table"') # rubocop:disable Capybara/VisibilityMatcher
+      expect(have_table('Lovely table', visible: false).description).to eq('have table "Lovely table"')
     end
     it 'passes if there is such a table' do

data/spec/rspec_spec.rb CHANGED

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
+# rubocop:disable RSpec/MultipleDescribes
 require 'spec_helper'
 RSpec.describe 'capybara/rspec' do
@@ -143,3 +145,5 @@ feature 'Feature DSL' do
     expect(page.body).to include('Another World')
   end
 end
+# rubocop:enable RSpec/MultipleDescribes

data/spec/selector_spec.rb CHANGED

@@ -3,6 +3,7 @@
 require 'spec_helper'
 RSpec.describe Capybara do
+  include Capybara::RSpecMatchers
   describe 'Selectors' do
     let :string do
       described_class.string <<-STRING
@@ -326,9 +327,23 @@ RSpec.describe Capybara do
           expect(string.find(:custom_xpath_selector, './/div', class: /dOm WoR/i)[:id]).to eq 'random_words'
         end
-        it 'accepts Regexp for CSS base selectors' do
+        it 'accepts Regexp for CSS based selectors' do
           expect(string.find(:custom_css_selector, 'div', class: /random/)[:id]).to eq 'random_words'
         end
+        it 'accepts Regexp for individual class names for XPath based selectors' do
+          expect(string.find(:custom_xpath_selector, './/div', class: [/random/, 'some'])[:id]).to eq 'random_words'
+          expect(string.find(:custom_xpath_selector, './/div', class: [/om/, /wor/])[:id]).to eq 'random_words'
+          expect { string.find(:custom_xpath_selector, './/div', class: [/not/, /wor/]) }.to raise_error(Capybara::ElementNotFound)
+          expect { string.find(:custom_xpath_selector, './/div', class: [/dom wor/]) }.to raise_error(Capybara::ElementNotFound)
+        end
+        it 'accepts Regexp for individual class names for CSS based selectors' do
+          expect(string.find(:custom_css_selector, 'div', class: [/random/])[:id]).to eq 'random_words'
+          expect(string.find(:custom_css_selector, 'div', class: [/om/, /wor/, 'some'])[:id]).to eq 'random_words'
+          expect { string.find(:custom_css_selector, 'div', class: [/not/, /wor/]) }.to raise_error(Capybara::ElementNotFound)
+          expect { string.find(:custom_css_selector, 'div', class: [/dom wor/]) }.to raise_error(Capybara::ElementNotFound)
+        end
       end
       context 'with :style option' do

data/spec/selenium_spec_chrome.rb CHANGED

@@ -19,39 +19,56 @@ browser_options.add_preference('download.default_directory', Capybara.save_path)
 browser_options.add_preference(:download, default_directory: Capybara.save_path)
 Capybara.register_driver :selenium_chrome do |app|
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options, timeout: 30).tap do |driver|
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  driver_options = { browser: :chrome, timeout: 30 }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **driver_options).tap do |driver|
     # Set download dir for Chrome < 77
     driver.browser.download_path = Capybara.save_path
   end
 end
 Capybara.register_driver :selenium_chrome_not_clear_storage do |app|
-  chrome_options = {
-    browser: :chrome,
-    options: browser_options
-  }
-  Capybara::Selenium::Driver.new(app, **chrome_options.merge(clear_local_storage: false, clear_session_storage: false))
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  chrome_options = { browser: :chrome, clear_local_storage: false, clear_session_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **chrome_options)
 end
 Capybara.register_driver :selenium_chrome_not_clear_session_storage do |app|
-  chrome_options = {
-    browser: :chrome,
-    options: browser_options
-  }
-  Capybara::Selenium::Driver.new(app, **chrome_options.merge(clear_session_storage: false))
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  chrome_options = { browser: :chrome, clear_session_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **chrome_options)
 end
 Capybara.register_driver :selenium_chrome_not_clear_local_storage do |app|
-  chrome_options = {
-    browser: :chrome,
-    options: browser_options
-  }
-  Capybara::Selenium::Driver.new(app, **chrome_options.merge(clear_local_storage: false))
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  chrome_options = { browser: :chrome, clear_local_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **chrome_options)
 end
 Capybara.register_driver :selenium_driver_subclass_with_chrome do |app|
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
   subclass = Class.new(Capybara::Selenium::Driver)
-  subclass.new(app, browser: :chrome, options: browser_options, timeout: 30)
+  chrome_options = { browser: :chrome, timeout: 30 }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  subclass.new(app, **chrome_options)
 end
 module TestSessions
@@ -171,7 +188,7 @@ RSpec.describe 'Capybara::Session with chrome' do
     before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
     it 'does not error getting log types' do
-      skip if Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0]) < Gem::Version.new('75.0.3770.90')
+      skip if Gem::Requirement.new('< 75.0.3770.90').satisfied_by? chromedriver_version
       expect do
         session.driver.browser.manage.logs.available_types
       end.not_to raise_error
@@ -183,4 +200,8 @@ RSpec.describe 'Capybara::Session with chrome' do
       end.not_to raise_error
     end
   end
+  def chromedriver_version
+    Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0])
+  end
 end

data/spec/selenium_spec_chrome_remote.rb CHANGED

@@ -81,7 +81,7 @@ RSpec.describe 'Capybara::Session with remote Chrome' do
     before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
     it 'does not error when getting log types' do
-      skip if Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0]) < Gem::Version.new('75.0.3770.90')
+      skip unless Gem::Requirement.new('>= 75.0.3770.90').satisfied_by? chromedriver_version
       expect do
         session.driver.browser.manage.logs.available_types
       end.not_to raise_error
@@ -93,4 +93,8 @@ RSpec.describe 'Capybara::Session with remote Chrome' do
       end.not_to raise_error
     end
   end
+  def chromedriver_version
+    Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0])
+  end
 end

data/spec/selenium_spec_firefox.rb CHANGED

@@ -14,28 +14,30 @@ browser_options.profile = Selenium::WebDriver::Firefox::Profile.new.tap do |prof
   profile['browser.download.dir'] = Capybara.save_path
   profile['browser.download.folderList'] = 2
   profile['browser.helperApps.neverAsk.saveToDisk'] = 'text/csv'
+  profile['browser.startup.homepage'] = 'about:blank' # workaround bug in Selenium 4 alpha4-7
 end
 Capybara.register_driver :selenium_firefox do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
-  Capybara::Selenium::Driver.new(
-    app,
-    browser: :firefox,
-    options: browser_options,
-    timeout: 31
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  driver_options = { browser: :firefox, timeout: 31 }.tap do |opts|
+    opts[options_key] = browser_options
     # Get a trace level log from geckodriver
     # :driver_opts => { args: ['-vv'] }
-  )
+  end
+  Capybara::Selenium::Driver.new(app, **driver_options)
 end
 Capybara.register_driver :selenium_firefox_not_clear_storage do |app|
-  Capybara::Selenium::Driver.new(
-    app,
-    browser: :firefox,
-    clear_local_storage: false,
-    clear_session_storage: false,
-    options: browser_options
-  )
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  driver_options = { browser: :firefox, clear_local_storage: false, clear_session_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **driver_options)
 end
 module TestSessions