capybara 3.35.2 → 3.37.0

data/spec/basic_node_spec.rb

@@ -111,14 +111,27 @@ RSpec.describe Capybara do
       expect(string.find('//form/input[@name="meh"]')).not_to be_disabled
     end
 
+    it 'allows finding siblings' do
+      h1 = string.find(:css, 'h1')
+      expect(h1).to have_sibling(:css, 'p', text: 'Yes it is')
+      expect(h1).not_to have_sibling(:css, 'p', text: 'Jonas Nicklas')
+    end
+
+    it 'allows finding ancestor' do
+      h1 = string.find(:css, 'h1')
+      expect(h1).to have_ancestor(:css, '#content')
+      expect(h1).not_to have_ancestor(:css, '#footer')
+    end
+
     it 'drops illegal fragments when using gumbo' do
       skip 'libxml is less strict than Gumbo' unless Nokogiri.respond_to?(:HTML5)
+      described_class.use_html5_parsing = true
       expect(described_class.string('<td>1</td>')).not_to have_css('td')
     end
 
-    it 'can disable use of gumbo' do
-      skip "Test doesn't make sense unlesss nokogumbo is loaded" unless Nokogiri.respond_to?(:HTML5)
-      described_class.allow_gumbo = false
+    it 'can disable use of HTML5 parsing' do
+      skip "Test doesn't make sense unlesss HTML5 parsing is loaded (Nokogumbo or Nokogiri >= 1.12.0)" unless Nokogiri.respond_to?(:HTML5)
+      described_class.use_html5_parsing = false
       expect(described_class.string('<td>1</td>')).to have_css('td')
     end
 

data/spec/dsl_spec.rb

@@ -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 shadow_dom
+  js modals screenshot frames windows send_keys server hover about_scheme psc download css driver scroll spatial html_validation shadow_dom active_element
 ] do |example|
   case example.metadata[:full_description]
   when /has_css\? should support case insensitive :class and :id options/
@@ -115,7 +115,7 @@ RSpec.describe Capybara::DSL do
     it 'should yield the passed block' do
       called = false
       Capybara.using_driver(:selenium) { called = true }
-      expect(called).to eq(true)
+      expect(called).to be(true)
     end
   end
 
@@ -220,7 +220,7 @@ RSpec.describe Capybara::DSL do
     it 'should yield the passed block' do
       called = false
       Capybara.using_session(:administrator) { called = true }
-      expect(called).to eq(true)
+      expect(called).to be(true)
     end
 
     it 'should be nestable' do

data/spec/fixtures/selenium_driver_rspec_failure.rb

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

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -5,9 +5,9 @@ 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 }
+    options = { browser: ENV.fetch('SELENIUM_BROWSER', :firefox).to_sym }
     browser = described_class.new(TestApp, **options).browser
     expect(browser).to be_truthy
-    expect(true).to eq(true) # rubocop:disable RSpec/ExpectActual
+    expect(true).to be(true) # rubocop:disable RSpec/ExpectActual,RSpec/IdenticalEqualityAssertion
   end
 end

data/spec/rack_test_spec.rb

@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-nokogumbo_required = begin
-  require 'nokogumbo'
-  true
-rescue LoadError
-  false
-end
 
 module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
@@ -28,6 +22,7 @@ skipped_tests = %i[
   spatial
   html_validation
   shadow_dom
+  active_element
 ]
 Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
@@ -153,6 +148,14 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
       end
     end
 
+    describe '#active_element' do
+      it 'raises an UnsupportedMethodError' do
+        session.visit('/form')
+
+        expect { session.active_element }.to raise_error(Capybara::NotSupportedByDriverError)
+      end
+    end
+
     describe '#text' do
       it 'should return original text content for textareas' do
         session.visit('/with_html')
@@ -213,6 +216,12 @@ RSpec.describe Capybara::RackTest::Driver do
       expect(driver.current_url).to match %r{/landed$}
     end
 
+    it 'should not include fragments in the referer header' do
+      driver.visit('/header_links#an-anchor')
+      driver.find_xpath('.//input').first.click
+      expect(driver.request.get_header('HTTP_REFERER')).to eq('http://www.example.com/header_links')
+    end
+
     it 'is possible to not follow redirects' do
       driver = described_class.new(TestApp, follow_redirects: false)
 
@@ -256,11 +265,12 @@ RSpec.describe Capybara::RackTest::Driver do
 end
 
 RSpec.describe 'Capybara::String' do
-  it 'should use gumbo' do
-    skip 'Only  valid if gumbo is included' unless nokogumbo_required
-    allow(Nokogiri).to receive(:HTML5).and_call_original
+  it 'should use HTML5 parsing' do
+    skip 'Only valid if Nokogiri >= 1.12.0 or gumbo is included' unless defined? Nokogiri::HTML5
+    Capybara.use_html5_parsing = true
+    allow(Nokogiri::HTML5).to receive(:parse).and_call_original
     Capybara.string('<div id=test_div></div>')
-    expect(Nokogiri).to have_received(:HTML5)
+    expect(Nokogiri::HTML5).to have_received(:parse)
   end
 end
 

data/spec/result_spec.rb

@@ -78,34 +78,31 @@ RSpec.describe Capybara::Result do
     expect(recalc_result[1...3].map(&:text)).to eq %w[Beta Gamma]
     expect(recalc_result[1..7].map(&:text)).to eq %w[Beta Gamma Delta]
     expect(recalc_result[2...-1].map(&:text)).to eq %w[Gamma]
-    expect(recalc_result[2..-1].map(&:text)).to eq %w[Gamma Delta]
+    expect(recalc_result[2..-1].map(&:text)).to eq %w[Gamma Delta] # rubocop:disable Style/SlicingWithRange
+    expect(recalc_result[2..].map(&:text)).to eq %w[Gamma Delta]
   end
 
-  eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
-    it 'supports endless ranges' do
-      expect(result[2..].map(&:text)).to eq %w[Gamma Delta]
-    end
-  TEST
+  it 'supports endless ranges' do
+    expect(result[2..].map(&:text)).to eq %w[Gamma Delta]
+  end
 
-  eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
-    it 'supports inclusive positive beginless ranges' do
-      expect(result[..2].map(&:text)).to eq %w[Alpha Beta Gamma]
-    end
+  it 'supports inclusive positive beginless ranges' do
+    expect(result[..2].map(&:text)).to eq %w[Alpha Beta Gamma]
+  end
 
-    it 'supports inclusive negative beginless ranges' do
-      expect(result[..-2].map(&:text)).to eq %w[Alpha Beta Gamma]
-      expect(result[..-1].map(&:text)).to eq %w[Alpha Beta Gamma Delta]
-    end
+  it 'supports inclusive negative beginless ranges' do
+    expect(result[..-2].map(&:text)).to eq %w[Alpha Beta Gamma]
+    expect(result[..-1].map(&:text)).to eq %w[Alpha Beta Gamma Delta]
+  end
 
-    it 'supports exclusive positive beginless ranges' do
-      expect(result[...2].map(&:text)).to eq %w[Alpha Beta]
-    end
+  it 'supports exclusive positive beginless ranges' do
+    expect(result[...2].map(&:text)).to eq %w[Alpha Beta]
+  end
 
-    it 'supports exclusive negative beginless ranges' do
-      expect(result[...-2].map(&:text)).to eq %w[Alpha Beta]
-      expect(result[...-1].map(&:text)).to eq %w[Alpha Beta Gamma]
-    end
-  TEST
+  it 'supports exclusive negative beginless ranges' do
+    expect(result[...-2].map(&:text)).to eq %w[Alpha Beta]
+    expect(result[...-1].map(&:text)).to eq %w[Alpha Beta Gamma]
+  end
 
   it 'works with filter blocks' do
     result = string.all('//li') { |node| node.text == 'Alpha' }
@@ -116,52 +113,52 @@ RSpec.describe Capybara::Result do
   it 'should evaluate filters lazily for idx' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     # Not processed until accessed
-    expect(result.instance_variable_get('@result_cache').size).to be 0
+    expect(result.instance_variable_get(:@result_cache).size).to be 0
 
     # Only one retrieved when needed
     result.first
-    expect(result.instance_variable_get('@result_cache').size).to be 1
+    expect(result.instance_variable_get(:@result_cache).size).to be 1
 
     # works for indexed access
     result[0]
-    expect(result.instance_variable_get('@result_cache').size).to be 1
+    expect(result.instance_variable_get(:@result_cache).size).to be 1
 
     result[2]
-    expect(result.instance_variable_get('@result_cache').size).to be 3
+    expect(result.instance_variable_get(:@result_cache).size).to be 3
 
     # All cached when converted to array
     result.to_a
-    expect(result.instance_variable_get('@result_cache').size).to eq 4
+    expect(result.instance_variable_get(:@result_cache).size).to eq 4
   end
 
   it 'should evaluate filters lazily for range' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result[0..1]
-    expect(result.instance_variable_get('@result_cache').size).to be 2
+    expect(result.instance_variable_get(:@result_cache).size).to be 2
 
     expect(result[0..7].size).to eq 4
-    expect(result.instance_variable_get('@result_cache').size).to be 4
+    expect(result.instance_variable_get(:@result_cache).size).to be 4
   end
 
   it 'should evaluate filters lazily for idx and length' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result[1, 2]
-    expect(result.instance_variable_get('@result_cache').size).to be 3
+    expect(result.instance_variable_get(:@result_cache).size).to be 3
 
     expect(result[2, 5].size).to eq 2
-    expect(result.instance_variable_get('@result_cache').size).to be 4
+    expect(result.instance_variable_get(:@result_cache).size).to be 4
   end
 
   it 'should only need to evaluate one result for any?' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result.any?
-    expect(result.instance_variable_get('@result_cache').size).to be 1
+    expect(result.instance_variable_get(:@result_cache).size).to be 1
   end
 
   it 'should evaluate all elements when #to_a called' do
     # All cached when converted to array
     result.to_a
-    expect(result.instance_variable_get('@result_cache').size).to eq 4
+    expect(result.instance_variable_get(:@result_cache).size).to eq 4
   end
 
   describe '#each' do
@@ -170,7 +167,7 @@ RSpec.describe Capybara::Result do
       results = []
       result.each do |el|
         results << el
-        expect(result.instance_variable_get('@result_cache').size).to eq results.size
+        expect(result.instance_variable_get(:@result_cache).size).to eq results.size
       end
 
       expect(results.size).to eq 4
@@ -184,7 +181,7 @@ RSpec.describe Capybara::Result do
       it 'lazily evaluates' do
         skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
         result.each.with_index do |_el, idx|
-          expect(result.instance_variable_get('@result_cache').size).to eq(idx + 1) # 0 indexing
+          expect(result.instance_variable_get(:@result_cache).size).to eq(idx + 1) # 0 indexing
         end
       end
     end

data/spec/rspec/features_spec.rb

@@ -91,11 +91,11 @@ end
 
 ffeature 'if ffeature aliases focused tag then' do # rubocop:disable RSpec/Focus
   scenario 'scenario inside this feature has metatag focus tag' do |example|
-    expect(example.metadata[:focus]).to eq true
+    expect(example.metadata[:focus]).to be true
   end
 
-  scenario 'other scenarios also has metatag focus tag ' do |example|
-    expect(example.metadata[:focus]).to eq true
+  scenario 'other scenarios also has metatag focus tag' do |example|
+    expect(example.metadata[:focus]).to be true
   end
 end
 # rubocop:enable RSpec/RepeatedExample, RSpec/MultipleDescribes

data/spec/rspec/scenarios_spec.rb

@@ -11,7 +11,7 @@ end
 
 feature 'if fscenario aliases focused tag then' do
   fscenario 'scenario should have focused meta tag' do |example| # rubocop:disable RSpec/Focus
-    expect(example.metadata[:focus]).to eq true
+    expect(example.metadata[:focus]).to be true
   end
 end
 

data/spec/rspec/shared_spec_matchers.rb

@@ -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"')
+      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: :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"')
+      expect(have_table('Lovely table', visible: false).description).to eq('have table "Lovely table"') # rubocop:disable RSpec/Capybara/VisibilityMatcher
     end
 
     it 'passes if there is such a table' do

data/spec/sauce_spec_chrome.rb

@@ -15,9 +15,9 @@ Capybara.register_driver :sauce_chrome do |app|
     browser_name: 'chrome',
     version: '65.0',
     name: 'Capybara test',
-    build: ENV['TRAVIS_REPO_SLUG'] || "Ruby-RSpec-Selenium: Local-#{Time.now.to_i}",
-    username: ENV['SAUCE_USERNAME'],
-    access_key: ENV['SAUCE_ACCESS_KEY']
+    build: ENV.fetch('TRAVIS_REPO_SLUG', "Ruby-RSpec-Selenium: Local-#{Time.now.to_i}"),
+    username: ENV.fetch('SAUCE_USERNAME', nil),
+    access_key: ENV.fetch('SAUCE_ACCESS_KEY', nil)
   }
 
   options.delete(:browser_name)

data/spec/selector_spec.rb

@@ -159,7 +159,7 @@ RSpec.describe Capybara do
       end
 
       it 'returns nil if no match' do
-        expect(Capybara::Selector.for('nothing')).to be nil
+        expect(Capybara::Selector.for('nothing')).to be_nil
       end
     end
 

data/spec/selenium_spec_chrome.rb

@@ -8,11 +8,11 @@ require 'rspec/shared_spec_matchers'
 
 CHROME_DRIVER = :selenium_chrome
 
-Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV['CI'] && ENV['CHROME_BETA']
+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.add_option(:w3c, ENV['W3C'] != 'false')
+
 # Chromedriver 77 requires setting this for headless mode on linux
 # Different versions of Chrome/selenium-webdriver require setting differently - jus set them all
 browser_options.add_preference('download.default_directory', Capybara.save_path)
@@ -85,10 +85,6 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybar
     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::Window#fullscreen should be able to fullscreen the window/
-    skip 'Chromedriver hangs on attempts to fullscreen in headless mode' if ENV['HEADLESS']
-  when /node #right_click delay should delay the mouse up/
-    skip "Legacy selenium doesn't support separate right button down/up" if ENV['W3C'] == 'false'
   end
 end
 
@@ -185,18 +181,21 @@ RSpec.describe 'Capybara::Session with chrome' do
   end
 
   describe 'log access' do
-    before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
+    let(:logs) do
+      session.driver.browser.then do |chrome_driver|
+        chrome_driver.respond_to?(:logs) ? chrome_driver : chrome_driver.manage
+      end.logs
+    end
 
     it 'does not error getting log types' do
-      skip if Gem::Requirement.new('< 75.0.3770.90').satisfied_by? chromedriver_version
       expect do
-        session.driver.browser.manage.logs.available_types
+        logs.available_types
       end.not_to raise_error
     end
 
     it 'does not error when getting logs' do
       expect do
-        session.driver.browser.manage.logs.get(:browser)
+        logs.get(:browser)
       end.not_to raise_error
     end
   end

data/spec/selenium_spec_chrome_remote.rb

@@ -21,8 +21,8 @@ def ensure_selenium_running!
   rescue StandardError
     if timer.expired?
       raise 'Selenium is not running. ' \
-          "You can run a selenium server easily with: \n" \
-          '  $ docker-compose up -d selenium_chrome'
+            "You can run a selenium server easily with: \n" \
+            '  $ docker-compose up -d selenium_chrome'
     else
       puts 'Waiting for Selenium docker instance...'
       sleep 1
@@ -62,8 +62,6 @@ 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 /node #right_click delay should delay the mouse up/
-    skip "Legacy selenium doesn't support separate right button down/up" if ENV['W3C'] == 'false'
   end
 end
 
@@ -78,18 +76,21 @@ RSpec.describe 'Capybara::Session with remote Chrome' do
   end
 
   describe 'log access' do
-    before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
+    let(:logs) do
+      session.driver.browser.then do |chrome_driver|
+        chrome_driver.respond_to?(:logs) ? chrome_driver : chrome_driver.manage
+      end.logs
+    end
 
     it 'does not error when getting log types' do
-      skip unless Gem::Requirement.new('>= 75.0.3770.90').satisfied_by? chromedriver_version
       expect do
-        session.driver.browser.manage.logs.available_types
+        logs.available_types
       end.not_to raise_error
     end
 
     it 'does not error when getting logs' do
       expect do
-        session.driver.browser.manage.logs.get(:browser)
+        logs.get(:browser)
       end.not_to raise_error
     end
   end

data/spec/selenium_spec_firefox.rb

@@ -15,6 +15,7 @@ browser_options.profile = Selenium::WebDriver::Firefox::Profile.new.tap do |prof
   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
+  profile['accessibility.tabfocus'] = 7 # make tab move over links too
 end
 
 Capybara.register_driver :selenium_firefox do |app|
@@ -59,8 +60,8 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
   when 'Capybara::Session selenium #attach_file with multipart form should fire change once when uploading multiple files from empty'
     pending "FF < 62 doesn't support setting all files at once" if firefox_lt?(62, @session)
   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 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'
   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?
@@ -71,6 +72,10 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
   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'
+  when 'Capybara::Session selenium node #shadow_root should get the shadow root',
+       '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'
+    pending "Firefox doesn't yet have W3C shadow root support"
   end
 end
 
@@ -102,7 +107,7 @@ RSpec.describe 'Capybara::Session with firefox' do # rubocop:disable RSpec/Multi
     end
 
     it 'should fill in a datetime input with a String' do
-      # FF doesn't currently support datetime-local so this is really just a text input
+      pending 'Need to figure out what string format this will actually accept'
       session.fill_in('form_datetime', with: datetime.iso8601)
       session.click_button('awesome')
       expect(Time.parse(extract_results(session)['datetime'])).to eq datetime

data/spec/selenium_spec_firefox_remote.rb

@@ -21,8 +21,8 @@ def ensure_selenium_running!
   rescue StandardError
     if timer.expired?
       raise 'Selenium is not running. ' \
-          "You can run a selenium server easily with: \n" \
-          '  $ docker-compose up -d selenium_firefox'
+            "You can run a selenium server easily with: \n" \
+            '  $ docker-compose up -d selenium_firefox'
     else
       puts 'Waiting for Selenium docker instance...'
       sleep 1

data/spec/selenium_spec_ie.rb

@@ -71,13 +71,10 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, 'selenium', capybara_sk
     pending "IE 11 doesn't support date input types"
   when /#click_link_or_button with :disabled option happily clicks on links which incorrectly have the disabled attribute$/
     skip 'IE 11 obeys non-standard disabled attribute on anchor tag'
-  when /#right_click should allow modifiers$/
-    skip "Windows can't :meta click because :meta triggers start menu"
-  when /#click should allow modifiers$/
+  when /#click should allow modifiers$/, /#double_click should allow modifiers$/
     pending "Doesn't work with IE for some unknown reason$"
-  when /#double_click should allow modifiers$/
     pending "Doesn't work with IE for some unknown reason$"
-  when /#click should allow multiple modifiers$/
+  when /#click should allow multiple modifiers$/, /#right_click should allow modifiers$/
     skip "Windows can't :meta click because :meta triggers start menu"
   when /#double_click should allow multiple modifiers$/
     skip "Windows can't :alt double click due to being properties shortcut"
@@ -91,7 +88,7 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, 'selenium', capybara_sk
     pending "Window 7 and 8.1 don't support 308 http status code"
   when /#scroll_to can scroll an element to the center of the viewport$/,
        /#scroll_to can scroll an element to the center of the scrolling element$/
-    pending " IE doesn't support ScrollToOptions"
+    pending "IE doesn't support ScrollToOptions"
   when /#attach_file with multipart form should fire change once for each set of files uploaded$/,
        /#attach_file with multipart form should fire change once when uploading multiple files from empty$/,
        /#attach_file with multipart form should not break when using HTML5 multiple file input uploading multiple files$/

data/spec/selenium_spec_safari.rb

@@ -8,28 +8,40 @@ require 'rspec/shared_spec_matchers'
 
 SAFARI_DRIVER = :selenium_safari
 
-if ::Selenium::WebDriver::Service.respond_to? :driver_path=
-  ::Selenium::WebDriver::Safari::Service
-else
-  ::Selenium::WebDriver::Safari
-end.driver_path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
+# if ::Selenium::WebDriver::Service.respond_to? :driver_path=
+#   ::Selenium::WebDriver::Safari::Service
+# else
+#   ::Selenium::WebDriver::Safari
+# end.driver_path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
 
 browser_options = ::Selenium::WebDriver::Safari::Options.new
 # browser_options.headless! if ENV['HEADLESS']
-# browser_options.add_option(:w3c, !!ENV['W3C'])
 
 Capybara.register_driver :selenium_safari do |app|
-  Capybara::Selenium::Driver.new(app, browser: :safari, 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: :safari, timeout: 30 }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+
+  Capybara::Selenium::Driver.new(app, **driver_options).tap do |driver|
     # driver.browser.download_path = Capybara.save_path
   end
 end
 
 Capybara.register_driver :selenium_safari_not_clear_storage do |app|
-  safari_options = {
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  driver_options = {
     browser: :safari,
-    options: browser_options
-  }
-  Capybara::Selenium::Driver.new(app, safari_options.merge(clear_local_storage: false, clear_session_storage: false))
+    clear_local_storage: false,
+    clear_session_storage: false,
+    timeout: 30
+  }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+
+  Capybara::Selenium::Driver.new(app, **driver_options)
 end
 
 module TestSessions
@@ -65,16 +77,17 @@ Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybar
   when 'Capybara::Session selenium_safari node #double_click should allow to adjust the offset',
        'Capybara::Session selenium_safari node #double_click should double click an element'
     pending "safardriver doesn't generate a double click event"
-  when 'Capybara::Session selenium_safari node #click should allow multiple modifiers',
-       /Capybara::Session selenium_safari node #(click|right_click|double_click) should allow modifiers/
-    pending "safaridriver doesn't take key state into account when clicking"
-  when 'Capybara::Session selenium_safari #fill_in on a pre-populated textfield with a reformatting onchange should trigger change when clearing field'
-    pending "safardriver clear doesn't generate change event"
+  when 'Capybara::Session selenium_safari node #double_click should allow modifiers'
+    pending "safaridriver doesn't generate double click with key modifiers"
+  when /when w3c_click_offset is true should offset/
+    pending 'w3c_click_offset is not currently supported with safaridriver'
   when 'Capybara::Session selenium_safari #go_back should fetch a response from the driver from the previous page',
        'Capybara::Session selenium_safari #go_forward should fetch a response from the driver from the previous page'
     skip 'safaridriver loses the ability to find elements in the document after `go_back`'
-  when /drag_to.*HTML5/
-    pending "Safari doesn't support"
+  when 'Capybara::Session selenium node #shadow_root should get the shadow root',
+    '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'
+    pending "Safari doesn't yet have W3C shadow root support"
   end
 end
 
@@ -124,7 +137,6 @@ RSpec.describe 'Capybara::Session with safari' do
     end
 
     it 'should fill in a date input with a String' do
-      pending "Safari doesn't support date inputs"
       session.fill_in('form_date', with: '06/19/1983')
       session.click_button('awesome')
       expect(Date.parse(extract_results(session)['date'])).to eq datetime.to_date