capybara 3.39.2 → 3.40.0

data/lib/capybara/selenium/nodes/chrome_node.rb

@@ -24,12 +24,6 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
       JS
     end
     super
-  rescue *file_errors => e
-    if e.message.match?(/File not found : .+\n.+/m)
-      raise ArgumentError, "Selenium < 3.14 with remote Chrome doesn't support multiple file upload"
-    end
-
-    raise
   end
 
   def drop(*args)
@@ -94,7 +88,7 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
 private
 
   def perform_legacy_drag(element, drop_modifiers)
-    return super if chromedriver_fixed_actions_key_state? || !w3c? || element.obscured?
+    return super if chromedriver_fixed_actions_key_state? || element.obscured?
 
     raise ArgumentError, 'Modifier keys are not supported while dragging in this version of Chrome.' unless drop_modifiers.empty?
 
@@ -104,19 +98,9 @@ private
     browser_action.click_and_hold(native).move_to(element.native).release.perform
   end
 
-  def file_errors
-    @file_errors = ::Selenium::WebDriver.logger.suppress_deprecations do
-      if defined? ::Selenium::WebDriver::Error::ExpectedError # Selenium < 4
-        [::Selenium::WebDriver::Error::ExpectedError]
-      else
-        []
-      end
-    end
-  end
-
   def browser_version(to_float: true)
     caps = capabilities
-    ver = (caps[:browser_version] || caps[:version])
+    ver = caps[:browser_version] || caps[:version]
     ver = ver.to_f if to_float
     ver
   end
@@ -135,7 +119,7 @@ private
 
   def native_displayed?
     (driver.options[:native_displayed] != false) &&
-      (w3c? && chromedriver_supports_displayed_endpoint?) &&
+      chromedriver_supports_displayed_endpoint? &&
       (!ENV['DISABLE_CAPYBARA_SELENIUM_OPTIMIZATIONS'])
   end
 end

data/lib/capybara/selenium/nodes/edge_node.rb

@@ -24,12 +24,6 @@ class Capybara::Selenium::EdgeNode < Capybara::Selenium::Node
       JS
     end
     super
-  rescue *file_errors => e
-    if e.message.match?(/File not found : .+\n.+/m)
-      raise ArgumentError, "Selenium < 3.14 with remote Chrome doesn't support multiple file upload"
-    end
-
-    raise
   end
 
   def drop(*args)
@@ -97,16 +91,6 @@ class Capybara::Selenium::EdgeNode < Capybara::Selenium::Node
 
 private
 
-  def file_errors
-    @file_errors = ::Selenium::WebDriver.logger.suppress_deprecations do
-      if defined? ::Selenium::WebDriver::Error::ExpectedError # Selenium < 4
-        [::Selenium::WebDriver::Error::ExpectedError]
-      else
-        []
-      end
-    end
-  end
-
   def browser_version
     @browser_version ||= begin
       caps = driver.browser.capabilities

data/lib/capybara/server/animation_disabler.rb

@@ -50,7 +50,7 @@ module Capybara
       def directive_nonces(headers)
         headers.fetch('Content-Security-Policy', '')
                .split(';')
-               .map(&:split)
+               .map(&:split) # rubocop:disable Style/MapToHash
                .to_h do |s|
                  [
                    s[0], s[1..].filter_map do |value|

data/lib/capybara/server.rb

@@ -55,7 +55,7 @@ module Capybara
 
       res = @checker.request { |http| http.get('/__identify__') }
 
-      return res.body == app.object_id.to_s if res.is_a?(Net::HTTPSuccess) || res.is_a?(Net::HTTPRedirection)
+      res.body == app.object_id.to_s if res.is_a?(Net::HTTPSuccess) || res.is_a?(Net::HTTPRedirection)
     rescue SystemCallError, Net::ReadTimeout, OpenSSL::SSL::SSLError
       false
     end

data/lib/capybara/session.rb

@@ -45,6 +45,7 @@ module Capybara
       fill_in find find_all find_button find_by_id find_field find_link
       has_content? has_text? has_css? has_no_content? has_no_text?
       has_no_css? has_no_xpath? has_xpath? select uncheck
+      has_element? has_no_element?
       has_link? has_no_link? has_button? has_no_button? has_field?
       has_no_field? has_checked_field? has_unchecked_field?
       has_no_table? has_table? unselect has_select? has_no_select?
@@ -309,8 +310,8 @@ module Capybara
     # @!method send_keys
     #   @see Capybara::Node::Element#send_keys
     #
-    def send_keys(*args, **kw_args)
-      driver.send_keys(*args, **kw_args)
+    def send_keys(...)
+      driver.send_keys(...)
     end
 
     ##

data/lib/capybara/spec/session/all_spec.rb

@@ -129,7 +129,7 @@ Capybara::SpecHelper.spec '#all' do
     end
 
     context 'with per session config', requires: [:psc] do
-      it 'should use the sessions ignore_hidden_elements', psc: true do
+      it 'should use the sessions ignore_hidden_elements', :psc do
         Capybara.ignore_hidden_elements = true
         @session.config.ignore_hidden_elements = false
         expect(Capybara.ignore_hidden_elements).to be(true)

data/lib/capybara/spec/session/click_link_spec.rb

@@ -105,7 +105,7 @@ Capybara::SpecHelper.spec '#click_link' do
 
     it "should raise an error if no link's href matched the pattern" do
       expect { @session.click_link('labore', href: /invalid_pattern/) }.to raise_error(Capybara::ElementNotFound, %r{with href matching /invalid_pattern/})
-      expect { @session.click_link('labore', href: /.+d+/) }.to raise_error(Capybara::ElementNotFound, /#{Regexp.quote "with href matching /.+d+/"}/)
+      expect { @session.click_link('labore', href: /.+d+/) }.to raise_error(Capybara::ElementNotFound, /#{Regexp.quote 'with href matching /.+d+/'}/)
     end
 
     context 'href: nil' do

data/lib/capybara/spec/session/find_spec.rb

@@ -233,6 +233,14 @@ Capybara::SpecHelper.spec '#find' do
     end.to raise_error(Capybara::ElementNotFound, 'Unable to find xpath "//div[@id=\\"nosuchthing\\"]"')
   end
 
+  context 'without locator' do
+    it 'should not output `nil` in the ElementNotFound message if nothing was found' do
+      expect do
+        @session.find(:label, text: 'no such thing').to be_nil
+      end.to raise_error(Capybara::ElementNotFound, 'Unable to find label')
+    end
+  end
+
   it 'should accept an XPath instance' do
     @session.visit('/form')
     @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('First Name')

data/lib/capybara/spec/session/has_element_spec.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec '#has_element?' do
+  before do
+    @session.visit('/with_html')
+  end
+
+  it 'should be true if the given element is on the page' do
+    expect(@session).to have_element('a', id: 'foo')
+    expect(@session).to have_element('a', text: 'A link', href: '/with_simple_html')
+    expect(@session).to have_element('a', text: :'A link', href: :'/with_simple_html')
+    expect(@session).to have_element('a', text: 'A link', href: %r{/with_simple_html})
+    expect(@session).to have_element('a', text: 'labore', target: '_self')
+  end
+
+  it 'should be false if the given element is not on the page' do
+    expect(@session).not_to have_element('a', text: 'monkey')
+    expect(@session).not_to have_element('a', text: 'A link', href: '/nonexistent-href')
+    expect(@session).not_to have_element('a', text: 'A link', href: /nonexistent/)
+    expect(@session).not_to have_element('a', text: 'labore', target: '_blank')
+  end
+
+  it 'should notify if an invalid locator is specified' do
+    allow(Capybara::Helpers).to receive(:warn).and_return(nil)
+    @session.has_element?(@session)
+    expect(Capybara::Helpers).to have_received(:warn).with(/Called from: .+/)
+  end
+end
+
+Capybara::SpecHelper.spec '#has_no_element?' do
+  before do
+    @session.visit('/with_html')
+  end
+
+  it 'should be false if the given element is on the page' do
+    expect(@session).not_to have_no_element('a', id: 'foo')
+    expect(@session).not_to have_no_element('a', text: 'A link', href: '/with_simple_html')
+    expect(@session).not_to have_no_element('a', text: 'labore', target: '_self')
+  end
+
+  it 'should be true if the given element is not on the page' do
+    expect(@session).to have_no_element('a', text: 'monkey')
+    expect(@session).to have_no_element('a', text: 'A link', href: '/nonexistent-href')
+    expect(@session).to have_no_element('a', text: 'A link', href: %r{/nonexistent-href})
+    expect(@session).to have_no_element('a', text: 'labore', target: '_blank')
+  end
+end

data/lib/capybara/spec/session/has_table_spec.rb

@@ -19,12 +19,17 @@ Capybara::SpecHelper.spec '#has_table?' do
       ])
   end
 
-  it 'should accept rows with partial column header hashses' do
+  it 'should accept rows with partial column header hashes' do
     expect(@session).to have_table('Horizontal Headers', with_rows:
       [
         { 'First Name' => 'Thomas' },
         { 'Last Name' => 'Sawayn', 'City' => 'West Trinidad' }
       ])
+
+    expect(@session).not_to have_table('Horizontal Headers', with_rows:
+      [
+        { 'Unmatched Header' => 'Thomas' }
+      ])
   end
 
   it 'should accept rows with array of cell values' do
@@ -103,6 +108,11 @@ Capybara::SpecHelper.spec '#has_table?' do
         { 'First Name' => 'Danilo', 'Last Name' => 'Walpole', 'City' => 'Johnsonville' },
         { 'Last Name' => 'Sawayn', 'City' => 'West Trinidad' }
       ])
+
+    expect(@session).not_to have_table('Vertical Headers', with_cols:
+      [
+        { 'Unmatched Header' => 'Thomas' }
+      ])
   end
 
   it 'should be false if the table is not on the page' do
@@ -113,10 +123,11 @@ Capybara::SpecHelper.spec '#has_table?' do
     expect(@session.find(:table, 'Horizontal Headers')).to have_selector(:table_row, 'First Name' => 'Thomas', 'Last Name' => 'Walpole')
     expect(@session.find(:table, 'Horizontal Headers')).to have_selector(:table_row, 'Last Name' => 'Walpole')
     expect(@session.find(:table, 'Horizontal Headers')).not_to have_selector(:table_row, 'First Name' => 'Walpole')
+    expect(@session.find(:table, 'Horizontal Headers')).not_to have_selector(:table_row, 'Unmatched Header' => 'Thomas')
   end
 
   it 'should find row by cell values' do
-    expect(@session.find(:table, 'Horizontal Headers')).to have_selector(:table_row, %w[Thomas Walpole])
+    expect(@session.find(:table, 'Horizontal Headers')).to have_selector(:table_row, %w[Thomas Walpole Oceanside])
     expect(@session.find(:table, 'Horizontal Headers')).not_to have_selector(:table_row, %w[Walpole Thomas])
     expect(@session.find(:table, 'Horizontal Headers')).not_to have_selector(:table_row, %w[Other])
   end

data/lib/capybara/spec/session/node_spec.rb

@@ -163,6 +163,12 @@ Capybara::SpecHelper.spec 'node' do
       @session.find(:css, '#single_input').set("my entry\n")
       expect(extract_results(@session)['single_input']).to eq('my entry')
     end
+
+    it 'should not submit single text input forms if ended with \n and has multiple values' do
+      @session.visit('/form')
+      @session.find(:css, '#two_input_1').set("my entry\n")
+      expect(@session.find(:css, '#two_input_1').value).to eq("my entry\n").or(eq 'my entry')
+    end
   end
 
   describe '#tag_name' do

data/lib/capybara/spec/session/node_wrapper_spec.rb

@@ -34,6 +34,6 @@ Capybara::SpecHelper.spec '#to_capybara_node' do
     end.to raise_error(/^expected to find css "#second" within #<Capybara::Node::Element/)
     expect do
       expect(para).to have_link(href: %r{/without_simple_html})
-    end.to raise_error(%r{^expected to find link nil with href matching /\\/without_simple_html/ within #<Capybara::Node::Element})
+    end.to raise_error(%r{^expected to find link with href matching /\\/without_simple_html/ within #<Capybara::Node::Element})
   end
 end

data/lib/capybara/spec/session/uncheck_spec.rb

@@ -50,7 +50,7 @@ Capybara::SpecHelper.spec '#uncheck' do
 
     it 'should not accept partial matches when true' do
       expect do
-        @session.uncheck('Ham', exact:  true)
+        @session.uncheck('Ham', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

data/lib/capybara/spec/spec_helper.rb

@@ -72,7 +72,7 @@ module Capybara
             session.reset_session!
           end
 
-          before :each, psc: true do
+          before :each, :psc do
             SpecHelper.reset_threadsafe(bool: true, session: session)
           end
 
@@ -138,4 +138,4 @@ module Capybara
   end
 end
 
-Dir["#{File.dirname(__FILE__)}/session/**/*.rb"].sort.each { |file| require_relative file }
+Dir["#{File.dirname(__FILE__)}/session/**/*.rb"].each { |file| require_relative file }

data/lib/capybara/spec/test_app.rb

@@ -248,7 +248,7 @@ class TestApp < Sinatra::Base
       'Thomas, Walpole, was , here'
   end
 
-  get '/apple-touch-icon-precomposed.png' do
+  get %r{/apple-touch-.*\.png/} do
     halt(404)
   end
 

data/lib/capybara/spec/views/form.erb

@@ -699,6 +699,11 @@ New line after and before textarea tag
   <input type="text" name="form[single_input]" id="single_input"/>
 </form>
 
+<form id="two_input_form" action="/form" method="post">
+  <input type="text" name="form[two_input_1]" id="two_input_1"/>
+  <input type="text" name="form[two_input_2]" id="two_input_2"/>
+</form>
+
 <label>Confusion
   <input type="checkbox" id="confusion_checkbox" class="confusion-checkbox confusion"/>
 </label>

data/lib/capybara/spec/views/with_html.erb

@@ -200,6 +200,8 @@ banana</textarea>
   </div>
 </details>
 
+<div style='height: 1000px'>spacer</div>
+
 <template id="template">
   <input />
 </template>

data/lib/capybara/version.rb

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

data/lib/capybara.rb

@@ -260,7 +260,7 @@ module Capybara
     #
     def current_driver
       if threadsafe
-        Thread.current['capybara_current_driver']
+        Thread.current.thread_variable_get :capybara_current_driver
       else
         @current_driver
       end || default_driver
@@ -269,7 +269,7 @@ module Capybara
 
     def current_driver=(name)
       if threadsafe
-        Thread.current['capybara_current_driver'] = name
+        Thread.current.thread_variable_set :capybara_current_driver, name
       else
         @current_driver = name
       end
@@ -336,7 +336,8 @@ module Capybara
     #
     def session_name
       if threadsafe
-        Thread.current['capybara_session_name'] ||= :default
+        Thread.current.thread_variable_get(:capybara_session_name) ||
+          Thread.current.thread_variable_set(:capybara_session_name, :default)
       else
         @session_name ||= :default
       end
@@ -344,7 +345,7 @@ module Capybara
 
     def session_name=(name)
       if threadsafe
-        Thread.current['capybara_session_name'] = name
+        Thread.current.thread_variable_set :capybara_session_name, name
       else
         @session_name = name
       end
@@ -424,7 +425,7 @@ module Capybara
 
     def specified_session
       if threadsafe
-        Thread.current['capybara_specified_session']
+        Thread.current.thread_variable_get :capybara_specified_session
       else
         @specified_session ||= nil
       end
@@ -432,7 +433,7 @@ module Capybara
 
     def specified_session=(session)
       if threadsafe
-        Thread.current['capybara_specified_session'] = session
+        Thread.current.thread_variable_set :capybara_specified_session, session
       else
         @specified_session = session
       end

data/spec/minitest_spec.rb

@@ -60,6 +60,13 @@ class MinitestTest < Minitest::Test
     refute_selector(:css, 'select#not_form_title')
   end
 
+  def test_assert_element
+    visit('/with_html')
+    assert_element('a', text: 'A link')
+    assert_element(count: 1) { |el| el.text == 'A link' }
+    assert_no_element(text: 'Not on page')
+  end
+
   def test_assert_link
     visit('/with_html')
     assert_link('A link')
@@ -163,6 +170,6 @@ RSpec.describe 'capybara/minitest' do
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include('22 runs, 53 assertions, 0 failures, 0 errors, 1 skips')
+    expect(output.string).to include('23 runs, 56 assertions, 0 failures, 0 errors, 1 skips')
   end
 end

data/spec/result_spec.rb

@@ -30,6 +30,15 @@ RSpec.describe Capybara::Result do
     result.last.text == 'Delta'
   end
 
+  it 'splats into multiple assignment' do
+    first, *rest, last = result
+
+    expect(first).to have_text 'Alpha'
+    expect(rest.first).to have_text 'Beta'
+    expect(rest.last).to have_text 'Gamma'
+    expect(last).to have_text 'Delta'
+  end
+
   it 'can supports values_at method' do
     expect(result.values_at(0, 2).map(&:text)).to eq(%w[Alpha Gamma])
   end

data/spec/rspec/shared_spec_matchers.rb

@@ -503,6 +503,30 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
   end
 
+  describe 'have_element matcher' do
+    let(:html) { '<img src="/img.jpg" alt="a JPEG"><img src="/img.png" alt="a PNG">' }
+
+    it 'gives proper description' do
+      expect(have_element('img').description).to eq('have visible element "img"')
+    end
+
+    it 'passes if there is such a element' do
+      expect(html).to have_element('img', src: '/img.jpg')
+    end
+
+    it 'fails if there is no such element' do
+      expect do
+        expect(html).to have_element('photo')
+      end.to raise_error(/expected to find element "photo"/)
+    end
+
+    it 'supports compounding' do
+      expect(html).to have_element('img', alt: 'a JPEG').and have_element('img', src: '/img.png')
+      expect(html).to have_element('photo').or have_element('img', src: '/img.jpg')
+      expect(html).to have_no_element('photo').and have_element('img', alt: 'a PNG')
+    end
+  end
+
   describe 'have_link matcher' do
     let(:html) { '<a href="#">Just a link</a><a href="#">Another link</a>' }
 
@@ -840,10 +864,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 RSpec/Capybara/VisibilityMatcher
+      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: :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 RSpec/Capybara/VisibilityMatcher
+      expect(have_table('Lovely table', visible: false).description).to eq('have table "Lovely table"') # rubocop:disable Capybara/VisibilityMatcher
     end
 
     it 'passes if there is such a table' do

data/spec/rspec_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe 'capybara/rspec' do
       end
     end
 
-    it 'switches to the javascript driver when giving it as metadata', js: true do
+    it 'switches to the javascript driver when giving it as metadata', :js do
       expect(Capybara.current_driver).to eq(Capybara.javascript_driver)
     end
 

data/spec/sauce_spec_chrome.rb

@@ -10,7 +10,7 @@ require 'sauce_whisk'
 
 Capybara.register_driver :sauce_chrome do |app|
   options = {
-    selenium_version: '3.141.59',
+    selenium_version: '4.8.0',
     platform: 'macOS 10.12',
     browser_name: 'chrome',
     version: '65.0',

data/spec/selector_spec.rb

@@ -117,7 +117,7 @@ RSpec.describe Capybara do
           css { |_sel| 'input[type="hidden"]' }
         end
 
-        expect(string).to have_no_css('input[type="hidden"]') # rubocop:disable RSpec/Capybara/SpecificMatcher
+        expect(string).to have_no_css('input[type="hidden"]') # rubocop:disable Capybara/SpecificMatcher
         expect(string).to have_selector(:hidden_field)
       end
     end

data/spec/selenium_spec_chrome.rb

@@ -10,8 +10,13 @@ CHROME_DRIVER = :selenium_chrome
 
 Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV.fetch('CI', nil) && ENV.fetch('CHROME_BETA', nil)
 
-browser_options = Selenium::WebDriver::Chrome::Options.new
-browser_options.add_argument('--headless') if ENV['HEADLESS']
+Selenium::WebDriver.logger.ignore(:selenium_manager)
+
+browser_options = if ENV['HEADLESS']
+  Selenium::WebDriver::Options.chrome(args: ['--headless=new'])
+else
+  Selenium::WebDriver::Options.chrome
+end
 
 # Chromedriver 77 requires setting this for headless mode on linux
 # Different versions of Chrome/selenium-webdriver require setting differently - jus set them all
@@ -83,12 +88,9 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybar
   case example.metadata[:full_description]
   when /#click_link can download a file$/
     skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
-  when /Capybara::Session selenium_chrome Capybara::Window#maximize/
-    pending "Chrome headless doesn't support maximize" if ENV['HEADLESS']
   when /Capybara::Session selenium_chrome node #shadow_root should get visible text/
     pending "Selenium doesn't currently support getting visible text for shadow root elements"
   when /Capybara::Session selenium_chrome node #shadow_root/
-    skip 'Not supported with this Selenium version' if selenium_lt?('4.1', @session)
     skip 'Not supported with this chromedriver version' if chromedriver_lt?('96.0', @session)
   end
 end

data/spec/selenium_spec_chrome_remote.rb

@@ -57,14 +57,9 @@ skipped_tests = %i[response_headers status_code trigger download]
 
 Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_REMOTE_DRIVER.to_s, capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
-  when 'Capybara::Session selenium_chrome_remote #attach_file with multipart form should not break when using HTML5 multiple file input uploading multiple files',
-       'Capybara::Session selenium_chrome_remote #attach_file with multipart form should fire change once for each set of files uploaded',
-       'Capybara::Session selenium_chrome_remote #attach_file with multipart form should fire change once when uploading multiple files from empty'
-    pending "Selenium with Remote Chrome doesn't support multiple file upload" unless selenium_gte?(3.14)
   when /Capybara::Session selenium_chrome_remote node #shadow_root should get visible text/
     pending "Selenium doesn't currently support getting visible text for shadow root elements"
   when /Capybara::Session selenium_chrome_remote node #shadow_root/
-    skip 'Not supported with this Selenium version' if selenium_lt?('4.1', @session)
     skip 'Not supported with this chromedriver version' if chromedriver_lt?('96.0', @session)
   end
 end

data/spec/selenium_spec_edge.rb

@@ -10,6 +10,8 @@ require 'rspec/shared_spec_matchers'
 #   Selenium::WebDriver::Edge::Service.driver_path = '/usr/local/bin/msedgedriver'
 # end
 
+Selenium::WebDriver.logger.ignore(:selenium_manager)
+
 if Selenium::WebDriver::Platform.mac?
   Selenium::WebDriver::Edge.path = '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge'
 end
@@ -17,8 +19,15 @@ end
 Capybara.register_driver :selenium_edge do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
   # If we don't create an options object the path set above won't be used
-  browser_options = Selenium::WebDriver::Edge::Options.new
-  browser_options.add_argument('--headless') if ENV['HEADLESS']
+
+  # browser_options = Selenium::WebDriver::Edge::Options.new
+  # browser_options.add_argument('--headless') if ENV['HEADLESS']
+
+  browser_options = if ENV['HEADLESS']
+    Selenium::WebDriver::Options.edge(args: ['--headless=new'])
+  else
+    Selenium::WebDriver::Options.edge
+  end
 
   Capybara::Selenium::Driver.new(app, browser: :edge, options: browser_options).tap do |driver|
     driver.browser
@@ -40,8 +49,6 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumEdge, 'selenium', capybara_
     pending "Edge doesn't allow clicking on file inputs"
   when /Capybara::Session selenium node #shadow_root should get visible text/
     pending "Selenium doesn't currently support getting visible text for shadow root elements"
-  when /Capybara::Session selenium Capybara::Window#maximize/
-    pending "Edge headless doesn't support maximize" if ENV['HEADLESS']
   end
 end
 

data/spec/selenium_spec_firefox.rb

@@ -6,8 +6,10 @@ require 'shared_selenium_session'
 require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
+Selenium::WebDriver.logger.ignore(:selenium_manager)
+
 browser_options = Selenium::WebDriver::Firefox::Options.new
-browser_options.headless! if ENV['HEADLESS']
+browser_options.add_argument '-headless' if ENV['HEADLESS']
 # browser_options.add_option("log", {"level": "trace"})
 
 browser_options.profile = Selenium::WebDriver::Firefox::Profile.new.tap do |profile|
@@ -78,13 +80,12 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
        'Capybara::Session selenium node #shadow_root should use convenience methods once moved to a descendant of the shadow root',
        'Capybara::Session selenium node #shadow_root should produce error messages when failing',
        'Capybara::Session with firefox with selenium driver #evaluate_script returns a shadow root'
-    pending "Firefox doesn't yet have full W3C shadow root support"
+    pending "Firefox doesn't yet have full W3C shadow root support" if firefox_lt?(113, @session)
   when 'Capybara::Session selenium #fill_in should handle carriage returns with line feeds in a textarea correctly'
     pending 'Not sure what firefox is doing here'
   when /Capybara::Session selenium node #shadow_root should get visible text/
     pending "Selenium doesn't currently support getting visible text for shadow root elements"
   when /Capybara::Session selenium node #shadow_root/
-    skip 'Not supported with this Selenium version' if selenium_lt?('4.1', @session)
     skip 'Not supported with this geckodriver version' if geckodriver_lt?('0.31.0', @session)
   when /Capybara::Session selenium node #set should submit single text input forms if ended with \\n/
     pending 'Firefox/geckodriver doesn\'t submit with values ending in \n'

data/spec/selenium_spec_firefox_remote.rb

@@ -71,14 +71,13 @@ Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVE
        'Capybara::Session selenium_firefox_remote node #shadow_root should click on elements',
        'Capybara::Session selenium_firefox_remote node #shadow_root should use convenience methods once moved to a descendant of the shadow root',
        'Capybara::Session selenium_firefox_remote node #shadow_root should produce error messages when failing',
-       'Capybara::Session with firefox with selenium driver #evaluate_script returns a shadow root'
+       'Capybara::Session with remote firefox with selenium driver #evaluate_script returns a shadow root'
     pending "Firefox doesn't yet have full W3C shadow root support"
   when /Capybara::Session selenium_firefox_remote node #shadow_root should get visible text/
     pending "Selenium doesn't currently support getting visible text for shadow root elements"
   when /Capybara::Session selenium_firefox_remote node #shadow_root/
-    skip 'Not supported with this Selenium version' if selenium_lt?('4.1', @session)
     skip 'Not supported with this geckodriver version' if geckodriver_lt?('0.31.0', @session)
-  when /Capybara::Session selenium_firefox_remote node #set should submit single text input forms if ended with \\n/
+  when /Capybara::Session selenium node #set should submit single text input forms if ended with \\n/
     pending 'Firefox/geckodriver doesn\'t submit with values ending in \n'
   end
 end