capybara 3.38.0 → 3.39.0

data/spec/shared_selenium_session.rb

@@ -281,6 +281,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       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')
@@ -344,7 +345,7 @@ 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.fetch('HEADLESS', nil)
+        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)
 

data/spec/spec_helper.rb

@@ -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.38.0
+  version: 3.39.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2023-04-03 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
@@ -781,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: