capybara 3.38.0 → 3.39.1

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

@@ -131,6 +131,17 @@ Capybara::SpecHelper.spec '#click_link' do
     end
   end
 
+  context 'with :target option given' do
+    it 'should find links with valid target' do
+      @session.click_link('labore', target: '_self')
+      expect(@session).to have_content('Bar')
+    end
+
+    it "should raise error if link wasn't found" do
+      expect { @session.click_link('labore', target: '_blank') }.to raise_error(Capybara::ElementNotFound, /Unable to find link "labore"/)
+    end
+  end
+
   it 'should follow relative links' do
     @session.visit('/')
     @session.click_link('Relative')

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

@@ -67,4 +67,14 @@ Capybara::SpecHelper.spec '#find_link' do
       expect { @session.find_link(download: 37) }.to raise_error ArgumentError
     end
   end
+
+  context 'with :target option' do
+    it 'should accept partial matches when false' do
+      expect(@session.find_link(target: '_self').text).to eq('labore')
+    end
+
+    it 'should not accept partial matches when true' do
+      expect { @session.find_link(target: '_blank') }.to raise_error Capybara::ElementNotFound
+    end
+  end
 end

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

@@ -236,7 +236,7 @@ Capybara::SpecHelper.spec '#find' do
   it 'should accept an XPath instance' do
     @session.visit('/form')
     @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('First Name')
-    expect(@xpath).to be_a(::XPath::Union)
+    expect(@xpath).to be_a(XPath::Union)
     expect(@session.find(@xpath).value).to eq('John')
   end
 

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

@@ -25,7 +25,7 @@ Capybara::SpecHelper.spec '#first' do
   it 'should accept an XPath instance' do
     @session.visit('/form')
     @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('First Name')
-    expect(@xpath).to be_a(::XPath::Union)
+    expect(@xpath).to be_a(XPath::Union)
     expect(@session.first(@xpath).value).to eq('John')
   end
 

data/lib/capybara/spec/session/frame/within_frame_spec.rb

@@ -64,7 +64,9 @@ Capybara::SpecHelper.spec '#within_frame', requires: [:frames] do
     end
     expect do
       # Multiple frames in scope here
+      # rubocop:disable Style/Semicolon
       @session.within_frame { ; }
+      # rubocop:enable Style/Semicolon
     end.to raise_error Capybara::Ambiguous
   end
 

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

@@ -12,7 +12,7 @@ Capybara::SpecHelper.spec '#have_all_of_selectors' do
   it 'should be false if any of the given selectors are not on the page' do
     expect do
       expect(@session).to have_all_of_selectors(:css, 'p a#foo', 'h2#h2three', 'h2#h2one')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   it 'should use default selector' do
@@ -20,7 +20,7 @@ Capybara::SpecHelper.spec '#have_all_of_selectors' do
     expect(@session).to have_all_of_selectors('p a#foo', 'h2#h2two', 'h2#h2one')
     expect do
       expect(@session).to have_all_of_selectors('p a#foo', 'h2#h2three', 'h2#h2one')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   context 'should respect scopes' do
@@ -29,7 +29,7 @@ Capybara::SpecHelper.spec '#have_all_of_selectors' do
         expect(@session).to have_all_of_selectors(".//a[@id='foo']")
         expect do
           expect(@session).to have_all_of_selectors(".//a[@id='red']")
-        end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+        end.to raise_error RSpec::Expectations::ExpectationNotMetError
       end
     end
 
@@ -38,7 +38,7 @@ Capybara::SpecHelper.spec '#have_all_of_selectors' do
       expect(el).to have_all_of_selectors(".//a[@id='foo']")
       expect do
         expect(el).to have_all_of_selectors(".//a[@id='red']")
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
     end
   end
 
@@ -47,7 +47,7 @@ Capybara::SpecHelper.spec '#have_all_of_selectors' do
       expect(@session).to have_all_of_selectors(:field, 'normal', 'additional_newline', type: :textarea)
       expect do
         expect(@session).to have_all_of_selectors(:field, 'normal', 'test_field', 'additional_newline', type: :textarea)
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
     end
   end
 

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

@@ -12,7 +12,7 @@ Capybara::SpecHelper.spec '#have_any_of_selectors' do
   it 'should be false if none of the given selectors are not on the page' do
     expect do
       expect(@session).to have_any_of_selectors(:css, 'span a#foo', 'h2#h2nope', 'h2#h2one_no')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   it 'should use default selector' do
@@ -20,7 +20,7 @@ Capybara::SpecHelper.spec '#have_any_of_selectors' do
     expect(@session).to have_any_of_selectors('p a#foo', 'h2#h2two', 'a#not_on_page')
     expect do
       expect(@session).to have_any_of_selectors('p a#blah', 'h2#h2three')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   it 'should be negateable' do

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

@@ -75,7 +75,7 @@ Capybara::SpecHelper.spec '#has_current_path?' do
     @session.visit('/with_js?test=test')
     expect(@session).to have_current_path('/with_js?test=test')
     expect(@session).to have_current_path('/with_js', ignore_query: true)
-    uri = ::Addressable::URI.parse(@session.current_url)
+    uri = Addressable::URI.parse(@session.current_url)
     uri.query = nil
     expect(@session).to have_current_path(uri.to_s, ignore_query: true)
   end

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

@@ -11,12 +11,14 @@ Capybara::SpecHelper.spec '#has_link?' do
     expect(@session).to have_link('A link', href: '/with_simple_html')
     expect(@session).to have_link(:'A link', href: :'/with_simple_html')
     expect(@session).to have_link('A link', href: %r{/with_simple_html})
+    expect(@session).to have_link('labore', target: '_self')
   end
 
   it 'should be false if the given link is not on the page' do
     expect(@session).not_to have_link('monkey')
     expect(@session).not_to have_link('A link', href: '/nonexistent-href')
     expect(@session).not_to have_link('A link', href: /nonexistent/)
+    expect(@session).not_to have_link('labore', target: '_blank')
   end
 
   it 'should notify if an invalid locator is specified' do
@@ -40,7 +42,7 @@ Capybara::SpecHelper.spec '#has_link?' do
   it 'should raise an error if an invalid option is passed' do
     expect do
       expect(@session).to have_link('labore', invalid: true)
-    end.to raise_error(ArgumentError, 'Invalid option(s) :invalid, should be one of :above, :below, :left_of, :right_of, :near, :count, :minimum, :maximum, :between, :text, :id, :class, :style, :visible, :obscured, :exact, :exact_text, :normalize_ws, :match, :wait, :filter_set, :focused, :href, :alt, :title, :download')
+    end.to raise_error(ArgumentError, 'Invalid option(s) :invalid, should be one of :above, :below, :left_of, :right_of, :near, :count, :minimum, :maximum, :between, :text, :id, :class, :style, :visible, :obscured, :exact, :exact_text, :normalize_ws, :match, :wait, :filter_set, :focused, :href, :alt, :title, :target, :download')
   end
 end
 
@@ -53,12 +55,14 @@ Capybara::SpecHelper.spec '#has_no_link?' do
     expect(@session).not_to have_no_link('foo')
     expect(@session).not_to have_no_link('awesome title')
     expect(@session).not_to have_no_link('A link', href: '/with_simple_html')
+    expect(@session).not_to have_no_link('labore', target: '_self')
   end
 
   it 'should be true if the given link is not on the page' do
     expect(@session).to have_no_link('monkey')
     expect(@session).to have_no_link('A link', href: '/nonexistent-href')
     expect(@session).to have_no_link('A link', href: %r{/nonexistent-href})
+    expect(@session).to have_no_link('labore', target: '_blank')
   end
 
   context 'with focused:', requires: [:active_element] do

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

@@ -8,10 +8,10 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
   it 'should be false if any of the given locators are on the page' do
     expect do
       expect(@session).to have_none_of_selectors(:xpath, '//p', '//a')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
     expect do
       expect(@session).to have_none_of_selectors(:css, 'p a#foo')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   it 'should be true if none of the given locators are on the page' do
@@ -24,7 +24,7 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
     expect(@session).to have_none_of_selectors('p a#doesnotexist', 'abbr')
     expect do
       expect(@session).to have_none_of_selectors('abbr', 'p a#foo')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   context 'should respect scopes' do
@@ -32,7 +32,7 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
       @session.within "//p[@id='first']" do
         expect do
           expect(@session).to have_none_of_selectors(".//a[@id='foo']")
-        end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+        end.to raise_error RSpec::Expectations::ExpectationNotMetError
         expect(@session).to have_none_of_selectors(".//a[@id='red']")
       end
     end
@@ -41,7 +41,7 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
       el = @session.find "//p[@id='first']"
       expect do
         expect(el).to have_none_of_selectors(".//a[@id='foo']")
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
       expect(el).to have_none_of_selectors(".//a[@id='red']")
     end
   end
@@ -50,14 +50,14 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
     it 'should apply the options to all locators' do
       expect do
         expect(@session).to have_none_of_selectors('//p//a', text: 'Redirect')
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
       expect(@session).to have_none_of_selectors('//p', text: 'Doesnotexist')
     end
 
     it 'should discard all matches where the given regexp is matched' do
       expect do
         expect(@session).to have_none_of_selectors('//p//a', text: /re[dab]i/i, count: 1)
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
       expect(@session).to have_none_of_selectors('//p//a', text: /Red$/)
     end
   end

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

@@ -23,6 +23,7 @@ Capybara::SpecHelper.spec '#matches_style?', requires: [:css] do
     expect(@session.find(:css, '#first').matches_style?(display: /^in/)).to be false
   end
 
+  # rubocop:disable Capybara/MatchStyle
   it 'deprecated has_style?' do
     expect { have_style(display: /^bl/) }.to \
       output(/have_style is deprecated/).to_stderr
@@ -32,4 +33,5 @@ Capybara::SpecHelper.spec '#matches_style?', requires: [:css] do
     el.has_style?('display' => /^bl/)
     expect(Capybara::Helpers).to have_received(:warn)
   end
+  # rubocop:enable Capybara/MatchStyle
 end

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

@@ -157,6 +157,12 @@ Capybara::SpecHelper.spec 'node' do
         expect(@session.find(:css, '#existing_content_editable_child_parent').text).to eq("Some content\nWYSIWYG")
       end
     end
+
+    it 'should submit single text input forms if ended with \n' do
+      @session.visit('/form')
+      @session.find(:css, '#single_input').set("my entry\n")
+      expect(extract_results(@session)['single_input']).to eq('my entry')
+    end
   end
 
   describe '#tag_name' do
@@ -651,6 +657,16 @@ Capybara::SpecHelper.spec 'node' do
           expect(target).to have_text(%r{^HTML5 Dropped string: text/plain drag_html5-#{key}$}m, exact: true)
         end
       end
+
+      it 'should trigger a dragenter event, before the first dragover event' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5"]')
+        target = @session.find('//div[@id="drop_html5"]')
+        element.drag_to(target)
+
+        # Events are listed in reverse chronological order
+        expect(@session).to have_text(/DragOver.*DragEnter/m)
+      end
     end
   end
 

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

@@ -36,7 +36,9 @@ Capybara::SpecHelper.spec '#scroll_to', requires: [:scroll] do
   it 'can scroll the window to the vertical bottom' do
     @session.scroll_to :bottom
     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]
+    scrolled_location_x, scrolled_location_y = @session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')
+    expect(scrolled_location_x).to be_within(0.5).of(0)
+    expect(scrolled_location_y).to be_within(0.5).of(max_scroll)
   end
 
   it 'can scroll the window to the vertical center' do

data/lib/capybara/spec/session/window/windows_spec.rb

@@ -29,6 +29,6 @@ Capybara::SpecHelper.spec '#windows', requires: [:windows] do
     titles = @session.windows.map do |window|
       @session.within_window(window) { @session.title }
     end
-    expect(titles).to match_array(['With Windows', 'Title of the first popup', 'Title of popup two'])
+    expect(titles).to match_array(['With Windows', 'Title of the first popup', 'Title of popup two']) # rubocop:disable RSpec/MatchArray
   end
 end

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

@@ -695,6 +695,10 @@ New line after and before textarea tag
   </p>
 </form>
 
+<form id="single_input_form" action="/form" method="post">
+  <input type="text" name="form[single_input]" id="single_input"/>
+</form>
+
 <label>Confusion
   <input type="checkbox" id="confusion_checkbox" class="confusion-checkbox confusion"/>
 </label>

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

@@ -19,7 +19,7 @@
 
 <p class="para" id="first" data-random="abc\def" style="line-height: 25px;">
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-  tempor incididunt ut <a href="/with_simple_html" title="awesome title" class="simple" tabindex="1">labore</a>
+  tempor incididunt ut <a href="/with_simple_html" title="awesome title" class="simple" tabindex="1" target="_self">labore</a>
   et dolore magna aliqua. Ut enim ad minim veniam,
   quis nostrud exercitation <a href="/foo" id="foo" data-test-id="test-foo">ullamco</a> laboris nisi
   ut aliquip ex ea commodo consequat.

data/lib/capybara/version.rb

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

data/spec/css_builder_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 # rubocop:disable RSpec/InstanceVariable
 RSpec.describe Capybara::Selector::CSSBuilder do
   let :builder do
-    ::Capybara::Selector::CSSBuilder.new(@css)
+    described_class.new(@css)
   end
 
   context 'add_attribute_conditions' do

data/spec/css_splitter_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Capybara::Selector::CSS::Splitter do
   let :splitter do
-    ::Capybara::Selector::CSS::Splitter.new
+    described_class.new
   end
 
   context 'split not needed' do

data/spec/rack_test_spec.rb

@@ -220,7 +220,7 @@ RSpec.describe Capybara::RackTest::Driver do
       driver = described_class.new(TestApp)
 
       driver.visit('/redirect')
-      expect(driver.response.header['Location']).to be_nil
+      expect(driver.response.headers['Location']).to be_nil
       expect(driver.current_url).to match %r{/landed$}
     end
 
@@ -234,7 +234,7 @@ RSpec.describe Capybara::RackTest::Driver do
       driver = described_class.new(TestApp, follow_redirects: false)
 
       driver.visit('/redirect')
-      expect(driver.response.header['Location']).to match %r{/redirect_again$}
+      expect(driver.response.headers['Location']).to match %r{/redirect_again$}
       expect(driver.current_url).to match %r{/redirect$}
     end
   end

data/spec/rspec/scenarios_spec.rb

@@ -16,7 +16,7 @@ feature 'if fscenario aliases focused tag then' do
 end
 
 feature 'if xscenario aliases to pending then' do
-  xscenario "this test should be 'temporarily disabled with xscenario'" do
+  xscenario "this test should be 'temporarily disabled with xscenario'" do # rubocop:disable RSpec/PendingWithoutReason
   end
 end
 

data/spec/rspec_matchers_spec.rb

@@ -56,6 +56,31 @@ RSpec.describe 'Capybara RSpec Matchers', type: :feature do
     end
   end
 
+  context 'with a filter block' do
+    it 'applies the filter' do
+      visit('/with_html')
+      expect(page).to have_selector(:css, 'input#test_field')
+
+      expect(page).to have_selector(:css, 'input', count: 1) { |input| input.value == 'monkey' }
+      expect(page).to have_selector(:css, 'input', count: 1) do |input|
+        input.value == 'monkey'
+      end
+      expect(page).to have_no_selector(:css, 'input#test_field') { |input| input.value == 'not a monkey' }
+      expect(page).to have_no_selector(:css, 'input#test_field') do |input|
+        input.value == 'not a monkey'
+      end
+
+      expect(page).not_to have_selector(:css, 'input#test_field') { |input| input.value == 'not a monkey' }
+      expect(page).not_to have_selector(:css, 'input#test_field') do |input|
+        input.value == 'not a monkey'
+      end
+      expect(page).not_to have_no_selector(:css, 'input', count: 1) { |input| input.value == 'monkey' }
+      expect(page).not_to have_no_selector(:css, 'input#test_field', count: 1) do |input|
+        input.value == 'monkey'
+      end
+    end
+  end
+
   def error_msg_for(&block)
     expect(&block).to(raise_error { |e| return e.message })
   end

data/spec/sauce_spec_chrome.rb

@@ -27,7 +27,7 @@ Capybara.register_driver :sauce_chrome do |app|
 
   Capybara::Selenium::Driver.new(app,
                                  browser: :remote, url: url,
-                                 desired_capabilities: capabilities,
+                                 capabilities: capabilities,
                                  options: Selenium::WebDriver::Chrome::Options.new(args: ['']))
 end
 

data/spec/selenium_spec_chrome.rb

@@ -10,8 +10,8 @@ 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.headless! if ENV['HEADLESS']
+browser_options = Selenium::WebDriver::Chrome::Options.new
+browser_options.add_argument('--headless') if ENV['HEADLESS']
 
 # Chromedriver 77 requires setting this for headless mode on linux
 # Different versions of Chrome/selenium-webdriver require setting differently - jus set them all
@@ -87,6 +87,9 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybar
     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
 
@@ -201,8 +204,4 @@ 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

@@ -39,11 +39,10 @@ Capybara.register_driver :selenium_chrome_remote do |app|
   ensure_selenium_running!
 
   url = "http://#{selenium_host}:#{selenium_port}/wd/hub"
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new
+  browser_options = Selenium::WebDriver::Chrome::Options.new
 
   Capybara::Selenium::Driver.new app,
                                  browser: :remote,
-                                 desired_capabilities: :chrome,
                                  options: browser_options,
                                  url: url
 end
@@ -62,8 +61,11 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_REMOTE_DRIVER.to_s,
        '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 node #shadow_root should get visible text/
+  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
 
@@ -96,8 +98,4 @@ 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_edge.rb

@@ -10,15 +10,17 @@ require 'rspec/shared_spec_matchers'
 #   Selenium::WebDriver::Edge::Service.driver_path = '/usr/local/bin/msedgedriver'
 # end
 
-if ::Selenium::WebDriver::Platform.mac?
-  Selenium::WebDriver::EdgeChrome.path = '/Applications/Microsoft Edge Dev.app/Contents/MacOS/Microsoft Edge Dev'
+if Selenium::WebDriver::Platform.mac?
+  Selenium::WebDriver::Edge.path = '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge'
 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::EdgeChrome::Options.new
-  Capybara::Selenium::Driver.new(app, browser: :edge_chrome, options: browser_options).tap do |driver|
+  browser_options = Selenium::WebDriver::Edge::Options.new
+  browser_options.add_argument('--headless') if ENV['HEADLESS']
+
+  Capybara::Selenium::Driver.new(app, browser: :edge, options: browser_options).tap do |driver|
     driver.browser
     driver.download_path = Capybara.save_path
   end
@@ -30,14 +32,16 @@ end
 
 skipped_tests = %i[response_headers status_code trigger]
 
-Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::EdgeChrome) if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Edge) if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::SeleniumEdge, 'selenium', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
   when 'Capybara::Session selenium #attach_file with a block can upload by clicking the file input'
-    pending "EdgeChrome doesn't allow clicking on file inputs"
-  when /Capybara::Session selenium_chrome node #shadow_root should get visible text/
+    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,7 +6,7 @@ require 'shared_selenium_session'
 require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
-browser_options = ::Selenium::WebDriver::Firefox::Options.new
+browser_options = Selenium::WebDriver::Firefox::Options.new
 browser_options.headless! if ENV['HEADLESS']
 # browser_options.add_option("log", {"level": "trace"})
 
@@ -62,7 +62,7 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
   when 'Capybara::Session selenium #accept_confirm should work with nested modals'
     skip 'Broken in 63 <= FF < 69 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session) && firefox_lt?(69, @session)
     skip 'Hangs in 69 <= FF < 71 - Dont know what issue for this - previous issue was closed as fixed but it is not' if firefox_gte?(69, @session) && firefox_lt?(71, @session)
-    skip 'Broken again intermittently in FF 71 - jus skip it'
+    skip 'Broken again intermittently in FF 71 - jus skip it' if firefox_lt?(109, @session) # don't really know when it was fixed
   when 'Capybara::Session selenium #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 #reset_session! removes ALL cookies'
@@ -71,17 +71,23 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
     pending "Firefox < 62 doesn't support a DataTransfer constructor" if firefox_lt?(62.0, @session)
   when 'Capybara::Session selenium #accept_alert should handle the alert if the page changes',
        'Capybara::Session selenium #accept_alert with an asynchronous alert should accept the alert'
-    skip 'No clue what Firefox is doing here - works fine on MacOS locally'
+    skip 'No clue what Firefox is doing here - works fine on MacOS locally' if firefox_lt?(109, @session) # don't really know when it was fixed
   when 'Capybara::Session selenium node #shadow_root should find elements inside the shadow dom using CSS',
        'Capybara::Session selenium node #shadow_root should find nested shadow roots',
        'Capybara::Session selenium node #shadow_root should click on elements',
        '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"
   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_chrome node #shadow_root should get visible text/
+  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'
   end
 end
 

data/spec/selenium_spec_firefox_remote.rb

@@ -35,11 +35,10 @@ Capybara.register_driver :selenium_firefox_remote do |app|
   ensure_selenium_running!
 
   url = "http://#{selenium_host}:#{selenium_port}/wd/hub"
-  browser_options = ::Selenium::WebDriver::Firefox::Options.new
+  browser_options = Selenium::WebDriver::Firefox::Options.new
 
   Capybara::Selenium::Driver.new app,
                                  browser: :remote,
-                                 desired_capabilities: :firefox,
                                  options: browser_options,
                                  url: url
 end
@@ -65,8 +64,22 @@ Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVE
   when /#accept_confirm should work with nested modals$/
     # skip because this is timing based and hence flaky when set to pending
     skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session)
-  when /Capybara::Session selenium_chrome node #shadow_root should get visible text/
+  when 'Capybara::Session selenium_firefox_remote #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_firefox_remote node #shadow_root should find elements inside the shadow dom using CSS',
+       'Capybara::Session selenium_firefox_remote node #shadow_root should find nested shadow roots',
+       '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'
+    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/
+    pending 'Firefox/geckodriver doesn\'t submit with values ending in \n'
   end
 end
 

data/spec/selenium_spec_ie.rb

@@ -28,7 +28,7 @@ end
 
 Capybara.register_driver :selenium_ie do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
-  options = ::Selenium::WebDriver::IE::Options.new
+  options = Selenium::WebDriver::IE::Options.new
   # options.require_window_focus = true
   # options.add_option("log", {"level": "trace"})
 

data/spec/selenium_spec_safari.rb

@@ -14,7 +14,7 @@ SAFARI_DRIVER = :selenium_safari
 #   ::Selenium::WebDriver::Safari
 # end.driver_path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
 
-browser_options = ::Selenium::WebDriver::Safari::Options.new
+browser_options = Selenium::WebDriver::Safari::Options.new
 # browser_options.headless! if ENV['HEADLESS']
 
 Capybara.register_driver :selenium_safari do |app|