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

capybara 3.23.0 → 3.35.3

Files changed (183) hide show

checksums.yaml +4 -4
data/History.md +264 -11
data/README.md +10 -6
data/lib/capybara.rb +20 -8
data/lib/capybara/config.rb +10 -8
data/lib/capybara/cucumber.rb +1 -1
data/lib/capybara/driver/base.rb +4 -0
data/lib/capybara/driver/node.rb +4 -0
data/lib/capybara/dsl.rb +10 -2
data/lib/capybara/helpers.rb +28 -2
data/lib/capybara/minitest.rb +232 -144
data/lib/capybara/minitest/spec.rb +156 -97
data/lib/capybara/node/actions.rb +36 -36
data/lib/capybara/node/base.rb +6 -6
data/lib/capybara/node/document.rb +2 -2
data/lib/capybara/node/document_matchers.rb +3 -3
data/lib/capybara/node/element.rb +77 -33
data/lib/capybara/node/finders.rb +24 -17
data/lib/capybara/node/matchers.rb +79 -64
data/lib/capybara/node/simple.rb +11 -4
data/lib/capybara/queries/ancestor_query.rb +6 -10
data/lib/capybara/queries/base_query.rb +2 -1
data/lib/capybara/queries/current_path_query.rb +14 -4
data/lib/capybara/queries/selector_query.rb +259 -23
data/lib/capybara/queries/sibling_query.rb +5 -11
data/lib/capybara/queries/style_query.rb +1 -1
data/lib/capybara/queries/text_query.rb +13 -1
data/lib/capybara/rack_test/browser.rb +13 -4
data/lib/capybara/rack_test/driver.rb +2 -1
data/lib/capybara/rack_test/form.rb +2 -2
data/lib/capybara/rack_test/node.rb +42 -6
data/lib/capybara/registration_container.rb +44 -0
data/lib/capybara/registrations/drivers.rb +18 -12
data/lib/capybara/registrations/patches/puma_ssl.rb +29 -0
data/lib/capybara/registrations/servers.rb +9 -2
data/lib/capybara/result.rb +39 -19
data/lib/capybara/rspec.rb +2 -0
data/lib/capybara/rspec/matcher_proxies.rb +5 -5
data/lib/capybara/rspec/matchers.rb +97 -74
data/lib/capybara/rspec/matchers/base.rb +19 -6
data/lib/capybara/rspec/matchers/count_sugar.rb +2 -1
data/lib/capybara/rspec/matchers/have_ancestor.rb +5 -7
data/lib/capybara/rspec/matchers/have_current_path.rb +2 -2
data/lib/capybara/rspec/matchers/have_selector.rb +15 -10
data/lib/capybara/rspec/matchers/have_sibling.rb +4 -7
data/lib/capybara/rspec/matchers/have_text.rb +4 -7
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 +7 -2
data/lib/capybara/rspec/matchers/spatial_sugar.rb +39 -0
data/lib/capybara/selector.rb +46 -19
data/lib/capybara/selector/builders/css_builder.rb +10 -6
data/lib/capybara/selector/builders/xpath_builder.rb +4 -2
data/lib/capybara/selector/css.rb +1 -1
data/lib/capybara/selector/definition.rb +13 -11
data/lib/capybara/selector/definition/button.rb +32 -15
data/lib/capybara/selector/definition/checkbox.rb +2 -2
data/lib/capybara/selector/definition/css.rb +3 -1
data/lib/capybara/selector/definition/datalist_input.rb +2 -2
data/lib/capybara/selector/definition/datalist_option.rb +1 -1
data/lib/capybara/selector/definition/element.rb +3 -2
data/lib/capybara/selector/definition/field.rb +1 -1
data/lib/capybara/selector/definition/file_field.rb +1 -1
data/lib/capybara/selector/definition/fillable_field.rb +2 -2
data/lib/capybara/selector/definition/label.rb +5 -3
data/lib/capybara/selector/definition/link.rb +8 -0
data/lib/capybara/selector/definition/option.rb +1 -1
data/lib/capybara/selector/definition/radio_button.rb +2 -2
data/lib/capybara/selector/definition/select.rb +33 -14
data/lib/capybara/selector/definition/table.rb +6 -3
data/lib/capybara/selector/definition/table_row.rb +2 -2
data/lib/capybara/selector/filter_set.rb +13 -11
data/lib/capybara/selector/filters/base.rb +6 -1
data/lib/capybara/selector/filters/locator_filter.rb +1 -1
data/lib/capybara/selector/regexp_disassembler.rb +7 -0
data/lib/capybara/selector/selector.rb +13 -3
data/lib/capybara/selenium/atoms/getAttribute.min.js +1 -1
data/lib/capybara/selenium/atoms/isDisplayed.min.js +1 -1
data/lib/capybara/selenium/atoms/src/getAttribute.js +1 -1
data/lib/capybara/selenium/atoms/src/isDisplayed.js +10 -10
data/lib/capybara/selenium/driver.rb +86 -24
data/lib/capybara/selenium/driver_specializations/chrome_driver.rb +24 -21
data/lib/capybara/selenium/driver_specializations/edge_driver.rb +21 -19
data/lib/capybara/selenium/driver_specializations/firefox_driver.rb +17 -1
data/lib/capybara/selenium/driver_specializations/safari_driver.rb +0 -4
data/lib/capybara/selenium/extensions/file_input_click_emulation.rb +34 -0
data/lib/capybara/selenium/extensions/find.rb +37 -26
data/lib/capybara/selenium/extensions/html5_drag.rb +55 -11
data/lib/capybara/selenium/extensions/modifier_keys_stack.rb +28 -0
data/lib/capybara/selenium/extensions/scroll.rb +8 -10
data/lib/capybara/selenium/logger_suppressor.rb +8 -2
data/lib/capybara/selenium/node.rb +160 -40
data/lib/capybara/selenium/nodes/chrome_node.rb +72 -12
data/lib/capybara/selenium/nodes/edge_node.rb +32 -14
data/lib/capybara/selenium/nodes/firefox_node.rb +28 -32
data/lib/capybara/selenium/nodes/safari_node.rb +5 -29
data/lib/capybara/selenium/patches/action_pauser.rb +26 -0
data/lib/capybara/selenium/patches/atoms.rb +4 -4
data/lib/capybara/selenium/patches/is_displayed.rb +16 -0
data/lib/capybara/selenium/patches/logs.rb +32 -7
data/lib/capybara/server.rb +19 -3
data/lib/capybara/server/animation_disabler.rb +8 -3
data/lib/capybara/server/checker.rb +1 -1
data/lib/capybara/server/middleware.rb +22 -10
data/lib/capybara/session.rb +66 -40
data/lib/capybara/session/config.rb +11 -3
data/lib/capybara/session/matchers.rb +11 -11
data/lib/capybara/spec/public/offset.js +6 -0
data/lib/capybara/spec/public/test.js +75 -7
data/lib/capybara/spec/session/accept_alert_spec.rb +1 -1
data/lib/capybara/spec/session/all_spec.rb +60 -5
data/lib/capybara/spec/session/ancestor_spec.rb +5 -0
data/lib/capybara/spec/session/assert_text_spec.rb +9 -5
data/lib/capybara/spec/session/check_spec.rb +6 -0
data/lib/capybara/spec/session/click_button_spec.rb +16 -0
data/lib/capybara/spec/session/click_link_or_button_spec.rb +9 -0
data/lib/capybara/spec/session/current_url_spec.rb +11 -1
data/lib/capybara/spec/session/fill_in_spec.rb +29 -0
data/lib/capybara/spec/session/find_spec.rb +55 -0
data/lib/capybara/spec/session/has_ancestor_spec.rb +2 -0
data/lib/capybara/spec/session/has_button_spec.rb +51 -0
data/lib/capybara/spec/session/has_css_spec.rb +26 -4
data/lib/capybara/spec/session/has_current_path_spec.rb +15 -2
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_table_spec.rb +51 -5
data/lib/capybara/spec/session/has_text_spec.rb +30 -0
data/lib/capybara/spec/session/html_spec.rb +1 -1
data/lib/capybara/spec/session/matches_style_spec.rb +2 -2
data/lib/capybara/spec/session/node_spec.rb +394 -9
data/lib/capybara/spec/session/refresh_spec.rb +2 -1
data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb +2 -2
data/lib/capybara/spec/session/save_page_spec.rb +4 -4
data/lib/capybara/spec/session/save_screenshot_spec.rb +4 -15
data/lib/capybara/spec/session/selectors_spec.rb +16 -3
data/lib/capybara/spec/session/window/switch_to_window_spec.rb +1 -1
data/lib/capybara/spec/session/window/window_opened_by_spec.rb +1 -1
data/lib/capybara/spec/session/window/window_spec.rb +8 -8
data/lib/capybara/spec/session/window/windows_spec.rb +1 -1
data/lib/capybara/spec/spec_helper.rb +14 -14
data/lib/capybara/spec/test_app.rb +27 -21
data/lib/capybara/spec/views/form.erb +47 -4
data/lib/capybara/spec/views/offset.erb +32 -0
data/lib/capybara/spec/views/spatial.erb +31 -0
data/lib/capybara/spec/views/with_animation.erb +37 -1
data/lib/capybara/spec/views/with_dragula.erb +24 -0
data/lib/capybara/spec/views/with_html.erb +24 -2
data/lib/capybara/spec/views/with_jquery_animation.erb +24 -0
data/lib/capybara/spec/views/with_js.erb +4 -1
data/lib/capybara/spec/views/with_jstree.erb +26 -0
data/lib/capybara/spec/views/with_sortable_js.erb +1 -1
data/lib/capybara/version.rb +1 -1
data/lib/capybara/window.rb +3 -7
data/spec/basic_node_spec.rb +15 -14
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 +3 -2
data/spec/minitest_spec_spec.rb +46 -46
data/spec/rack_test_spec.rb +38 -15
data/spec/regexp_dissassembler_spec.rb +52 -38
data/spec/result_spec.rb +43 -32
data/spec/rspec/features_spec.rb +4 -1
data/spec/rspec/scenarios_spec.rb +4 -0
data/spec/rspec/shared_spec_matchers.rb +68 -56
data/spec/rspec_spec.rb +9 -5
data/spec/selector_spec.rb +32 -17
data/spec/selenium_spec_chrome.rb +78 -11
data/spec/selenium_spec_chrome_remote.rb +23 -6
data/spec/selenium_spec_edge.rb +15 -12
data/spec/selenium_spec_firefox.rb +24 -19
data/spec/selenium_spec_firefox_remote.rb +0 -8
data/spec/selenium_spec_ie.rb +1 -6
data/spec/server_spec.rb +106 -44
data/spec/session_spec.rb +5 -5
data/spec/shared_selenium_node.rb +56 -2
data/spec/shared_selenium_session.rb +122 -15
data/spec/spec_helper.rb +2 -2
metadata +63 -17
data/lib/capybara/spec/session/source_spec.rb +0 -0

data/spec/rspec_spec.rb CHANGED Viewed

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
+# rubocop:disable RSpec/MultipleDescribes
 require 'spec_helper'
 RSpec.describe 'capybara/rspec' do
@@ -43,7 +45,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 +59,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 +78,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 +97,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
@@ -143,3 +145,5 @@ feature 'Feature DSL' do
     expect(page.body).to include('Another World')
   end
 end
+# rubocop:enable RSpec/MultipleDescribes

data/spec/selector_spec.rb CHANGED Viewed

@@ -3,9 +3,10 @@
 require 'spec_helper'
 RSpec.describe Capybara do
+  include Capybara::RSpecMatchers
   describe 'Selectors' do
     let :string do
-      Capybara.string <<-STRING
+      described_class.string <<-STRING
         <html>
           <head>
             <title>selectors</title>
@@ -69,12 +70,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 +95,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 +103,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 +112,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 +126,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 +134,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,7 +165,7 @@ RSpec.describe Capybara do
     describe 'xpath' do
       it 'uses filter names passed in' do
-        Capybara.add_selector :test do
+        described_class.add_selector :test do
           xpath(:something, :other) { |_locator| XPath.descendant }
         end
         selector = Capybara::Selector.new :test, config: nil, format: nil
@@ -173,7 +174,7 @@ RSpec.describe Capybara do
       end
       it 'gets filter names from block if none passed to xpath method' do
-        Capybara.add_selector :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
@@ -182,7 +183,7 @@ RSpec.describe Capybara do
       end
       it 'ignores block parameters if names passed in' do
-        Capybara.add_selector :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
@@ -205,7 +206,7 @@ RSpec.describe Capybara do
       end
       it 'uses filter names passed in' do
-        Capybara.add_selector :test do
+        described_class.add_selector :test do
           css(:name, :other_name) { |_locator| '' }
         end
         selector = Capybara::Selector.new :test, config: nil, format: nil
@@ -214,7 +215,7 @@ RSpec.describe Capybara do
       end
       it 'gets filter names from block if none passed to css method' do
-        Capybara.add_selector :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
@@ -223,7 +224,7 @@ RSpec.describe Capybara do
       end
       it 'ignores block parameters if names passed in' do
-        Capybara.add_selector :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
@@ -326,9 +327,23 @@ RSpec.describe Capybara do
           expect(string.find(:custom_xpath_selector, './/div', class: /dOm WoR/i)[:id]).to eq 'random_words'
         end
-        it 'accepts Regexp for CSS base selectors' do
+        it 'accepts Regexp for CSS based selectors' do
           expect(string.find(:custom_css_selector, 'div', class: /random/)[:id]).to eq 'random_words'
         end
+        it 'accepts Regexp for individual class names for XPath based selectors' do
+          expect(string.find(:custom_xpath_selector, './/div', class: [/random/, 'some'])[:id]).to eq 'random_words'
+          expect(string.find(:custom_xpath_selector, './/div', class: [/om/, /wor/])[:id]).to eq 'random_words'
+          expect { string.find(:custom_xpath_selector, './/div', class: [/not/, /wor/]) }.to raise_error(Capybara::ElementNotFound)
+          expect { string.find(:custom_xpath_selector, './/div', class: [/dom wor/]) }.to raise_error(Capybara::ElementNotFound)
+        end
+        it 'accepts Regexp for individual class names for CSS based selectors' do
+          expect(string.find(:custom_css_selector, 'div', class: [/random/])[:id]).to eq 'random_words'
+          expect(string.find(:custom_css_selector, 'div', class: [/om/, /wor/, 'some'])[:id]).to eq 'random_words'
+          expect { string.find(:custom_css_selector, 'div', class: [/not/, /wor/]) }.to raise_error(Capybara::ElementNotFound)
+          expect { string.find(:custom_css_selector, 'div', class: [/dom wor/]) }.to raise_error(Capybara::ElementNotFound)
+        end
       end
       context 'with :style option' do
@@ -476,8 +491,8 @@ 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

data/spec/selenium_spec_chrome.rb CHANGED Viewed

@@ -13,24 +13,62 @@ Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV['CI'] &&
 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)
+browser_options.add_preference(:download, default_directory: Capybara.save_path)
 Capybara.register_driver :selenium_chrome do |app|
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options, timeout: 30).tap do |driver|
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  driver_options = { browser: :chrome, timeout: 30 }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **driver_options).tap do |driver|
+    # Set download dir for Chrome < 77
     driver.browser.download_path = Capybara.save_path
   end
 end
 Capybara.register_driver :selenium_chrome_not_clear_storage do |app|
-  chrome_options = {
-    browser: :chrome,
-    options: browser_options
-  }
-  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: false, clear_session_storage: false))
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  chrome_options = { browser: :chrome, clear_local_storage: false, clear_session_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **chrome_options)
+end
+Capybara.register_driver :selenium_chrome_not_clear_session_storage do |app|
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  chrome_options = { browser: :chrome, clear_session_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **chrome_options)
+end
+Capybara.register_driver :selenium_chrome_not_clear_local_storage do |app|
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  chrome_options = { browser: :chrome, clear_local_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **chrome_options)
 end
 Capybara.register_driver :selenium_driver_subclass_with_chrome do |app|
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
   subclass = Class.new(Capybara::Selenium::Driver)
-  subclass.new(app, browser: :chrome, options: browser_options, timeout: 30)
+  chrome_options = { browser: :chrome, timeout: 30 }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  subclass.new(app, **chrome_options)
 end
 module TestSessions
@@ -47,6 +85,10 @@ 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
@@ -77,6 +119,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
@@ -125,16 +187,21 @@ RSpec.describe 'Capybara::Session with chrome' do
   describe 'log access' do
     before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
-    it 'errors when getting log types' do
+    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
-      end.to raise_error(NotImplementedError, /Chromedriver 75\+ defaults to W3C mode/)
+      end.not_to raise_error
     end
-    it 'errors when getting logs' do
+    it 'does not error when getting logs' do
       expect do
         session.driver.browser.manage.logs.get(:browser)
-      end.to raise_error(NotImplementedError, /Chromedriver 75\+ defaults to W3C mode/)
+      end.not_to raise_error
     end
   end
+  def chromedriver_version
+    Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0])
+  end
 end

data/spec/selenium_spec_chrome_remote.rb CHANGED Viewed

@@ -54,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|
@@ -68,6 +62,8 @@ 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
@@ -80,4 +76,25 @@ RSpec.describe 'Capybara::Session with remote Chrome' do
   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 unless Gem::Requirement.new('>= 75.0.3770.90').satisfied_by? chromedriver_version
+      expect do
+        session.driver.browser.manage.logs.available_types
+      end.not_to raise_error
+    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
+  def chromedriver_version
+    Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0])
+  end
 end

data/spec/selenium_spec_edge.rb CHANGED Viewed

@@ -6,12 +6,19 @@ require 'shared_selenium_session'
 require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
-Selenium::WebDriver::Edge::Service.driver_path = '/usr/local/bin/msedgedriver'
-Selenium::WebDriver::EdgeChrome.path = '/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary'
+# 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_chrome).tap do |driver|
+  # 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
@@ -23,17 +30,13 @@ end
 skipped_tests = %i[response_headers status_code trigger]
-Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Edge) 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'
-  # when /should be able to open non-http url/
-  #   skip 'Crashes'
-  # when /when Capybara.always_include_port is true/
-  #   skip 'Crashes'
-  # end
+  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

data/spec/selenium_spec_firefox.rb CHANGED Viewed

@@ -14,28 +14,30 @@ browser_options.profile = Selenium::WebDriver::Firefox::Profile.new.tap do |prof
   profile['browser.download.dir'] = Capybara.save_path
   profile['browser.download.folderList'] = 2
   profile['browser.helperApps.neverAsk.saveToDisk'] = 'text/csv'
+  profile['browser.startup.homepage'] = 'about:blank' # workaround bug in Selenium 4 alpha4-7
 end
 Capybara.register_driver :selenium_firefox do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
-  Capybara::Selenium::Driver.new(
-    app,
-    browser: :firefox,
-    options: browser_options,
-    timeout: 31
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  driver_options = { browser: :firefox, timeout: 31 }.tap do |opts|
+    opts[options_key] = browser_options
     # Get a trace level log from geckodriver
     # :driver_opts => { args: ['-vv'] }
-  )
+  end
+  Capybara::Selenium::Driver.new(app, **driver_options)
 end
 Capybara.register_driver :selenium_firefox_not_clear_storage do |app|
-  Capybara::Selenium::Driver.new(
-    app,
-    browser: :firefox,
-    clear_local_storage: false,
-    clear_session_storage: false,
-    options: browser_options
-  )
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  driver_options = { browser: :firefox, clear_local_storage: false, clear_session_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **driver_options)
 end
 module TestSessions
@@ -49,7 +51,7 @@ Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Firefox) i
 Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
   when 'Capybara::Session selenium node #click should allow multiple modifiers'
-    pending "Firefox doesn't generate an event for shift+control+click" if firefox_gte?(62, @session) && !Gem.win_platform?
+    pending "Firefox on OSX doesn't generate an event for shift+control+click" if firefox_gte?(62, @session) && Selenium::WebDriver::Platform.mac?
   when /^Capybara::Session selenium node #double_click/
     pending "selenium-webdriver/geckodriver doesn't generate double click event" if firefox_lt?(59, @session)
   when 'Capybara::Session selenium #accept_prompt should accept the prompt with a blank response when there is a default'
@@ -57,15 +59,18 @@ 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 FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @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?
   when 'Capybara::Session selenium #reset_session! removes ALL cookies'
     pending "Geckodriver doesn't provide a way to remove cookies outside the current domain"
-  when 'Capybara::Session selenium #attach_file with a block can upload by clicking the file input'
-    pending "Geckodriver doesn't allow clicking on file inputs"
   when /drag_to.*HTML5/
     pending "Firefox < 62 doesn't support a DataTransfer constuctor" 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'
   end
 end
@@ -106,7 +111,7 @@ RSpec.describe 'Capybara::Session with firefox' do # rubocop:disable RSpec/Multi
 end
 RSpec.describe Capybara::Selenium::Driver do
-  let(:driver) { Capybara::Selenium::Driver.new(TestApp, browser: :firefox, options: browser_options) }
+  let(:driver) { described_class.new(TestApp, browser: :firefox, options: browser_options) }
   describe '#quit' do
     it 'should reset browser when quit' do
@@ -183,7 +188,7 @@ RSpec.describe Capybara::Selenium::Driver do
 end
 RSpec.describe Capybara::Selenium::Node do
-  context '#click' do
+  describe '#click' do
     it 'warns when attempting on a table row' do
       session = TestSessions::SeleniumFirefox
       session.visit('/tables')