capybara 3.35.3 → 3.38.0

data/lib/capybara/queries/selector_query.rb

@@ -9,7 +9,7 @@ module Capybara
 
       SPATIAL_KEYS = %i[above below left_of right_of near].freeze
       VALID_KEYS = SPATIAL_KEYS + COUNT_KEYS +
-                   %i[text id class style visible obscured exact exact_text normalize_ws match wait filter_set]
+                   %i[text id class style visible obscured exact exact_text normalize_ws match wait filter_set focused]
       VALID_MATCH = %i[first smart prefer_exact one].freeze
 
       def initialize(*args,
@@ -27,6 +27,12 @@ module Capybara
         @order = order
         @filter_cache = Hash.new { |hsh, key| hsh[key] = {} }
 
+        if @options[:text].is_a?(Regexp) && [true, false].include?(@options[:exact_text])
+          Capybara::Helpers.warn(
+            "Boolean 'exact_text' option is not supported when 'text' option is a Regexp - ignoring"
+          )
+        end
+
         super(@options)
         self.session_options = session_options
 
@@ -73,6 +79,8 @@ module Capybara
 
         desc << " with id #{options[:id]}" if options[:id]
         desc << " with classes [#{Array(options[:class]).join(',')}]" if options[:class]
+        desc << ' that is focused' if options[:focused]
+        desc << ' that is not focused' if options[:focused] == false
 
         desc << case options[:style]
         when String
@@ -264,7 +272,7 @@ module Capybara
       end
 
       def valid_keys
-        VALID_KEYS + custom_keys
+        (VALID_KEYS + custom_keys).uniq
       end
 
       def matches_node_filters?(node, errors)
@@ -371,6 +379,10 @@ module Capybara
         options.key?(:style) && !custom_keys.include?(:style)
       end
 
+      def use_default_focused_filter?
+        options.key?(:focused) && !custom_keys.include?(:focused)
+      end
+
       def use_spatial_filter?
         options.values_at(*SPATIAL_KEYS).compact.any?
       end
@@ -435,6 +447,7 @@ module Capybara
           matches_id_filter?(node) &&
           matches_class_filter?(node) &&
           matches_style_filter?(node) &&
+          matches_focused_filter?(node) &&
           matches_text_filter?(node) &&
           matches_exact_text_filter?(node)
       end
@@ -494,6 +507,12 @@ module Capybara
         end
       end
 
+      def matches_focused_filter?(node)
+        return true unless use_default_focused_filter?
+
+        (node == node.session.active_element) == options[:focused]
+      end
+
       def need_to_process_classes?
         case options[:class]
         when Regexp then true
@@ -528,16 +547,19 @@ module Capybara
       def matches_text_filter?(node)
         value = options[:text]
         return true unless value
-        return matches_text_exactly?(node, value) if exact_text == true
+        return matches_text_exactly?(node, value) if exact_text == true && !value.is_a?(Regexp)
 
         regexp = value.is_a?(Regexp) ? value : Regexp.escape(value.to_s)
         matches_text_regexp?(node, regexp)
       end
 
       def matches_exact_text_filter?(node)
-        return true unless exact_text.is_a?(String)
-
-        matches_text_exactly?(node, exact_text)
+        case exact_text
+        when String, Regexp
+          matches_text_exactly?(node, exact_text)
+        else
+          true
+        end
       end
 
       def matches_visibility_filters?(node)
@@ -548,7 +570,9 @@ module Capybara
         when :visible
           node.initial_cache[:visible] || (node.initial_cache[:visible].nil? && node.visible?)
         when :hidden
-          (node.initial_cache[:visible] == false) || (node.initial_cache[:visbile].nil? && !node.visible?)
+          # TODO: check why the 'visbile' cache spelling mistake wasn't caught in a test
+          # (node.initial_cache[:visible] == false) || (node.initial_cache[:visbile].nil? && !node.visible?)
+          (node.initial_cache[:visible] == false) || (node.initial_cache[:visible].nil? && !node.visible?)
         else
           true
         end
@@ -565,17 +589,21 @@ module Capybara
 
       def matches_text_exactly?(node, value)
         regexp = value.is_a?(Regexp) ? value : /\A#{Regexp.escape(value.to_s)}\z/
-        matches_text_regexp?(node, regexp)
+        matches_text_regexp(node, regexp).then { |m| m&.pre_match == '' && m&.post_match == '' }
       end
 
       def normalize_ws
         options.fetch(:normalize_ws, session_options.default_normalize_ws)
       end
 
-      def matches_text_regexp?(node, regexp)
+      def matches_text_regexp(node, regexp)
         text_visible = visible
         text_visible = :all if text_visible == :hidden
-        node.text(text_visible, normalize_ws: normalize_ws).match?(regexp)
+        node.text(text_visible, normalize_ws: normalize_ws).match(regexp)
+      end
+
+      def matches_text_regexp?(node, regexp)
+        !matches_text_regexp(node, regexp).nil?
       end
 
       def default_visibility

data/lib/capybara/queries/sibling_query.rb

@@ -7,7 +7,8 @@ module Capybara
       def resolve_for(node, exact = nil)
         @sibling_node = node
         node.synchronize do
-          match_results = super(node.session.current_scope, exact)
+          scope = node.respond_to?(:session) ? node.session.current_scope : node.find(:xpath, '/*')
+          match_results = super(scope, exact)
           siblings = node.find_xpath((XPath.preceding_sibling + XPath.following_sibling).to_s)
                          .map(&method(:to_element))
                          .select { |el| match_results.include?(el) }

data/lib/capybara/queries/text_query.rb

@@ -13,7 +13,7 @@ module Capybara
         self.session_options = session_options
 
         if expected_text.nil? && !exact?
-          warn 'Checking for expected text of nil is confusing and/or pointless since it will always match. '\
+          warn 'Checking for expected text of nil is confusing and/or pointless since it will always match. ' \
                "Please specify a string or regexp instead. #{Capybara::Helpers.filter_backtrace(caller)}"
         end
 

data/lib/capybara/rack_test/browser.rb

@@ -20,6 +20,8 @@ class Capybara::RackTest::Browser
   end
 
   def visit(path, **attributes)
+    @new_visit_request = true
+    reset_cache!
     reset_host!
     process_and_follow_redirects(:get, path, attributes)
   end
@@ -29,23 +31,28 @@ class Capybara::RackTest::Browser
     request(last_request.fullpath, last_request.env)
   end
 
-  def submit(method, path, attributes)
+  def submit(method, path, attributes, content_type: nil)
     path = request_path if path.nil? || path.empty?
     uri = build_uri(path)
     uri.query = '' if method.to_s.casecmp('get').zero?
-    process_and_follow_redirects(method, uri.to_s, attributes, 'HTTP_REFERER' => current_url)
+    process_and_follow_redirects(
+      method,
+      uri.to_s,
+      attributes,
+      'HTTP_REFERER' => referer_url,
+      'CONTENT_TYPE' => content_type
+    )
   end
 
   def follow(method, path, **attributes)
     return if fragment_or_script?(path)
 
-    process_and_follow_redirects(method, path, attributes, 'HTTP_REFERER' => current_url)
+    process_and_follow_redirects(method, path, attributes, 'HTTP_REFERER' => referer_url)
   end
 
   def process_and_follow_redirects(method, path, attributes = {}, env = {})
     @current_fragment = build_uri(path).fragment
     process(method, path, attributes, env)
-
     return unless driver.follow_redirects?
 
     driver.redirect_limit.times do
@@ -69,18 +76,23 @@ class Capybara::RackTest::Browser
     @current_scheme, @current_host, @current_port = new_uri.select(:scheme, :host, :port)
     @current_fragment = new_uri.fragment || @current_fragment
     reset_cache!
+    @new_visit_request = false
     send(method, new_uri.to_s, attributes, env.merge(options[:headers] || {}))
   end
 
   def build_uri(path)
-    URI.parse(path).tap do |uri|
-      uri.path = request_path if path.empty? || path.start_with?('?')
-      uri.path = '/' if uri.path.empty?
-      uri.path = request_path.sub(%r{/[^/]*$}, '/') + uri.path unless uri.path.start_with?('/')
+    uri = URI.parse(path)
+    base_uri = base_relative_uri_for(uri)
 
+    uri.path = base_uri.path + uri.path unless uri.absolute? || uri.path.start_with?('/')
+
+    if base_uri.absolute?
+      base_uri.merge(uri)
+    else
       uri.scheme ||= @current_scheme
       uri.host ||= @current_host
       uri.port ||= @current_port unless uri.default_port == @current_port
+      uri
     end
   end
 
@@ -123,8 +135,39 @@ class Capybara::RackTest::Browser
     dom.title
   end
 
+  def last_request
+    raise Rack::Test::Error if @new_visit_request
+
+    super
+  end
+
+  def last_response
+    raise Rack::Test::Error if @new_visit_request
+
+    super
+  end
+
 protected
 
+  def base_href
+    find(:css, 'head > base').first&.[](:href).to_s
+  end
+
+  def base_relative_uri_for(uri)
+    base_uri = URI.parse(base_href)
+    current_uri = URI.parse(safe_last_request&.url.to_s).tap do |c|
+      c.path.sub!(%r{/[^/]*$}, '/') unless uri.path.empty?
+      c.path = '/' if c.path.empty?
+    end
+
+    if [current_uri, base_uri].any?(&:absolute?)
+      current_uri.merge(base_uri)
+    else
+      base_uri.path = current_uri.path if base_uri.path.empty?
+      base_uri
+    end
+  end
+
   def build_rack_mock_session
     reset_host! unless current_host
     Rack::MockSession.new(app, current_host)
@@ -136,9 +179,21 @@ protected
     '/'
   end
 
+  def safe_last_request
+    last_request
+  rescue Rack::Test::Error
+    nil
+  end
+
 private
 
   def fragment_or_script?(path)
     path.gsub(/^#{Regexp.escape(request_path)}/, '').start_with?('#') || path.downcase.start_with?('javascript:')
   end
+
+  def referer_url
+    build_uri(last_request.url).to_s
+  rescue Rack::Test::Error
+    ''
+  end
 end

data/lib/capybara/rack_test/driver.rb

@@ -98,10 +98,10 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     @browser = nil
   end
 
-  def get(*args, &block); browser.get(*args, &block); end
-  def post(*args, &block); browser.post(*args, &block); end
-  def put(*args, &block); browser.put(*args, &block); end
-  def delete(*args, &block); browser.delete(*args, &block); end
+  def get(...); browser.get(...); end
+  def post(...); browser.post(...); end
+  def put(...); browser.put(...); end
+  def delete(...); browser.delete(...); end
   def header(key, value); browser.header(key, value); end
 
   def invalid_element_errors

data/lib/capybara/rack_test/form.rb

@@ -16,6 +16,8 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
     def path; @empty_file.path; end
     def size; 0; end
     def read; ''; end
+    def append_to(_); end
+    def set_encoding(_); end # rubocop:disable Naming/AccessorMethodName
   end
 
   def params(button)
@@ -28,19 +30,31 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
 
     form_elements = native.xpath(form_elements_xpath).reject { |el| submitter?(el) && (el != button.native) }
 
-    form_elements.each_with_object(make_params) do |field, params|
+    form_params = form_elements.each_with_object({}.compare_by_identity) do |field, params|
       case field.name
       when 'input', 'button' then add_input_param(field, params)
       when 'select' then add_select_param(field, params)
       when 'textarea' then add_textarea_param(field, params)
       end
+    end
+
+    form_params.each_with_object(make_params) do |(name, value), params|
+      merge_param!(params, name, value)
     end.to_params_hash
+
+    # form_elements.each_with_object(make_params) do |field, params|
+    #   case field.name
+    #   when 'input', 'button' then add_input_param(field, params)
+    #   when 'select' then add_select_param(field, params)
+    #   when 'textarea' then add_textarea_param(field, params)
+    #   end
+    # end.to_params_hash
   end
 
   def submit(button)
     action = button&.[]('formaction') || native['action']
     method = button&.[]('formmethod') || request_method
-    driver.submit(method, action.to_s, params(button))
+    driver.submit(method, action.to_s, params(button), content_type: native['enctype'])
   end
 
   def multipart?
@@ -86,6 +100,8 @@ private
 
       Capybara::RackTest::Node.new(driver, field).value.to_s
     when 'file'
+      return if value.empty? && params.keys.include?(name) && Rack::Test::VERSION.to_f >= 2.0 # rubocop:disable Performance/InefficientHashSearch
+
       if multipart?
         file_to_upload(value)
       else
@@ -94,7 +110,8 @@ private
     else
       value
     end
-    merge_param!(params, name, value)
+    # merge_param!(params, name, value)
+    params[name] = value
   end
 
   def file_to_upload(filename)
@@ -107,18 +124,23 @@ private
   end
 
   def add_select_param(field, params)
+    name = field['name']
     if field.has_attribute?('multiple')
-      field.xpath('.//option[@selected]').each do |option|
-        merge_param!(params, field['name'], (option['value'] || option.text).to_s)
+      value = field.xpath('.//option[@selected]').map do |option|
+        # merge_param!(params, field['name'], (option['value'] || option.text).to_s)
+        (option['value'] || option.text).to_s
       end
+      params[name] = value unless value.empty?
     else
       option = field.xpath('.//option[@selected]').first || field.xpath('.//option').first
-      merge_param!(params, field['name'], (option['value'] || option.text).to_s) if option
+      # merge_param!(params, field['name'], (option['value'] || option.text).to_s) if option
+      params[name] = (option['value'] || option.text).to_s if option
     end
   end
 
   def add_textarea_param(field, params)
-    merge_param!(params, field['name'], field['_capybara_raw_value'].to_s.gsub(/\n/, "\r\n"))
+    # merge_param!(params, field['name'], field['_capybara_raw_value'].to_s.gsub(/\r?\n/, "\r\n"))
+    params[field['name']] = field['_capybara_raw_value'].to_s.gsub(/\r?\n/, "\r\n")
   end
 
   def submitter?(el)

data/lib/capybara/rack_test/node.rb

@@ -108,6 +108,13 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     end
   end
 
+  def readonly?
+    # readonly attribute not valid on these input types
+    return false if input_field? && %w[hidden range color checkbox radio file submit image reset button].include?(type)
+
+    super
+  end
+
   def path
     native.path
   end
@@ -139,10 +146,6 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     end
   end
 
-  def ==(other)
-    native == other.native
-  end
-
 protected
 
   # @api private
@@ -159,7 +162,7 @@ protected
       end.join || ''
       text = "\n#{text}\n" if BLOCK_ELEMENTS.include?(tag_name)
       text
-    else
+    else # rubocop:disable Lint/DuplicateBranch
       ''
     end
   end
@@ -213,7 +216,7 @@ private
     min, max, step = (native['min'] || 0).to_f, (native['max'] || 100).to_f, (native['step'] || 1).to_f
     value = value.to_f
     value = value.clamp(min, max)
-    value = ((value - min) / step).round * step + min
+    value = (((value - min) / step).round * step) + min
     native['value'] = value.clamp(min, max)
   end
 
@@ -241,7 +244,7 @@ private
   end
 
   def follow_link
-    method = self['data-method'] if driver.options[:respect_data_method]
+    method = self['data-method'] || self['data-turbo-method'] if driver.options[:respect_data_method]
     method ||= :get
     driver.follow(method, self[:href].to_s)
   end

data/lib/capybara/registration_container.rb

@@ -19,9 +19,6 @@ module Capybara
     def method_missing(method_name, *args, **options, &block)
       if @registered.respond_to?(method_name)
         Capybara::Helpers.warn "DEPRECATED: Calling '#{method_name}' on the drivers/servers container is deprecated without replacement"
-        # RUBY 2.6 will send an empty hash rather than nothing with **options so fix that
-        return @registered.public_send(method_name, *args, &block) if options.empty?
-
         return @registered.public_send(method_name, *args, **options, &block)
       end
       super

data/lib/capybara/registrations/drivers.rb

@@ -14,7 +14,7 @@ Capybara.register_driver :selenium_headless do |app|
   browser_options = ::Selenium::WebDriver::Firefox::Options.new.tap do |opts|
     opts.add_argument '-headless'
   end
-  Capybara::Selenium::Driver.new(app, **Hash[:browser => :firefox, options_key => browser_options])
+  Capybara::Selenium::Driver.new(app, **{ :browser => :firefox, options_key => browser_options })
 end
 
 Capybara.register_driver :selenium_chrome do |app|
@@ -25,7 +25,7 @@ Capybara.register_driver :selenium_chrome do |app|
     opts.add_argument('--disable-site-isolation-trials')
   end
 
-  Capybara::Selenium::Driver.new(app, **Hash[:browser => :chrome, options_key => browser_options])
+  Capybara::Selenium::Driver.new(app, **{ :browser => :chrome, options_key => browser_options })
 end
 
 Capybara.register_driver :selenium_chrome_headless do |app|
@@ -38,5 +38,5 @@ Capybara.register_driver :selenium_chrome_headless do |app|
     opts.add_argument('--disable-site-isolation-trials')
   end
 
-  Capybara::Selenium::Driver.new(app, **Hash[:browser => :chrome, options_key => browser_options])
+  Capybara::Selenium::Driver.new(app, **{ :browser => :chrome, options_key => browser_options })
 end

data/lib/capybara/registrations/servers.rb

@@ -10,7 +10,7 @@ Capybara.register_server :webrick do |app, port, host, **options|
   Rack::Handler::WEBrick.run(app, **options)
 end
 
-Capybara.register_server :puma do |app, port, host, **options|
+Capybara.register_server :puma do |app, port, host, **options| # rubocop:disable Metrics/BlockLength
   begin
     require 'rack/handler/puma'
   rescue LoadError
@@ -29,17 +29,25 @@ Capybara.register_server :puma do |app, port, host, **options|
 
   conf = Rack::Handler::Puma.config(app, options)
   conf.clamp
-  events = conf.options[:Silent] ? ::Puma::Events.strings : ::Puma::Events.stdio
 
   puma_ver = Gem::Version.new(Puma::Const::PUMA_VERSION)
   require_relative 'patches/puma_ssl' if Gem::Requirement.new('>=4.0.0', '< 4.1.0').satisfied_by?(puma_ver)
 
-  events.log 'Capybara starting Puma...'
-  events.log "* Version #{Puma::Const::PUMA_VERSION} , codename: #{Puma::Const::CODE_NAME}"
-  events.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
-
-  Puma::Server.new(conf.app, events, conf.options).tap do |s|
-    s.binder.parse conf.options[:binds], s.events
-    s.min_threads, s.max_threads = conf.options[:min_threads], conf.options[:max_threads]
+  logger = (defined?(::Puma::LogWriter) ? ::Puma::LogWriter : ::Puma::Events).then do |cls|
+    conf.options[:Silent] ? cls.strings : cls.stdio
+  end
+  conf.options[:log_writer] = logger
+
+  logger.log 'Capybara starting Puma...'
+  logger.log "* Version #{Puma::Const::PUMA_VERSION} , codename: #{Puma::Const::CODE_NAME}"
+  logger.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
+
+  Puma::Server.new(
+    conf.app,
+    defined?(::Puma::LogWriter) ? nil : logger,
+    conf.options
+  ).tap do |s|
+    s.binder.parse conf.options[:binds], (s.log_writer rescue s.events) # rubocop:disable Style/RescueModifier
+    s.min_threads, s.max_threads = conf.options[:min_threads], conf.options[:max_threads] if s.respond_to? :min_threads=
   end.run.join
 end

data/lib/capybara/rspec/matcher_proxies.rb

@@ -23,7 +23,7 @@ end
 if RUBY_ENGINE == 'jruby'
   # :nocov:
   module Capybara::DSL
-    class <<self
+    class << self
       remove_method :included
 
       def included(base)
@@ -55,7 +55,7 @@ else
     end
 
     def self.prepended(base)
-      class <<base
+      class << base
         prepend ClassMethods
       end
     end
@@ -70,7 +70,7 @@ else
     end
 
     def self.prepended(base)
-      class <<base
+      class << base
         prepend ClassMethods
       end
     end

data/lib/capybara/rspec/matchers/have_selector.rb

@@ -8,10 +8,10 @@ module Capybara
       class HaveSelector < CountableWrappedElementMatcher
         def initialize(*args, **kw_args, &filter_block)
           super
-          if (RUBY_VERSION >= '2.7') && (@args.size < 2) && @kw_args.keys.any?(String) # rubocop:disable Style/GuardClause
-            @args.push(@kw_args)
-            @kw_args = {}
-          end
+          return unless (@args.size < 2) && @kw_args.keys.any?(String)
+
+          @args.push(@kw_args)
+          @kw_args = {}
         end
 
         def element_matches?(el)
@@ -64,7 +64,7 @@ module Capybara
           el.assert_any_of_selectors(*@args, **session_query_options, &@filter_block)
         end
 
-        def does_not_match?(_actual)
+        def does_not_match?(el)
           el.assert_none_of_selectors(*@args, **session_query_options, &@filter_block)
         end
 

data/lib/capybara/rspec/matchers.rb

@@ -15,36 +15,36 @@ module Capybara
     # RSpec matcher for whether the element(s) matching a given selector exist.
     #
     # @see Capybara::Node::Matchers#assert_selector
-    def have_selector(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveSelector.new(*args, **kw_args, &optional_filter_block)
+    def have_selector(...)
+      Matchers::HaveSelector.new(...)
     end
 
     # RSpec matcher for whether the element(s) matching a group of selectors exist.
     #
     # @see Capybara::Node::Matchers#assert_all_of_selectors
-    def have_all_of_selectors(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveAllSelectors.new(*args, **kw_args, &optional_filter_block)
+    def have_all_of_selectors(...)
+      Matchers::HaveAllSelectors.new(...)
     end
 
     # RSpec matcher for whether no element(s) matching a group of selectors exist.
     #
     # @see Capybara::Node::Matchers#assert_none_of_selectors
-    def have_none_of_selectors(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveNoSelectors.new(*args, **kw_args, &optional_filter_block)
+    def have_none_of_selectors(...)
+      Matchers::HaveNoSelectors.new(...)
     end
 
     # RSpec matcher for whether the element(s) matching any of a group of selectors exist.
     #
     # @see Capybara::Node::Matchers#assert_any_of_selectors
-    def have_any_of_selectors(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveAnySelectors.new(*args, **kw_args, &optional_filter_block)
+    def have_any_of_selectors(...)
+      Matchers::HaveAnySelectors.new(...)
     end
 
     # RSpec matcher for whether the current element matches a given selector.
     #
     # @see Capybara::Node::Matchers#assert_matches_selector
-    def match_selector(*args, **kw_args, &optional_filter_block)
-      Matchers::MatchSelector.new(*args, **kw_args, &optional_filter_block)
+    def match_selector(...)
+      Matchers::MatchSelector.new(...)
     end
 
     %i[css xpath].each do |selector|
@@ -177,15 +177,15 @@ module Capybara
     # RSpec matcher for whether sibling element(s) matching a given selector exist.
     #
     # @see Capybara::Node::Matchers#assert_sibling
-    def have_sibling(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveSibling.new(*args, **kw_args, &optional_filter_block)
+    def have_sibling(...)
+      Matchers::HaveSibling.new(...)
     end
 
     # RSpec matcher for whether ancestor element(s) matching a given selector exist.
     #
     # @see Capybara::Node::Matchers#assert_ancestor
-    def have_ancestor(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveAncestor.new(*args, **kw_args, &optional_filter_block)
+    def have_ancestor(...)
+      Matchers::HaveAncestor.new(...)
     end
 
     ##

data/lib/capybara/selector/builders/css_builder.rb

@@ -76,7 +76,7 @@ module Capybara
         else
           cls = Array(classes).reject { |c| c.is_a? Regexp }.group_by { |cl| cl.match?(/^!(?!!!)/) }
           [(cls[false].to_a.map { |cl| ".#{Capybara::Selector::CSS.escape(cl.sub(/^!!/, ''))}" } +
-          cls[true].to_a.map { |cl| ":not(.#{Capybara::Selector::CSS.escape(cl.slice(1..-1))})" }).join]
+          cls[true].to_a.map { |cl| ":not(.#{Capybara::Selector::CSS.escape(cl.slice(1..))})" }).join]
         end
       end
     end

data/lib/capybara/selector/builders/xpath_builder.rb

@@ -51,7 +51,7 @@ module Capybara
         else
           Array(classes).reject { |c| c.is_a? Regexp }.map do |klass|
             if klass.match?(/^!(?!!!)/)
-              !XPath.attr(:class).contains_word(klass.slice(1..-1))
+              !XPath.attr(:class).contains_word(klass.slice(1..))
             else
               XPath.attr(:class).contains_word(klass.sub(/^!!/, ''))
             end

data/lib/capybara/selector/css.rb

@@ -43,7 +43,7 @@ module Capybara
               when '"', "'"
                 selector << parse_string(char, str)
               when '\\'
-                selector << char + str.getc
+                selector << (char + str.getc)
               when ','
                 selectors << selector.strip
                 selector.clear