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

capybara 3.35.3 → 3.37.1

Files changed (129) hide show

checksums.yaml +4 -4
data/History.md +57 -1
data/README.md +5 -1
data/lib/capybara/config.rb +16 -4
data/lib/capybara/driver/base.rb +4 -0
data/lib/capybara/driver/node.rb +5 -1
data/lib/capybara/dsl.rb +4 -10
data/lib/capybara/helpers.rb +3 -12
data/lib/capybara/minitest/spec.rb +2 -2
data/lib/capybara/node/actions.rb +10 -5
data/lib/capybara/node/document.rb +2 -2
data/lib/capybara/node/element.rb +13 -2
data/lib/capybara/node/finders.rb +9 -2
data/lib/capybara/node/simple.rb +5 -1
data/lib/capybara/queries/active_element_query.rb +18 -0
data/lib/capybara/queries/ancestor_query.rb +2 -1
data/lib/capybara/queries/current_path_query.rb +1 -1
data/lib/capybara/queries/selector_query.rb +34 -8
data/lib/capybara/queries/sibling_query.rb +2 -1
data/lib/capybara/rack_test/browser.rb +56 -7
data/lib/capybara/rack_test/driver.rb +4 -4
data/lib/capybara/rack_test/node.rb +10 -7
data/lib/capybara/registration_container.rb +0 -3
data/lib/capybara/registrations/drivers.rb +3 -3
data/lib/capybara/rspec/matcher_proxies.rb +3 -3
data/lib/capybara/rspec/matchers/have_selector.rb +5 -5
data/lib/capybara/rspec/matchers.rb +14 -14
data/lib/capybara/selector/builders/css_builder.rb +1 -1
data/lib/capybara/selector/builders/xpath_builder.rb +1 -1
data/lib/capybara/selector/css.rb +1 -1
data/lib/capybara/selector/definition/button.rb +9 -4
data/lib/capybara/selector/definition/checkbox.rb +1 -1
data/lib/capybara/selector/definition/file_field.rb +1 -1
data/lib/capybara/selector/definition/fillable_field.rb +1 -1
data/lib/capybara/selector/definition/radio_button.rb +1 -1
data/lib/capybara/selector/definition.rb +3 -1
data/lib/capybara/selector/filter_set.rb +4 -6
data/lib/capybara/selector/selector.rb +5 -1
data/lib/capybara/selector.rb +1 -0
data/lib/capybara/selenium/driver.rb +25 -11
data/lib/capybara/selenium/driver_specializations/chrome_driver.rb +1 -1
data/lib/capybara/selenium/driver_specializations/edge_driver.rb +1 -1
data/lib/capybara/selenium/driver_specializations/firefox_driver.rb +1 -1
data/lib/capybara/selenium/node.rb +22 -8
data/lib/capybara/selenium/nodes/chrome_node.rb +1 -1
data/lib/capybara/selenium/nodes/edge_node.rb +1 -1
data/lib/capybara/selenium/nodes/firefox_node.rb +1 -1
data/lib/capybara/selenium/nodes/safari_node.rb +2 -2
data/lib/capybara/server/animation_disabler.rb +35 -17
data/lib/capybara/session/config.rb +1 -1
data/lib/capybara/session.rb +20 -23
data/lib/capybara/spec/session/active_element_spec.rb +31 -0
data/lib/capybara/spec/session/all_spec.rb +9 -13
data/lib/capybara/spec/session/assert_text_spec.rb +17 -17
data/lib/capybara/spec/session/check_spec.rb +9 -0
data/lib/capybara/spec/session/choose_spec.rb +6 -0
data/lib/capybara/spec/session/find_spec.rb +6 -0
data/lib/capybara/spec/session/has_any_selectors_spec.rb +4 -0
data/lib/capybara/spec/session/has_button_spec.rb +24 -0
data/lib/capybara/spec/session/has_current_path_spec.rb +2 -2
data/lib/capybara/spec/session/has_field_spec.rb +25 -1
data/lib/capybara/spec/session/has_link_spec.rb +30 -0
data/lib/capybara/spec/session/has_select_spec.rb +4 -4
data/lib/capybara/spec/session/has_selector_spec.rb +15 -0
data/lib/capybara/spec/session/has_text_spec.rb +2 -6
data/lib/capybara/spec/session/node_spec.rb +43 -1
data/lib/capybara/spec/session/scroll_spec.rb +4 -4
data/lib/capybara/spec/session/visit_spec.rb +20 -0
data/lib/capybara/spec/session/window/window_spec.rb +1 -1
data/lib/capybara/spec/spec_helper.rb +4 -3
data/lib/capybara/spec/test_app.rb +66 -8
data/lib/capybara/spec/views/animated.erb +1 -1
data/lib/capybara/spec/views/form.erb +11 -3
data/lib/capybara/spec/views/frame_child.erb +1 -1
data/lib/capybara/spec/views/frame_one.erb +1 -1
data/lib/capybara/spec/views/frame_parent.erb +1 -1
data/lib/capybara/spec/views/frame_two.erb +1 -1
data/lib/capybara/spec/views/initial_alert.erb +2 -1
data/lib/capybara/spec/views/layout.erb +10 -0
data/lib/capybara/spec/views/obscured.erb +1 -1
data/lib/capybara/spec/views/offset.erb +2 -1
data/lib/capybara/spec/views/path.erb +2 -2
data/lib/capybara/spec/views/popup_one.erb +1 -1
data/lib/capybara/spec/views/popup_two.erb +1 -1
data/lib/capybara/spec/views/react.erb +2 -2
data/lib/capybara/spec/views/scroll.erb +2 -1
data/lib/capybara/spec/views/spatial.erb +1 -1
data/lib/capybara/spec/views/with_animation.erb +2 -3
data/lib/capybara/spec/views/with_base_tag.erb +2 -2
data/lib/capybara/spec/views/with_dragula.erb +2 -2
data/lib/capybara/spec/views/with_fixed_header_footer.erb +2 -1
data/lib/capybara/spec/views/with_hover.erb +2 -2
data/lib/capybara/spec/views/with_html.erb +1 -1
data/lib/capybara/spec/views/with_jquery_animation.erb +1 -1
data/lib/capybara/spec/views/with_js.erb +2 -3
data/lib/capybara/spec/views/with_jstree.erb +1 -1
data/lib/capybara/spec/views/with_namespace.erb +1 -0
data/lib/capybara/spec/views/with_shadow.erb +31 -0
data/lib/capybara/spec/views/with_slow_unload.erb +2 -1
data/lib/capybara/spec/views/with_sortable_js.erb +2 -2
data/lib/capybara/spec/views/with_unload_alert.erb +1 -0
data/lib/capybara/spec/views/with_windows.erb +1 -1
data/lib/capybara/spec/views/within_frames.erb +1 -1
data/lib/capybara/version.rb +1 -1
data/lib/capybara/window.rb +1 -1
data/lib/capybara.rb +19 -22
data/spec/basic_node_spec.rb +16 -3
data/spec/dsl_spec.rb +3 -3
data/spec/fixtures/selenium_driver_rspec_failure.rb +2 -2
data/spec/fixtures/selenium_driver_rspec_success.rb +2 -2
data/spec/rack_test_spec.rb +20 -10
data/spec/result_spec.rb +32 -35
data/spec/rspec/features_spec.rb +3 -3
data/spec/rspec/scenarios_spec.rb +1 -1
data/spec/rspec/shared_spec_matchers.rb +2 -2
data/spec/sauce_spec_chrome.rb +3 -3
data/spec/selector_spec.rb +2 -2
data/spec/selenium_spec_chrome.rb +9 -10
data/spec/selenium_spec_chrome_remote.rb +9 -8
data/spec/selenium_spec_firefox.rb +8 -3
data/spec/selenium_spec_firefox_remote.rb +2 -2
data/spec/selenium_spec_ie.rb +3 -6
data/spec/selenium_spec_safari.rb +31 -19
data/spec/server_spec.rb +5 -5
data/spec/shared_selenium_node.rb +0 -4
data/spec/shared_selenium_session.rb +20 -10
data/spec/spec_helper.rb +1 -1
metadata +37 -14
data/lib/capybara/spec/views/with_title.erb +0 -5

data/lib/capybara/spec/views/with_shadow.erb ADDED Viewed

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<%# Borrowed from Titus Fortner %>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Shadow DOM</title>
+  </head>
+  <body>
+    <div id="no_host"></div>
+    <div id="shadow_host"></div>
+    <a href="scroll.html">scroll.html</a>
+    <script>
+      let shadowRoot = document.getElementById('shadow_host').attachShadow({mode: 'open'});
+      shadowRoot.innerHTML = `
+              <span class="wrapper" id="shadow_content"><span class="info">some text</span></span>
+              <div id="nested_shadow_host"></div>
+              <a href="scroll.html">scroll.html</a>
+	  		  <div id="controls_wrapper">
+                <input type="text" />
+                <input type="checkbox" id="shadow_checkbox" />
+                <input type="file" />
+	 		  </div>
+            `;
+      let nestedShadowRoot = shadowRoot.getElementById('nested_shadow_host').attachShadow({mode: 'open'});
+      nestedShadowRoot.innerHTML = `
+              <div id="nested_shadow_content"><div>nested text</div></div>
+            `;
+    </script>
+  </body>
+</html>

data/lib/capybara/spec/views/with_slow_unload.erb CHANGED Viewed

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
   <script>
@@ -14,4 +15,4 @@
 <body>
   <div>This delays unload by 2 seconds</div>
 </body>
-</html>
+</html>

data/lib/capybara/spec/views/with_sortable_js.erb CHANGED Viewed

@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_sortable_js</title>
@@ -18,4 +19,3 @@
     </script>
   </body>
 </html>

data/lib/capybara/spec/views/with_unload_alert.erb CHANGED Viewed

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
   <script>

data/lib/capybara/spec/views/with_windows.erb CHANGED Viewed

@@ -1,4 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <title>With Windows</title>

data/lib/capybara/spec/views/within_frames.erb CHANGED Viewed

@@ -1,4 +1,4 @@
+<!DOCTYPE html>
 <html>
     <head>
         <title>With Frames</title>

data/lib/capybara/version.rb CHANGED Viewed

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

data/lib/capybara/window.rb CHANGED Viewed

@@ -118,7 +118,7 @@ module Capybara
     alias_method :==, :eql?
     def hash
-      @session.hash ^ @handle.hash
+      [@session, @handle].hash
     end
     def inspect

data/lib/capybara.rb CHANGED Viewed

@@ -39,7 +39,7 @@ module Capybara
     #   See {Capybara.configure}
     # @!method javascript_driver
     #   See {Capybara.configure}
-    # @!method allow_gumbo
+    # @!method use_html5_parsing
     #   See {Capybara.configure}
     Config::OPTIONS.each do |method|
       def_delegators :config, method, "#{method}="
@@ -69,7 +69,7 @@ module Capybara
     #
     # #### Configurable options
     #
-    # - **allow_gumbo** (Boolean = `false`) - When `nokogumbo` is available, whether it will be used to parse HTML strings.
+    # - **use_html5_parsing** (Boolean = `false`) - When Nokogiri >= 1.12.0 or `nokogumbo` is installed, whether HTML5 parsing will be used for HTML strings.
     # - **always_include_port** (Boolean = `false`) - Whether the Rack server's port should automatically be inserted into every visited URL
     #   unless another port is explicitly specified.
     # - **app_host** (String, `nil`) - The default host to use when giving a relative URL to visit, must be a valid URL e.g. `http://www.example.com`.
@@ -96,6 +96,7 @@ module Capybara
     #   {Capybara::Session#save_and_open_page save_and_open_page}, or {Capybara::Session#save_and_open_screenshot save_and_open_screenshot}.
     # - **server** (Symbol = `:default` (which uses puma)) - The name of the registered server to use when running the app under test.
     # - **server_port** (Integer) - The port Capybara will run the application server on, if not specified a random port will be used.
+    # - **server_host** (String = "127.0.0.1") - The IP address Capybara will bind the application server to. If the test application is to be accessed from an external host, you will want to change this to "0.0.0.0" or to a more specific IP address that your test client can reach.
     # - **server_errors** (Array\<Class> = `[Exception]`) - Error classes that should be raised in the tests if they are raised in the server
     #   and {configure raise_server_errors} is `true`.
     # - **test_id** (Symbol, String, `nil` = `nil`) - Optional attribute to match locator against with built-in selectors along with id.
@@ -385,26 +386,21 @@ module Capybara
     # @return [Nokogiri::HTML::Document]      HTML document
     #
     def HTML(html) # rubocop:disable Naming/MethodName
-      if Nokogiri.respond_to?(:HTML5) && Capybara.allow_gumbo # Nokogumbo installed and allowed for use
-        Nokogiri::HTML5(html).tap do |document|
-          document.xpath('//template').each do |template|
-            # template elements content is not part of the document
-            template.inner_html = ''
-          end
-          document.xpath('//textarea').each do |textarea|
-            # The Nokogumbo HTML5 parser already returns spec compliant contents
-            textarea['_capybara_raw_value'] = textarea.content
-          end
-        end
+      # Nokogiri >= 1.12.0 or Nokogumbo installed and allowed for use
+      html_parser, using_html5 = if defined?(Nokogiri::HTML5) && Capybara.use_html5_parsing
+        [Nokogiri::HTML5, true]
       else
-        Nokogiri::HTML(html).tap do |document|
-          document.xpath('//template').each do |template|
-            # template elements content is not part of the document
-            template.inner_html = ''
-          end
-          document.xpath('//textarea').each do |textarea|
-            textarea['_capybara_raw_value'] = textarea.content.delete_prefix("\n")
-          end
+        [defined?(Nokogiri::HTML4) ? Nokogiri::HTML4 : Nokogiri::HTML, false]
+      end
+      html_parser.parse(html).tap do |document|
+        document.xpath('//template').each do |template|
+          # template elements content is not part of the document
+          template.inner_html = ''
+        end
+        document.xpath('//textarea').each do |textarea|
+          # The Nokogiri HTML5 parser already returns spec compliant contents
+          textarea['_capybara_raw_value'] = using_html5 ? textarea.content : textarea.content.delete_prefix("\n")
         end
       end
     end
@@ -467,6 +463,7 @@ module Capybara
   require 'capybara/queries/ancestor_query'
   require 'capybara/queries/sibling_query'
   require 'capybara/queries/style_query'
+  require 'capybara/queries/active_element_query'
   require 'capybara/node/finders'
   require 'capybara/node/matchers'
@@ -516,6 +513,6 @@ Capybara.configure do |config|
   config.test_id = nil
   config.predicates_wait = true
   config.default_normalize_ws = false
-  config.allow_gumbo = false
+  config.use_html5_parsing = false
   config.w3c_click_offset = false
 end

data/spec/basic_node_spec.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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
@@ -471,7 +471,7 @@ RSpec.describe Capybara do
         end
         it 'includes wildcarded keys in description' do
-          expect { string.find(:element, 'input', not_there: 'bad', presence: true, absence: false, count: 1) }
+          expect { string.all(:element, 'input', not_there: 'bad', presence: true, absence: false, count: 1) }
             .to(raise_error do |e|
               expect(e).to be_a(Capybara::ElementNotFound)
               expect(e.message).to include 'not_there => bad'

data/spec/selenium_spec_chrome.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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