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

capybara 3.16.1 → 3.33.0

Files changed (197) hide show

checksums.yaml +4 -4
data/.yardopts +1 -0
data/History.md +321 -0
data/README.md +51 -60
data/lib/capybara.rb +71 -114
data/lib/capybara/config.rb +8 -5
data/lib/capybara/cucumber.rb +1 -1
data/lib/capybara/driver/node.rb +15 -3
data/lib/capybara/dsl.rb +10 -2
data/lib/capybara/helpers.rb +5 -3
data/lib/capybara/minitest.rb +242 -141
data/lib/capybara/minitest/spec.rb +159 -90
data/lib/capybara/node/actions.rb +85 -74
data/lib/capybara/node/base.rb +4 -4
data/lib/capybara/node/document.rb +2 -2
data/lib/capybara/node/document_matchers.rb +3 -3
data/lib/capybara/node/element.rb +216 -117
data/lib/capybara/node/finders.rb +65 -65
data/lib/capybara/node/matchers.rb +228 -126
data/lib/capybara/node/simple.rb +9 -4
data/lib/capybara/queries/ancestor_query.rb +5 -7
data/lib/capybara/queries/base_query.rb +2 -1
data/lib/capybara/queries/current_path_query.rb +1 -1
data/lib/capybara/queries/selector_query.rb +296 -30
data/lib/capybara/queries/sibling_query.rb +5 -4
data/lib/capybara/queries/style_query.rb +2 -2
data/lib/capybara/queries/text_query.rb +13 -1
data/lib/capybara/queries/title_query.rb +1 -1
data/lib/capybara/rack_test/browser.rb +7 -2
data/lib/capybara/rack_test/driver.rb +1 -1
data/lib/capybara/rack_test/form.rb +1 -1
data/lib/capybara/rack_test/node.rb +43 -7
data/lib/capybara/registration_container.rb +44 -0
data/lib/capybara/registrations/drivers.rb +36 -0
data/lib/capybara/registrations/patches/puma_ssl.rb +27 -0
data/lib/capybara/registrations/servers.rb +44 -0
data/lib/capybara/result.rb +36 -8
data/lib/capybara/rspec/matcher_proxies.rb +6 -4
data/lib/capybara/rspec/matchers.rb +100 -63
data/lib/capybara/rspec/matchers/base.rb +23 -10
data/lib/capybara/rspec/matchers/count_sugar.rb +37 -0
data/lib/capybara/rspec/matchers/have_ancestor.rb +28 -0
data/lib/capybara/rspec/matchers/have_current_path.rb +2 -2
data/lib/capybara/rspec/matchers/have_selector.rb +16 -8
data/lib/capybara/rspec/matchers/have_sibling.rb +27 -0
data/lib/capybara/rspec/matchers/have_text.rb +4 -4
data/lib/capybara/rspec/matchers/have_title.rb +2 -2
data/lib/capybara/rspec/matchers/match_selector.rb +3 -3
data/lib/capybara/rspec/matchers/match_style.rb +2 -2
data/lib/capybara/rspec/matchers/spatial_sugar.rb +39 -0
data/lib/capybara/selector.rb +219 -588
data/lib/capybara/selector/builders/css_builder.rb +10 -6
data/lib/capybara/selector/builders/xpath_builder.rb +1 -1
data/lib/capybara/selector/css.rb +4 -2
data/lib/capybara/selector/definition.rb +277 -0
data/lib/capybara/selector/definition/button.rb +52 -0
data/lib/capybara/selector/definition/checkbox.rb +26 -0
data/lib/capybara/selector/definition/css.rb +10 -0
data/lib/capybara/selector/definition/datalist_input.rb +35 -0
data/lib/capybara/selector/definition/datalist_option.rb +25 -0
data/lib/capybara/selector/definition/element.rb +27 -0
data/lib/capybara/selector/definition/field.rb +40 -0
data/lib/capybara/selector/definition/fieldset.rb +14 -0
data/lib/capybara/selector/definition/file_field.rb +13 -0
data/lib/capybara/selector/definition/fillable_field.rb +33 -0
data/lib/capybara/selector/definition/frame.rb +17 -0
data/lib/capybara/selector/definition/id.rb +6 -0
data/lib/capybara/selector/definition/label.rb +62 -0
data/lib/capybara/selector/definition/link.rb +54 -0
data/lib/capybara/selector/definition/link_or_button.rb +16 -0
data/lib/capybara/selector/definition/option.rb +27 -0
data/lib/capybara/selector/definition/radio_button.rb +27 -0
data/lib/capybara/selector/definition/select.rb +81 -0
data/lib/capybara/selector/definition/table.rb +109 -0
data/lib/capybara/selector/definition/table_row.rb +21 -0
data/lib/capybara/selector/definition/xpath.rb +5 -0
data/lib/capybara/selector/filter_set.rb +13 -9
data/lib/capybara/selector/filters/base.rb +11 -2
data/lib/capybara/selector/filters/locator_filter.rb +13 -3
data/lib/capybara/selector/regexp_disassembler.rb +9 -2
data/lib/capybara/selector/selector.rb +43 -448
data/lib/capybara/selenium/atoms/getAttribute.min.js +1 -0
data/lib/capybara/selenium/atoms/isDisplayed.min.js +1 -0
data/lib/capybara/selenium/atoms/src/getAttribute.js +161 -0
data/lib/capybara/selenium/atoms/src/isDisplayed.js +454 -0
data/lib/capybara/selenium/driver.rb +125 -56
data/lib/capybara/selenium/driver_specializations/chrome_driver.rb +73 -17
data/lib/capybara/selenium/driver_specializations/edge_driver.rb +124 -0
data/lib/capybara/selenium/driver_specializations/firefox_driver.rb +41 -2
data/lib/capybara/selenium/driver_specializations/internet_explorer_driver.rb +14 -1
data/lib/capybara/selenium/driver_specializations/safari_driver.rb +14 -5
data/lib/capybara/selenium/extensions/file_input_click_emulation.rb +34 -0
data/lib/capybara/selenium/extensions/find.rb +67 -45
data/lib/capybara/selenium/extensions/html5_drag.rb +152 -36
data/lib/capybara/selenium/extensions/modifier_keys_stack.rb +28 -0
data/lib/capybara/selenium/logger_suppressor.rb +34 -0
data/lib/capybara/selenium/node.rb +227 -56
data/lib/capybara/selenium/nodes/chrome_node.rb +93 -8
data/lib/capybara/selenium/nodes/edge_node.rb +104 -0
data/lib/capybara/selenium/nodes/firefox_node.rb +37 -59
data/lib/capybara/selenium/nodes/ie_node.rb +22 -0
data/lib/capybara/selenium/nodes/safari_node.rb +27 -54
data/lib/capybara/selenium/patches/action_pauser.rb +26 -0
data/lib/capybara/selenium/patches/atoms.rb +18 -0
data/lib/capybara/selenium/patches/is_displayed.rb +16 -0
data/lib/capybara/selenium/patches/logs.rb +45 -0
data/lib/capybara/server.rb +19 -3
data/lib/capybara/server/animation_disabler.rb +2 -2
data/lib/capybara/server/checker.rb +6 -2
data/lib/capybara/server/middleware.rb +23 -13
data/lib/capybara/session.rb +124 -106
data/lib/capybara/session/config.rb +12 -10
data/lib/capybara/session/matchers.rb +6 -6
data/lib/capybara/spec/public/offset.js +6 -0
data/lib/capybara/spec/public/test.js +94 -5
data/lib/capybara/spec/session/all_spec.rb +84 -6
data/lib/capybara/spec/session/ancestor_spec.rb +5 -0
data/lib/capybara/spec/session/assert_current_path_spec.rb +5 -2
data/lib/capybara/spec/session/assert_text_spec.rb +9 -5
data/lib/capybara/spec/session/attach_file_spec.rb +14 -6
data/lib/capybara/spec/session/check_spec.rb +10 -4
data/lib/capybara/spec/session/choose_spec.rb +8 -2
data/lib/capybara/spec/session/click_button_spec.rb +44 -1
data/lib/capybara/spec/session/click_link_spec.rb +11 -0
data/lib/capybara/spec/session/evaluate_script_spec.rb +12 -0
data/lib/capybara/spec/session/fill_in_spec.rb +37 -2
data/lib/capybara/spec/session/find_spec.rb +60 -6
data/lib/capybara/spec/session/first_spec.rb +1 -1
data/lib/capybara/spec/session/frame/switch_to_frame_spec.rb +14 -1
data/lib/capybara/spec/session/frame/within_frame_spec.rb +12 -1
data/lib/capybara/spec/session/has_ancestor_spec.rb +46 -0
data/lib/capybara/spec/session/has_button_spec.rb +16 -0
data/lib/capybara/spec/session/has_css_spec.rb +35 -6
data/lib/capybara/spec/session/has_current_path_spec.rb +6 -4
data/lib/capybara/spec/session/has_field_spec.rb +34 -0
data/lib/capybara/spec/session/has_select_spec.rb +32 -4
data/lib/capybara/spec/session/has_selector_spec.rb +4 -4
data/lib/capybara/spec/session/has_sibling_spec.rb +50 -0
data/lib/capybara/spec/session/has_table_spec.rb +51 -5
data/lib/capybara/spec/session/has_text_spec.rb +47 -0
data/lib/capybara/spec/session/matches_style_spec.rb +2 -2
data/lib/capybara/spec/session/node_spec.rb +574 -16
data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb +2 -2
data/lib/capybara/spec/session/save_screenshot_spec.rb +4 -4
data/lib/capybara/spec/session/scroll_spec.rb +1 -1
data/lib/capybara/spec/session/select_spec.rb +5 -10
data/lib/capybara/spec/session/selectors_spec.rb +24 -3
data/lib/capybara/spec/session/uncheck_spec.rb +2 -2
data/lib/capybara/spec/session/unselect_spec.rb +1 -1
data/lib/capybara/spec/session/window/window_spec.rb +10 -9
data/lib/capybara/spec/spec_helper.rb +7 -2
data/lib/capybara/spec/test_app.rb +26 -21
data/lib/capybara/spec/views/animated.erb +49 -0
data/lib/capybara/spec/views/form.erb +25 -4
data/lib/capybara/spec/views/frame_child.erb +2 -1
data/lib/capybara/spec/views/frame_one.erb +1 -0
data/lib/capybara/spec/views/obscured.erb +9 -9
data/lib/capybara/spec/views/offset.erb +32 -0
data/lib/capybara/spec/views/react.erb +45 -0
data/lib/capybara/spec/views/spatial.erb +31 -0
data/lib/capybara/spec/views/with_animation.erb +29 -1
data/lib/capybara/spec/views/with_dragula.erb +24 -0
data/lib/capybara/spec/views/with_html.erb +28 -2
data/lib/capybara/spec/views/with_js.erb +2 -1
data/lib/capybara/spec/views/with_jstree.erb +26 -0
data/lib/capybara/spec/views/with_sortable_js.erb +21 -0
data/lib/capybara/version.rb +1 -1
data/lib/capybara/window.rb +10 -10
data/spec/basic_node_spec.rb +6 -6
data/spec/capybara_spec.rb +28 -28
data/spec/dsl_spec.rb +16 -3
data/spec/filter_set_spec.rb +5 -5
data/spec/fixtures/selenium_driver_rspec_failure.rb +1 -1
data/spec/fixtures/selenium_driver_rspec_success.rb +1 -1
data/spec/minitest_spec.rb +12 -2
data/spec/minitest_spec_spec.rb +56 -45
data/spec/rack_test_spec.rb +25 -12
data/spec/regexp_dissassembler_spec.rb +53 -39
data/spec/result_spec.rb +50 -54
data/spec/rspec/features_spec.rb +1 -0
data/spec/rspec/shared_spec_matchers.rb +78 -62
data/spec/rspec_spec.rb +5 -5
data/spec/sauce_spec_chrome.rb +1 -0
data/spec/selector_spec.rb +26 -16
data/spec/selenium_spec_chrome.rb +84 -5
data/spec/selenium_spec_chrome_remote.rb +23 -8
data/spec/selenium_spec_edge.rb +23 -8
data/spec/selenium_spec_firefox.rb +16 -21
data/spec/selenium_spec_firefox_remote.rb +4 -13
data/spec/selenium_spec_ie.rb +23 -15
data/spec/selenium_spec_safari.rb +17 -17
data/spec/server_spec.rb +87 -42
data/spec/session_spec.rb +11 -4
data/spec/shared_selenium_node.rb +83 -0
data/spec/shared_selenium_session.rb +62 -72
data/spec/spec_helper.rb +43 -5
metadata +114 -16

@@ -43,7 +43,7 @@ RSpec.describe 'capybara/rspec' do
       expect(Capybara.current_driver).to eq(:culerity)
     end
-    context '#all' do
+    describe '#all' do
       it 'allows access to the Capybara finder' do
         visit('/with_html')
         found = all(:css, 'h2') { |element| element[:class] == 'head' }
@@ -57,7 +57,7 @@ RSpec.describe 'capybara/rspec' do
       end
     end
-    context '#within' do
+    describe '#within' do
       it 'allows access to the Capybara scoper' do
         visit('/with_html')
         expect do
@@ -76,13 +76,13 @@ RSpec.describe 'capybara/rspec' do
   context 'Type: Other', type: :other do
     context 'when RSpec::Matchers is included after Capybara::DSL' do
       let(:test_class_instance) do
-        class DSLMatchersTest
+        Class.new do
           include Capybara::DSL
           include RSpec::Matchers
         end.new
       end
-      context '#all' do
+      describe '#all' do
         it 'allows access to the Capybara finder' do
           test_class_instance.visit('/with_html')
           expect(test_class_instance.all(:css, 'h2.head').size).to eq(5)
@@ -95,7 +95,7 @@ RSpec.describe 'capybara/rspec' do
         end
       end
-      context '#within' do
+      describe '#within' do
         it 'allows access to the Capybara scoper' do
           test_class_instance.visit('/with_html')
           expect do

data/spec/sauce_spec_chrome.rb CHANGED

@@ -5,6 +5,7 @@ require 'selenium-webdriver'
 require 'sauce_whisk'
 # require 'shared_selenium_session'
+# require 'shared_selenium_node'
 # require 'rspec/shared_spec_matchers'
 Capybara.register_driver :sauce_chrome do |app|

data/spec/selector_spec.rb CHANGED

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Capybara do
   describe 'Selectors' do
     let :string do
-      Capybara.string <<-STRING
+      described_class.string <<-STRING
         <html>
           <head>
             <title>selectors</title>
@@ -69,12 +69,12 @@ RSpec.describe Capybara do
     end
     before do
-      Capybara.add_selector :custom_selector do
+      described_class.add_selector :custom_selector do
         css { |css_class| "div.#{css_class}" }
         node_filter(:not_empty, boolean: true, default: true, skip_if: :all) { |node, value| value ^ (node.text == '') }
       end
-      Capybara.add_selector :custom_css_selector do
+      described_class.add_selector :custom_css_selector do
         css(:name, :other_name) do |selector, name: nil, **|
           selector ||= ''
           selector += "[name='#{name}']" if name
@@ -94,7 +94,7 @@ RSpec.describe Capybara do
         end
       end
-      Capybara.add_selector :custom_xpath_selector do
+      described_class.add_selector :custom_xpath_selector do
         xpath(:valid1, :valid2) { |selector| selector }
         match { |value| value == 'match_me' }
       end
@@ -102,7 +102,7 @@ RSpec.describe Capybara do
     it 'supports `filter` as an alias for `node_filter`' do
       expect do
-        Capybara.add_selector :filter_alias_selector do
+        described_class.add_selector :filter_alias_selector do
           css { |_unused| 'div' }
           filter(:something) { |_node, _value| true }
         end
@@ -111,7 +111,7 @@ RSpec.describe Capybara do
     describe 'adding a selector' do
       it 'can set default visiblity' do
-        Capybara.add_selector :hidden_field do
+        described_class.add_selector :hidden_field do
           visible :hidden
           css { |_sel| 'input[type="hidden"]' }
         end
@@ -125,7 +125,7 @@ RSpec.describe Capybara do
       it 'allows modifying a selector' do
         el = string.find(:custom_selector, 'aa')
         expect(el.tag_name).to eq 'div'
-        Capybara.modify_selector :custom_selector do
+        described_class.modify_selector :custom_selector do
           css { |css_class| "h1.#{css_class}" }
         end
         el = string.find(:custom_selector, 'aa')
@@ -133,7 +133,7 @@ RSpec.describe Capybara do
       end
       it "doesn't change existing filters" do
-        Capybara.modify_selector :custom_selector do
+        described_class.modify_selector :custom_selector do
           css { |css_class| "p.#{css_class}" }
         end
         expect(string).to have_selector(:custom_selector, 'bb', count: 1)
@@ -164,25 +164,28 @@ RSpec.describe Capybara do
     describe 'xpath' do
       it 'uses filter names passed in' do
-        selector = Capybara::Selector.new :test do
+        described_class.add_selector :test do
           xpath(:something, :other) { |_locator| XPath.descendant }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
         expect(selector.expression_filters.keys).to include(:something, :other)
       end
       it 'gets filter names from block if none passed to xpath method' do
-        selector = Capybara::Selector.new :test do
+        described_class.add_selector :test do
           xpath { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
         expect(selector.expression_filters.keys).to include(:valid3, :valid4)
       end
       it 'ignores block parameters if names passed in' do
-        selector = Capybara::Selector.new :test do
+        described_class.add_selector :test do
           xpath(:valid1) { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
         expect(selector.expression_filters.keys).to include(:valid1)
         expect(selector.expression_filters.keys).not_to include(:valid3, :valid4)
@@ -202,25 +205,28 @@ RSpec.describe Capybara do
       end
       it 'uses filter names passed in' do
-        selector = Capybara::Selector.new :text do
+        described_class.add_selector :test do
           css(:name, :other_name) { |_locator| '' }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
         expect(selector.expression_filters.keys).to include(:name, :other_name)
       end
       it 'gets filter names from block if none passed to css method' do
-        selector = Capybara::Selector.new :test do
+        described_class.add_selector :test do
           css { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
         expect(selector.expression_filters.keys).to include(:valid3, :valid4)
       end
       it 'ignores block parameters if names passed in' do
-        selector = Capybara::Selector.new :test do
+        described_class.add_selector :test do
           css(:valid1) { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
         expect(selector.expression_filters.keys).to include(:valid1)
         expect(selector.expression_filters.keys).not_to include(:valid3, :valid4)
@@ -470,14 +476,18 @@ RSpec.describe Capybara do
       end
       describe ':link_or_button selector' do
-        around(:all) do |example|
-          Capybara.modify_selector(:link_or_button) do
+        around do |example|
+          described_class.modify_selector(:link_or_button) do
             expression_filter(:random) { |xpath, _| xpath } # do nothing filter
           end
           example.run
           Capybara::Selector[:link_or_button].expression_filters.delete(:random)
         end
+        it 'should not find links when disabled == true' do
+          expect(string.all(:link_or_button, disabled: true).size).to eq 0
+        end
         context 'when modified' do
           it 'should still work' do
             filter = Capybara::Selector[:link_or_button].expression_filters[:random]

data/spec/selenium_spec_chrome.rb CHANGED

@@ -3,16 +3,24 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 CHROME_DRIVER = :selenium_chrome
+Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV['CI'] && ENV['CHROME_BETA']
 browser_options = ::Selenium::WebDriver::Chrome::Options.new
 browser_options.headless! if ENV['HEADLESS']
-browser_options.add_option(:w3c, !!ENV['W3C'])
+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)
+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|
+    # Set download dir for Chrome < 77
     driver.browser.download_path = Capybara.save_path
   end
 end
@@ -22,7 +30,28 @@ Capybara.register_driver :selenium_chrome_not_clear_storage do |app|
     browser: :chrome,
     options: browser_options
   }
-  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: false, clear_session_storage: false))
+  Capybara::Selenium::Driver.new(app, **chrome_options.merge(clear_local_storage: false, clear_session_storage: false))
+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))
+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))
+end
+Capybara.register_driver :selenium_driver_subclass_with_chrome do |app|
+  subclass = Class.new(Capybara::Selenium::Driver)
+  subclass.new(app, browser: :chrome, options: browser_options, timeout: 30)
 end
 module TestSessions
@@ -31,7 +60,7 @@ end
 skipped_tests = %i[response_headers status_code trigger]
-$stdout.puts `#{Selenium::WebDriver::Chrome.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Chrome) if ENV['CI']
 Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
@@ -39,13 +68,18 @@ 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
 RSpec.describe 'Capybara::Session with chrome' do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::Chrome, CHROME_DRIVER
-  include_examples  Capybara::RSpecMatchers, TestSessions::Chrome, CHROME_DRIVER
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::Chrome, CHROME_DRIVER
+  end
   context 'storage' do
     describe '#reset!' do
@@ -68,6 +102,26 @@ RSpec.describe 'Capybara::Session with chrome' do
         expect(session.evaluate_script('Object.keys(localStorage)')).not_to be_empty
         expect(session.evaluate_script('Object.keys(sessionStorage)')).not_to be_empty
       end
+      it 'can not clear session storage' do
+        session = Capybara::Session.new(:selenium_chrome_not_clear_session_storage, TestApp)
+        session.visit('/with_js')
+        session.find(:css, '#set-storage').click
+        session.reset!
+        session.visit('/with_js')
+        expect(session.evaluate_script('Object.keys(localStorage)')).to be_empty
+        expect(session.evaluate_script('Object.keys(sessionStorage)')).not_to be_empty
+      end
+      it 'can not clear local storage' do
+        session = Capybara::Session.new(:selenium_chrome_not_clear_local_storage, TestApp)
+        session.visit('/with_js')
+        session.find(:css, '#set-storage').click
+        session.reset!
+        session.visit('/with_js')
+        expect(session.evaluate_script('Object.keys(localStorage)')).not_to be_empty
+        expect(session.evaluate_script('Object.keys(sessionStorage)')).to be_empty
+      end
     end
   end
@@ -104,4 +158,29 @@ RSpec.describe 'Capybara::Session with chrome' do
       expect(Time.parse(extract_results(session)['datetime'])).to eq datetime
     end
   end
+  describe 'using subclass of selenium driver' do
+    it 'works' do
+      session = Capybara::Session.new(:selenium_driver_subclass_with_chrome, TestApp)
+      session.visit('/form')
+      expect(session).to have_current_path('/form')
+    end
+  end
+  describe 'log access' 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')
+      expect do
+        session.driver.browser.manage.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)
+      end.not_to raise_error
+    end
+  end
 end

data/spec/selenium_spec_chrome_remote.rb CHANGED

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 def selenium_host
@@ -53,12 +54,6 @@ module TestSessions
   Chrome = Capybara::Session.new(CHROME_REMOTE_DRIVER, TestApp)
 end
-TestSessions::Chrome.driver.browser.file_detector = lambda do |args|
-  # args => ["/path/to/file"]
-  str = args.first.to_s
-  str if File.exist?(str)
-end
 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|
@@ -67,15 +62,35 @@ 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
 RSpec.describe 'Capybara::Session with remote Chrome' do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::Chrome, CHROME_REMOTE_DRIVER
-  include_examples  Capybara::RSpecMatchers, TestSessions::Chrome, CHROME_REMOTE_DRIVER
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::Chrome, CHROME_REMOTE_DRIVER
+  end
   it 'is considered to be chrome' do
     expect(session.driver.browser.browser).to eq :chrome
   end
+  describe 'log access' 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')
+      expect do
+        session.driver.browser.manage.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)
+      end.not_to raise_error
+    end
+  end
 end

data/spec/selenium_spec_edge.rb CHANGED

@@ -3,30 +3,45 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
+# unless ENV['CI']
+#   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'
+end
 Capybara.register_driver :selenium_edge do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
-  Capybara::Selenium::Driver.new(app, browser: :edge)
+  # 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|
+    driver.browser
+    driver.download_path = Capybara.save_path
+  end
 end
 module TestSessions
   SeleniumEdge = Capybara::Session.new(:selenium_edge, TestApp)
 end
-skipped_tests = %i[response_headers status_code trigger modals]
+skipped_tests = %i[response_headers status_code trigger]
-$stdout.puts `#{Selenium::WebDriver::Edge.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::EdgeChrome) if ENV['CI']
 Capybara::SpecHelper.run_specs TestSessions::SeleniumEdge, 'selenium', capybara_skip: skipped_tests do |example|
-  case example.metadata[:description]
-  when /#refresh it reposts$/
-    skip 'Edge insists on prompting without providing a way to suppress'
+  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"
   end
 end
 RSpec.describe 'Capybara::Session with Edge', capybara_skip: skipped_tests do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::SeleniumEdge, :selenium_edge
-  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumEdge, :selenium_edge
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::SeleniumEdge, :selenium_edge
+  end
 end