capybara 3.36.0 → 3.39.2

data/spec/selenium_spec_firefox_remote.rb

@@ -21,8 +21,8 @@ def ensure_selenium_running!
   rescue StandardError
     if timer.expired?
       raise 'Selenium is not running. ' \
-            "You can run a selenium server easily with: \n" \
-            '  $ docker-compose up -d selenium_firefox'
+            "You can run a selenium server easily with: \n. " \
+            '$ docker-compose up -d selenium_firefox'
     else
       puts 'Waiting for Selenium docker instance...'
       sleep 1
@@ -35,11 +35,10 @@ Capybara.register_driver :selenium_firefox_remote do |app|
   ensure_selenium_running!
 
   url = "http://#{selenium_host}:#{selenium_port}/wd/hub"
-  browser_options = ::Selenium::WebDriver::Firefox::Options.new
+  browser_options = Selenium::WebDriver::Firefox::Options.new
 
   Capybara::Selenium::Driver.new app,
                                  browser: :remote,
-                                 desired_capabilities: :firefox,
                                  options: browser_options,
                                  url: url
 end
@@ -65,6 +64,22 @@ Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVE
   when /#accept_confirm should work with nested modals$/
     # skip because this is timing based and hence flaky when set to pending
     skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session)
+  when 'Capybara::Session selenium_firefox_remote #fill_in should handle carriage returns with line feeds in a textarea correctly'
+    pending 'Not sure what firefox is doing here'
+  when 'Capybara::Session selenium_firefox_remote node #shadow_root should find elements inside the shadow dom using CSS',
+       'Capybara::Session selenium_firefox_remote node #shadow_root should find nested shadow roots',
+       'Capybara::Session selenium_firefox_remote node #shadow_root should click on elements',
+       'Capybara::Session selenium_firefox_remote node #shadow_root should use convenience methods once moved to a descendant of the shadow root',
+       'Capybara::Session selenium_firefox_remote node #shadow_root should produce error messages when failing',
+       'Capybara::Session with firefox with selenium driver #evaluate_script returns a shadow root'
+    pending "Firefox doesn't yet have full W3C shadow root support"
+  when /Capybara::Session selenium_firefox_remote node #shadow_root should get visible text/
+    pending "Selenium doesn't currently support getting visible text for shadow root elements"
+  when /Capybara::Session selenium_firefox_remote node #shadow_root/
+    skip 'Not supported with this Selenium version' if selenium_lt?('4.1', @session)
+    skip 'Not supported with this geckodriver version' if geckodriver_lt?('0.31.0', @session)
+  when /Capybara::Session selenium_firefox_remote node #set should submit single text input forms if ended with \\n/
+    pending 'Firefox/geckodriver doesn\'t submit with values ending in \n'
   end
 end
 

data/spec/selenium_spec_ie.rb

@@ -28,7 +28,7 @@ end
 
 Capybara.register_driver :selenium_ie do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
-  options = ::Selenium::WebDriver::IE::Options.new
+  options = Selenium::WebDriver::IE::Options.new
   # options.require_window_focus = true
   # options.add_option("log", {"level": "trace"})
 
@@ -103,11 +103,13 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, 'selenium', capybara_sk
   when /#attach_file with a block/
     skip 'Hangs IE testing for unknown reason'
   when /drag_to.*HTML5/
-    pending "IE doesn't support a DataTransfer constuctor"
+    pending "IE doesn't support a DataTransfer constructor"
   when /template elements should not be visible/
     skip "IE doesn't support template elements"
   when /Element#drop/
     pending "IE doesn't support DataTransfer constructor"
+  when /Capybara::Session selenium_chrome node #shadow_root should get visible text/
+    pending "Selenium doesn't currently support getting visible text for shadow root elements"
   end
 end
 

data/spec/selenium_spec_safari.rb

@@ -14,7 +14,7 @@ SAFARI_DRIVER = :selenium_safari
 #   ::Selenium::WebDriver::Safari
 # end.driver_path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
 
-browser_options = ::Selenium::WebDriver::Safari::Options.new
+browser_options = Selenium::WebDriver::Safari::Options.new
 # browser_options.headless! if ENV['HEADLESS']
 
 Capybara.register_driver :selenium_safari do |app|
@@ -80,10 +80,16 @@ Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybar
   when 'Capybara::Session selenium_safari node #double_click should allow modifiers'
     pending "safaridriver doesn't generate double click with key modifiers"
   when /when w3c_click_offset is true should offset/
-    pending "w3c_click_offset is not currently supported with safaridriver"
+    pending 'w3c_click_offset is not currently supported with safaridriver'
   when 'Capybara::Session selenium_safari #go_back should fetch a response from the driver from the previous page',
        'Capybara::Session selenium_safari #go_forward should fetch a response from the driver from the previous page'
     skip 'safaridriver loses the ability to find elements in the document after `go_back`'
+  when 'Capybara::Session selenium node #shadow_root should get the shadow root',
+    'Capybara::Session selenium node #shadow_root should find elements inside the shadow dom using CSS',
+    'Capybara::Session selenium node #shadow_root should find nested shadow roots'
+    pending "Safari doesn't yet have W3C shadow root support"
+  when /Capybara::Session selenium_chrome node #shadow_root should get visible text/
+    pending "Selenium doesn't currently support getting visible text for shadow root elements"
   end
 end
 

data/spec/server_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Capybara::Server do
 
   it 'should bind to the specified host' do
     # TODO: travis with jruby in container mode has an issue with this test
-    skip 'This platform has an issue with this test' if (ENV['TRAVIS'] && (RUBY_ENGINE == 'jruby')) || Gem.win_platform?
+    skip 'This platform has an issue with this test' if (ENV.fetch('TRAVIS', nil) && (RUBY_ENGINE == 'jruby')) || Gem.win_platform?
 
     begin
       app = proc { |_env| [200, {}, ['Hello Server!']] }
@@ -78,7 +78,7 @@ RSpec.describe Capybara::Server do
     # Use a port to force a EADDRINUSE error to be generated
     server = TCPServer.new('0.0.0.0', 0)
     server_port = server.addr[1]
-    d_server = instance_double('TCPServer', addr: [nil, server_port, nil, nil], close: nil)
+    d_server = instance_double(TCPServer, addr: [nil, server_port, nil, nil], close: nil)
     call_count = 0
     allow(TCPServer).to receive(:new).and_wrap_original do |m, *args|
       call_count.zero? ? d_server : m.call(*args)
@@ -95,7 +95,7 @@ RSpec.describe Capybara::Server do
   it 'should return its #base_url' do
     app = proc { |_env| [200, {}, ['Hello Server!']] }
     server = described_class.new(app).boot
-    uri = ::Addressable::URI.parse(server.base_url)
+    uri = Addressable::URI.parse(server.base_url)
     expect(uri.to_hash).to include(scheme: 'http', host: server.host, port: server.port)
   end
 
@@ -136,7 +136,7 @@ RSpec.describe Capybara::Server do
     end
 
     expect(res.body).to include('Hello SSL Server!')
-    uri = ::Addressable::URI.parse(server.base_url)
+    uri = Addressable::URI.parse(server.base_url)
     expect(uri.to_hash).to include(scheme: 'https', host: server.host, port: server.port)
   ensure
     Capybara.server = :default
@@ -184,7 +184,7 @@ RSpec.describe Capybara::Server do
         start_request(server2, 3.0)
         server1.wait_for_pending_requests
       end.to change { done }.from(0).to(2)
-      expect(server2.send(:pending_requests?)).to eq(false)
+      expect(server2.send(:pending_requests?)).to be(false)
     end
   end
 
@@ -229,7 +229,7 @@ RSpec.describe Capybara::Server do
         start_request(server2, 3.0)
         server1.wait_for_pending_requests
       end.to change { done }.from(0).to(1)
-      expect(server2.send(:pending_requests?)).to eq(true)
+      expect(server2.send(:pending_requests?)).to be(true)
       expect do
         server2.wait_for_pending_requests
       end.to change { done }.from(1).to(2)
@@ -274,7 +274,7 @@ RSpec.describe Capybara::Server do
     app = -> { [200, {}, ['Hello, world']] }
     server = described_class.new(app)
     allow(Net::HTTP).to receive(:start).and_raise(SystemCallError.allocate)
-    expect(server.responsive?).to eq false
+    expect(server.responsive?).to be false
   end
 
   [EOFError, Net::ReadTimeout].each do |err|

data/spec/shared_selenium_session.rb

@@ -23,7 +23,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       it 'freshly reset session should not be touched' do
         session.instance_variable_set(:@touched, true)
         session.reset!
-        expect(session.instance_variable_get(:@touched)).to eq false
+        expect(session.instance_variable_get(:@touched)).to be false
       end
     end
 
@@ -280,6 +280,15 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         expect(element).to eq session.find(:id, 'form_title')
       end
 
+      it 'returns a shadow root' do
+        skip 'Not supported with this Selenium version' if selenium_lt?('4.1', session)
+        pending "Geckodriver doesn't fully support shadow root yet" if firefox?(session)
+        session.visit('/with_shadow')
+        shadow = session.find(:css, '#shadow_host')
+        element = session.evaluate_script('arguments[0].shadowRoot', shadow)
+        expect(element).to be_instance_of(Capybara::Node::Element)
+      end
+
       it 'can return arrays of nested elements' do
         session.visit('/form')
         elements = session.evaluate_script('document.querySelectorAll("#form_city option")')
@@ -336,17 +345,15 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       it 'can attach a directory' do
         pending "Geckodriver doesn't support uploading a directory" if firefox?(session)
         pending "Selenium remote doesn't support transferring a directory" if remote?(session)
-        pending "Headless Chrome doesn't support directory upload - https://bugs.chromium.org/p/chromedriver/issues/detail?id=2521&q=directory%20upload&colspec=ID%20Status%20Pri%20Owner%20Summary" if chrome?(session) && ENV['HEADLESS']
+        pending "Headless Chrome doesn't support directory upload - https://bugs.chromium.org/p/chromedriver/issues/detail?id=2521&q=directory%20upload&colspec=ID%20Status%20Pri%20Owner%20Summary" if chrome?(session) && chrome_lt?(110, session) && ENV.fetch('HEADLESS', nil)
         pending "IE doesn't support uploading a directory" if ie?(session)
         pending 'Chrome/chromedriver 73 breaks this' if chrome?(session) && chrome_gte?(73, session) && chrome_lt?(75, session)
-        pending "Safari doesn't support uploading a directory" if safari?(session)
-        # pending "Edge/msedgedriver doesn't support directory upload" if edge?(session) && edge_gte?(75, session)
 
         session.visit('/form')
         test_file_dir = File.expand_path('./fixtures', File.dirname(__FILE__))
         session.attach_file('Directory Upload', test_file_dir)
         session.click_button('Upload Multiple')
-        expect(session.body).to include('5 | ') # number of files
+        expect(session).to have_text('5 | ') # number of files
       end
 
       it 'can attach a relative file' do
@@ -355,7 +362,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         session.visit('/form')
         session.attach_file('Single Document', 'spec/fixtures/capybara.csv')
         session.click_button('Upload Single')
-        expect(session.body).to include('Content-type: text/csv')
+        expect(session).to have_text('Content-type: text/csv')
       end
     end
 

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rspec/expectations'
-require 'webdrivers' if ENV['CI'] || ENV['WEBDRIVERS']
+require 'webdrivers' if ENV.fetch('CI', nil) || ENV.fetch('WEBDRIVERS', nil)
 require 'selenium_statistics'
 if ENV['TRAVIS']
   require 'coveralls'
@@ -16,7 +16,7 @@ module Capybara
   module SpecHelper
     def firefox?(session)
       browser_name(session) == :firefox &&
-        ((defined?(::Selenium::WebDriver::VERSION) && (::Selenium::WebDriver::VERSION.to_f >= 4)) ||
+        ((defined?(::Selenium::WebDriver::VERSION) && (Gem::Version.new(::Selenium::WebDriver::VERSION) >= Gem::Version.new('4'))) ||
          session.driver.browser.capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities))
     end
 
@@ -28,6 +28,18 @@ module Capybara
       firefox?(session) && (session.driver.browser.capabilities[:browser_version].to_f >= version)
     end
 
+    def geckodriver_version(session)
+      Gem::Version.new(session.driver.browser.capabilities['moz:geckodriverVersion'])
+    end
+
+    def geckodriver_gte?(version, session)
+      firefox?(session) && geckodriver_version(session) >= Gem::Version.new(version)
+    end
+
+    def geckodriver_lt?(version, session)
+      firefox?(session) && geckodriver_version(session) < Gem::Version.new(version)
+    end
+
     def chrome?(session)
       browser_name(session) == :chrome
     end
@@ -45,6 +57,27 @@ module Capybara
       chrome?(session) && (chrome_version(session) >= version)
     end
 
+    def chromedriver_version(session)
+      Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0])
+    end
+
+    def chromedriver_gte?(version, session)
+      chrome?(session) && chromedriver_version(session) >= Gem::Version.new(version)
+    end
+
+    def chromedriver_lt?(version, session)
+      chrome?(session) && chromedriver_version(session) < Gem::Version.new(version)
+    end
+
+    def selenium?(session)
+      session.driver.is_a? Capybara::Selenium::Driver
+    end
+
+    def selenium_lt?(version, session)
+      selenium?(session) &&
+        Gem::Version.new(::Selenium::WebDriver::VERSION) < Gem::Version.new(version)
+    end
+
     def edge?(session)
       browser_name(session).to_s.start_with?('edge')
     end

data/spec/whitespace_normalizer_spec.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'capybara/node/whitespace_normalizer'
+
+RSpec.describe Capybara::Node::WhitespaceNormalizer do
+  subject(:normalizer) do
+    klass = Class.new do
+      include Capybara::Node::WhitespaceNormalizer
+    end
+
+    klass.new
+  end
+
+  let(:text_needing_correction) do
+    <<~TEXT
+      Some     #{described_class::NON_BREAKING_SPACE}text
+      #{described_class::RIGHT_TO_LEFT_MARK}
+      #{described_class::ZERO_WIDTH_SPACE * 30}
+      #{described_class::LEFT_TO_RIGHT_MARK}
+      Here
+    TEXT
+  end
+
+  describe '#normalize_spacing' do
+    it 'does nothing to text not containing special characters' do
+      expect(normalizer.normalize_spacing('text')).to eq('text')
+    end
+
+    it 'compresses excess breaking spacing' do
+      expect(
+        normalizer.normalize_spacing(text_needing_correction)
+      ).to eq('Some  text Here')
+    end
+  end
+
+  describe '#normalize_visible_spacing' do
+    it 'does nothing to text not containing special characters' do
+      expect(normalizer.normalize_visible_spacing('text')).to eq('text')
+    end
+
+    it 'compresses excess breaking visible spacing' do
+      expect(
+        normalizer.normalize_visible_spacing(text_needing_correction)
+      ).to eq <<~TEXT.chomp
+        Some  text
+        #{described_class::RIGHT_TO_LEFT_MARK}
+        #{described_class::ZERO_WIDTH_SPACE * 30}
+        #{described_class::LEFT_TO_RIGHT_MARK}
+        Here
+      TEXT
+    end
+  end
+end

data/spec/xpath_builder_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.36.0
+  version: 3.39.2
 platform: ruby
 authors:
 - Thomas Walpole
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2023-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -487,6 +487,7 @@ files:
 - lib/capybara/node/finders.rb
 - lib/capybara/node/matchers.rb
 - lib/capybara/node/simple.rb
+- lib/capybara/node/whitespace_normalizer.rb
 - lib/capybara/queries/active_element_query.rb
 - lib/capybara/queries/ancestor_query.rb
 - lib/capybara/queries/base_query.rb
@@ -734,6 +735,7 @@ files:
 - lib/capybara/spec/views/with_namespace.erb
 - lib/capybara/spec/views/with_scope.erb
 - lib/capybara/spec/views/with_scope_other.erb
+- lib/capybara/spec/views/with_shadow.erb
 - lib/capybara/spec/views/with_simple_html.erb
 - lib/capybara/spec/views/with_slow_unload.erb
 - lib/capybara/spec/views/with_sortable_js.erb
@@ -744,6 +746,7 @@ files:
 - lib/capybara/window.rb
 - spec/basic_node_spec.rb
 - spec/capybara_spec.rb
+- spec/counter_spec.rb
 - spec/css_builder_spec.rb
 - spec/css_splitter_spec.rb
 - spec/dsl_spec.rb
@@ -779,6 +782,7 @@ files:
 - spec/shared_selenium_node.rb
 - spec/shared_selenium_session.rb
 - spec/spec_helper.rb
+- spec/whitespace_normalizer_spec.rb
 - spec/xpath_builder_spec.rb
 homepage: https://github.com/teamcapybara/capybara
 licenses:
@@ -786,6 +790,7 @@ licenses:
 metadata:
   changelog_uri: https://github.com/teamcapybara/capybara/blob/master/History.md
   source_code_uri: https://github.com/teamcapybara/capybara
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -794,14 +799,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,