capybara 3.9.0 → 3.10.0

data/lib/capybara/rspec/compound.rb

@@ -33,16 +33,15 @@ if defined?(::RSpec::Expectations::Version)
           end
         end
 
-        class And < ::RSpec::Matchers::BuiltIn::Compound::And
-        private
-
+        # @api private
+        module Synchronizer
           def match(_expected, actual)
             @evaluator = CapybaraEvaluator.new(actual)
             syncer = sync_element(actual)
             begin
               syncer.synchronize do
                 @evaluator.reset
-                raise ::Capybara::ElementNotFound unless [matcher_1_matches?, matcher_2_matches?].all?
+                raise ::Capybara::ElementNotFound unless synchronized_match?
 
                 true
               end
@@ -62,32 +61,23 @@ if defined?(::RSpec::Expectations::Version)
           end
         end
 
-        class Or < ::RSpec::Matchers::BuiltIn::Compound::Or
-        private
+        class And < ::RSpec::Matchers::BuiltIn::Compound::And
+          include Synchronizer
 
-          def match(_expected, actual)
-            @evaluator = CapybaraEvaluator.new(actual)
-            syncer = sync_element(actual)
-            begin
-              syncer.synchronize do
-                @evaluator.reset
-                raise ::Capybara::ElementNotFound unless [matcher_1_matches?, matcher_2_matches?].any?
+        private
 
-                true
-              end
-            rescue StandardError
-              false
-            end
+          def synchronized_match?
+            [matcher_1_matches?, matcher_2_matches?].all?
           end
+        end
 
-          def sync_element(el)
-            if el.respond_to? :synchronize
-              el
-            elsif el.respond_to? :current_scope
-              el.current_scope
-            else
-              Capybara.string(el)
-            end
+        class Or < ::RSpec::Matchers::BuiltIn::Compound::Or
+          include Synchronizer
+
+        private
+
+          def synchronized_match?
+            [matcher_1_matches?, matcher_2_matches?].any?
           end
         end
       end

data/lib/capybara/rspec/matcher_proxies.rb

@@ -18,13 +18,34 @@ module Capybara
       end
     end
   end
+end
+
+if RUBY_ENGINE == 'jruby'
+  module Capybara::DSL
+    class <<self
+      remove_method :included
+
+      def included(base)
+        warn 'including Capybara::DSL in the global scope is not recommended!' if base == Object
+        base.send(:include, ::Capybara::RSpecMatcherProxies) if defined?(::RSpec::Matchers) && base.include?(::RSpec::Matchers)
+        super
+      end
+    end
+  end
 
-  module DSLRSpecProxyInstaller
+  if defined?(::RSpec::Matchers)
+    module ::RSpec::Matchers
+      def self.included(base)
+        base.send(:include, ::Capybara::RSpecMatcherProxies) if base.include?(::Capybara::DSL)
+        super
+      end
+    end
+  end
+else
+  module Capybara::DSLRSpecProxyInstaller
     module ClassMethods
       def included(base)
-        if defined?(::RSpec::Matchers)
-          base.include(::Capybara::RSpecMatcherProxies) if base.include?(::RSpec::Matchers)
-        end
+        base.include(::Capybara::RSpecMatcherProxies) if defined?(::RSpec::Matchers) && base.include?(::RSpec::Matchers)
         super
       end
     end
@@ -36,7 +57,7 @@ module Capybara
     end
   end
 
-  module RSpecMatcherProxyInstaller
+  module Capybara::RSpecMatcherProxyInstaller
     module ClassMethods
       def included(base)
         base.include(::Capybara::RSpecMatcherProxies) if base.include?(::Capybara::DSL)
@@ -51,11 +72,7 @@ module Capybara
     end
   end
 
-  DSL.prepend ::Capybara::DSLRSpecProxyInstaller
-end
+  Capybara::DSL.prepend ::Capybara::DSLRSpecProxyInstaller
 
-if defined?(::RSpec::Matchers)
-  module ::RSpec::Matchers
-    prepend ::Capybara::RSpecMatcherProxyInstaller
-  end
+  ::RSpec::Matchers.prepend ::Capybara::RSpecMatcherProxyInstaller if defined?(::RSpec::Matchers)
 end

data/lib/capybara/rspec/matchers.rb

@@ -25,20 +25,6 @@ module Capybara
 
     private
 
-      def wrap_matches?(actual)
-        yield(wrap(actual))
-      rescue Capybara::ExpectationNotMet => err
-        @failure_message = err.message
-        false
-      end
-
-      def wrap_does_not_match?(actual)
-        yield(wrap(actual))
-      rescue Capybara::ExpectationNotMet => err
-        @failure_message_when_negated = err.message
-        false
-      end
-
       def session_query_args
         if @args.last.is_a? Hash
           @args.last[:session_options] = session_options
@@ -60,13 +46,29 @@ module Capybara
       end
     end
 
-    class HaveSelector < Matcher
+    class WrappedElementMatcher < Matcher
       def matches?(actual)
-        wrap_matches?(actual) { |el| el.assert_selector(*@args, &@filter_block) }
+        element_matches?(wrap(actual))
+      rescue Capybara::ExpectationNotMet => err
+        @failure_message = err.message
+        false
       end
 
       def does_not_match?(actual)
-        wrap_does_not_match?(actual) { |el| el.assert_no_selector(*@args, &@filter_block) }
+        element_does_not_match?(wrap(actual))
+      rescue Capybara::ExpectationNotMet => err
+        @failure_message_when_negated = err.message
+        false
+      end
+    end
+
+    class HaveSelector < WrappedElementMatcher
+      def element_matches?(el)
+        el.assert_selector(*@args, &@filter_block)
+      end
+
+      def element_does_not_match?(el)
+        el.assert_no_selector(*@args, &@filter_block)
       end
 
       def description
@@ -78,9 +80,9 @@ module Capybara
       end
     end
 
-    class HaveAllSelectors < Matcher
-      def matches?(actual)
-        wrap_matches?(actual) { |el| el.assert_all_of_selectors(*@args, &@filter_block) }
+    class HaveAllSelectors < WrappedElementMatcher
+      def element_matches?(el)
+        el.assert_all_of_selectors(*@args, &@filter_block)
       end
 
       def does_not_match?(_actual)
@@ -92,9 +94,9 @@ module Capybara
       end
     end
 
-    class HaveNoSelectors < Matcher
-      def matches?(actual)
-        wrap_matches?(actual) { |el| el.assert_none_of_selectors(*@args, &@filter_block) }
+    class HaveNoSelectors < WrappedElementMatcher
+      def element_matches?(el)
+        el.assert_none_of_selectors(*@args, &@filter_block)
       end
 
       def does_not_match?(_actual)
@@ -106,13 +108,27 @@ module Capybara
       end
     end
 
+    class HaveAnySelectors < WrappedElementMatcher
+      def element_matches?(el)
+        el.assert_any_of_selectors(*@args, &@filter_block)
+      end
+
+      def does_not_match?(_actual)
+        el.assert_none_of_selectors(*@args, &@filter_block)
+      end
+
+      def description
+        'have any selectors'
+      end
+    end
+
     class MatchSelector < HaveSelector
-      def matches?(actual)
-        wrap_matches?(actual) { |el| el.assert_matches_selector(*@args, &@filter_block) }
+      def element_matches?(el)
+        el.assert_matches_selector(*@args, &@filter_block)
       end
 
-      def does_not_match?(actual)
-        wrap_does_not_match?(actual) { |el| el.assert_not_matches_selector(*@args, &@filter_block) }
+      def element_does_not_match?(el)
+        el.assert_not_matches_selector(*@args, &@filter_block)
       end
 
       def description
@@ -124,13 +140,13 @@ module Capybara
       end
     end
 
-    class HaveText < Matcher
-      def matches?(actual)
-        wrap_matches?(actual) { |el| el.assert_text(*@args) }
+    class HaveText < WrappedElementMatcher
+      def element_matches?(el)
+        el.assert_text(*@args)
       end
 
-      def does_not_match?(actual)
-        wrap_does_not_match?(actual) { |el| el.assert_no_text(*@args) }
+      def element_does_not_match?(el)
+        el.assert_no_text(*@args)
       end
 
       def description
@@ -148,13 +164,13 @@ module Capybara
       end
     end
 
-    class HaveTitle < Matcher
-      def matches?(actual)
-        wrap_matches?(actual) { |el| el.assert_title(*@args) }
+    class HaveTitle < WrappedElementMatcher
+      def element_matches?(el)
+        el.assert_title(*@args)
       end
 
-      def does_not_match?(actual)
-        wrap_does_not_match?(actual) { |el| el.assert_no_title(*@args) }
+      def element_does_not_match?(el)
+        el.assert_no_title(*@args)
       end
 
       def description
@@ -168,13 +184,13 @@ module Capybara
       end
     end
 
-    class HaveCurrentPath < Matcher
-      def matches?(actual)
-        wrap_matches?(actual) { |el| el.assert_current_path(*@args) }
+    class HaveCurrentPath < WrappedElementMatcher
+      def element_matches?(el)
+        el.assert_current_path(*@args)
       end
 
-      def does_not_match?(actual)
-        wrap_does_not_match?(actual) { |el| el.assert_no_current_path(*@args) }
+      def element_does_not_match?(el)
+        el.assert_no_current_path(*@args)
       end
 
       def description
@@ -217,9 +233,9 @@ module Capybara
       end
     end
 
-    class HaveStyle < Matcher
-      def matches?(actual)
-        wrap_matches?(actual) { |el| el.assert_style(*@args) }
+    class HaveStyle < WrappedElementMatcher
+      def element_matches?(el)
+        el.assert_style(*@args)
       end
 
       def does_not_match?(_actual)
@@ -275,6 +291,12 @@ module Capybara
       HaveNoSelectors.new(*args, &optional_filter_block)
     end
 
+    # RSpec matcher for whether the element(s) matching any of a group of selectors exist
+    # See {Capybara::Node::Matcher#assert_any_of_selectors}
+    def have_any_of_selectors(*args, &optional_filter_block)
+      HaveAnySelectors.new(*args, &optional_filter_block)
+    end
+
     # RSpec matcher for whether the current element matches a given selector
     # See {Capybara::Node::Matchers#assert_matches_selector}
     def match_selector(*args, &optional_filter_block)

data/lib/capybara/selector.rb

@@ -64,7 +64,7 @@ Capybara.add_selector(:field) do
 
   describe_expression_filters do |type: nil, **options|
     desc = +''
-    (expression_filters.keys - [:type]).each { |ef| desc << " with #{ef} #{options[ef]}" if options.key?(ef) }
+    (expression_filters.keys & options.keys).each { |ef| desc << " with #{ef} #{options[ef]}" }
     desc << " of type #{type.inspect}" if type
     desc
   end
@@ -75,11 +75,10 @@ Capybara.add_selector(:field) do
 end
 
 Capybara.add_selector(:fieldset) do
-  xpath(:legend) do |locator, legend: nil, **|
+  xpath do |locator, legend: nil, **|
     locator_matchers = (XPath.attr(:id) == locator.to_s) | XPath.child(:legend)[XPath.string.n.is(locator.to_s)]
-    locator_matchers |= XPath.attr(test_id) == locator if test_id
-    xpath = XPath.descendant(:fieldset)
-    xpath = xpath[locator_matchers] unless locator.nil?
+    locator_matchers |= XPath.attr(test_id) == locator.to_s if test_id
+    xpath = XPath.descendant(:fieldset)[locator && locator_matchers]
     xpath = xpath[XPath.child(:legend)[XPath.string.n.is(legend)]] if legend
     xpath
   end
@@ -88,7 +87,7 @@ Capybara.add_selector(:fieldset) do
 end
 
 Capybara.add_selector(:link) do
-  xpath(:title, :alt) do |locator, href: true, alt: nil, title: nil, **|
+  xpath do |locator, href: true, alt: nil, title: nil, **|
     xpath = XPath.descendant(:a)
     xpath = xpath[@href_conditions = builder.attribute_conditions(href: href)]
 
@@ -192,8 +191,8 @@ end
 Capybara.add_selector(:fillable_field) do
   label 'field'
 
-  xpath(:allow_self) do |locator, **options|
-    xpath = XPath.axis(options[:allow_self] ? :"descendant-or-self" : :descendant, :input, :textarea)[
+  xpath do |locator, allow_self: nil, **options|
+    xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input, :textarea)[
       !XPath.attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')
     ]
     locate_field(xpath, locator, options)
@@ -223,8 +222,8 @@ end
 Capybara.add_selector(:radio_button) do
   label 'radio button'
 
-  xpath(:allow_self) do |locator, **options|
-    xpath = XPath.axis(options[:allow_self] ? :"descendant-or-self" : :descendant, :input)[
+  xpath do |locator, allow_self: nil, **options|
+    xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input)[
       XPath.attr(:type) == 'radio'
     ]
     locate_field(xpath, locator, options)
@@ -241,8 +240,8 @@ Capybara.add_selector(:radio_button) do
 end
 
 Capybara.add_selector(:checkbox) do
-  xpath(:allow_self) do |locator, **options|
-    xpath = XPath.axis(options[:allow_self] ? :"descendant-or-self" : :descendant, :input)[
+  xpath do |locator, allow_self: nil, **options|
+    xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input)[
       XPath.attr(:type) == 'checkbox'
     ]
     locate_field(xpath, locator, options)
@@ -379,8 +378,8 @@ end
 
 Capybara.add_selector(:file_field) do
   label 'file field'
-  xpath(:allow_self) do |locator, **options|
-    xpath = XPath.axis(options[:allow_self] ? :"descendant-or-self" : :descendant, :input)[
+  xpath do |locator, allow_self: nil, **options|
+    xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input)[
       XPath.attr(:type) == 'file'
     ]
     locate_field(xpath, locator, options)
@@ -411,14 +410,13 @@ Capybara.add_selector(:label) do
   end
 
   node_filter(:for) do |node, field_or_value|
-    if field_or_value.is_a? Capybara::Node::Element
-      if node[:for]
-        field_or_value[:id] == node[:for]
-      else
-        field_or_value.find_xpath('./ancestor::label[1]').include? node.base
-      end
+    # Non element values were handled through the expression filter
+    next true unless field_or_value.is_a? Capybara::Node::Element
+
+    if (for_val = node[:for])
+      field_or_value[:id] == for_val
     else
-      true # Non element values were handled through the expression filter
+      field_or_value.find_xpath('./ancestor::label[1]').include? node.base
     end
   end
 
@@ -431,7 +429,7 @@ Capybara.add_selector(:label) do
 end
 
 Capybara.add_selector(:table) do
-  xpath(:caption) do |locator, caption: nil, **|
+  xpath do |locator, caption: nil, **|
     xpath = XPath.descendant(:table)
     unless locator.nil?
       locator_matchers = (XPath.attr(:id) == locator.to_s) | XPath.descendant(:caption).is(locator.to_s)
@@ -448,15 +446,14 @@ Capybara.add_selector(:table) do
 end
 
 Capybara.add_selector(:frame) do
-  xpath(:name) do |locator, **options|
+  xpath do |locator, name: nil, **|
     xpath = XPath.descendant(:iframe).union(XPath.descendant(:frame))
     unless locator.nil?
       locator_matchers = (XPath.attr(:id) == locator.to_s) | (XPath.attr(:name) == locator.to_s)
       locator_matchers |= XPath.attr(test_id) == locator if test_id
       xpath = xpath[locator_matchers]
     end
-    xpath = expression_filters.keys.inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
-    xpath
+    xpath[find_by_attr(:name, name)]
   end
 
   describe_expression_filters do |name: nil, **|

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

@@ -35,11 +35,10 @@ module Capybara
           when XPath::Expression
             raise ArgumentError, 'XPath expressions are not supported for the :class filter with CSS based selectors'
           when Regexp
-            strs = Selector::RegexpDisassembler.new(classes).substrings
-            strs.map { |str| "[class*='#{str}'#{' i' if classes.casefold?}]" }.join
+            attribute_conditions(class: classes)
           else
-            cls = Array(classes).group_by { |cl| cl.start_with? '!' }
-            (cls[false].to_a.map { |cl| ".#{Capybara::Selector::CSS.escape(cl)}" } +
+            cls = Array(classes).group_by { |cl| cl.start_with?('!') && !cl.start_with?('!!!') }
+            (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
           end
         end