capybara 2.10.2 → 2.11.0

data/lib/capybara/node/document.rb

@@ -24,6 +24,10 @@ module Capybara
         find(:xpath, '/html').text(type)
       end
 
+      ##
+      #
+      # @return [String]    The title of the document
+      #
       def title
         session.driver.title
       end

data/lib/capybara/node/document_matchers.rb

@@ -15,13 +15,7 @@ module Capybara
       # @return [true]
       #
       def assert_title(title, options = {})
-        query = Capybara::Queries::TitleQuery.new(title, options)
-        synchronize(query.wait) do
-          unless query.resolves_for?(self)
-            raise Capybara::ExpectationNotMet, query.failure_message
-          end
-        end
-        return true
+        _verify_title(title,options) { |query| raise Capybara::ExpectationNotMet, query.failure_message unless query.resolves_for?(self) }
       end
 
       ##
@@ -32,13 +26,7 @@ module Capybara
       # @return [true]
       #
       def assert_no_title(title, options = {})
-        query = Capybara::Queries::TitleQuery.new(title, options)
-        synchronize(query.wait) do
-          if query.resolves_for?(self)
-            raise Capybara::ExpectationNotMet, query.negative_failure_message
-          end
-        end
-        return true
+        _verify_title(title,options) { |query| raise Capybara::ExpectationNotMet, query.negative_failure_message if query.resolves_for?(self) }
       end
 
       ##
@@ -64,6 +52,17 @@ module Capybara
       rescue Capybara::ExpectationNotMet
         return false
       end
+
+      private
+
+      def _verify_title(title, options)
+        query = Capybara::Queries::TitleQuery.new(title, options)
+        synchronize(query.wait) do
+          yield(query)
+        end
+        return true
+      end
+
     end
   end
 end

data/lib/capybara/node/element.rb

@@ -27,6 +27,7 @@ module Capybara
         super(session, base)
         @query_scope = query_scope
         @query = query
+        @allow_reload = false
       end
 
       def allow_reload!
@@ -92,6 +93,7 @@ module Capybara
       # @param [String] value    The new value
       # @param [Hash{}] options  Driver specific options for how to set the value
       #
+      # @return [Capybara::Node::Element]  The element
       def set(value, options={})
         options ||= {}
 
@@ -108,47 +110,58 @@ module Capybara
             base.set(value)
           end
         end
+        return self
       end
 
       ##
       #
       # Select this node if is an option element inside a select tag
       #
+      # @return [Capybara::Node::Element]  The element
       def select_option
         warn "Attempt to select disabled option: #{value || text}" if disabled?
         synchronize { base.select_option }
+        return self
       end
 
       ##
       #
       # Unselect this node if is an option element inside a multiple select tag
       #
+      # @return [Capybara::Node::Element]  The element
       def unselect_option
         synchronize { base.unselect_option }
+        return self
       end
 
       ##
       #
       # Click the Element
       #
+      # @return [Capybara::Node::Element]  The element
       def click
         synchronize { base.click }
+        return self
       end
 
       ##
       #
       # Right Click the Element
       #
+      # @return [Capybara::Node::Element]  The element
       def right_click
         synchronize { base.right_click }
+        return self
       end
 
       ##
       #
       # Double Click the Element
       #
+      # @return [Capybara::Node::Element]  The element
       def double_click
         synchronize { base.double_click }
+        return self
       end
 
       ##
@@ -221,16 +234,20 @@ module Capybara
       # :meta
       # :command      - alias of :meta
       #
+      # @return [Capybara::Node::Element]  The element
       def send_keys(*args)
         synchronize { base.send_keys(*args) }
+        return self
       end
 
       ##
       #
       # Hover on the Element
       #
+      # @return [Capybara::Node::Element]  The element
       def hover
         synchronize { base.hover }
+        return self
       end
 
       ##
@@ -319,8 +336,10 @@ module Capybara
       #
       # @param [String] event       The name of the event to trigger
       #
+      # @return [Capybara::Node::Element]  The element
       def trigger(event)
         synchronize { base.trigger(event) }
+        return self
       end
 
       ##
@@ -333,8 +352,10 @@ module Capybara
       #
       # @param [Capybara::Node::Element] node     The element to drag to
       #
+      # @return [Capybara::Node::Element]  The element
       def drag_to(node)
         synchronize { base.drag_to(node.base) }
+        return self
       end
 
       def reload

data/lib/capybara/node/finders.rb

@@ -18,7 +18,7 @@ module Capybara
       # +find+ takes the same options as +all+.
       #
       #     page.find('#foo').find('.bar')
-      #     page.find(:xpath, '//div[contains(., "bar")]')
+      #     page.find(:xpath, './/div[contains(., "bar")]')
       #     page.find('li', text: 'Quox').click_link('Delete')
       #
       # @param (see Capybara::Node::Finders#all)
@@ -155,7 +155,7 @@ module Capybara
       # following statements are equivalent:
       #
       #     page.all(:css, 'a#person_123')
-      #     page.all(:xpath, '//a[@id="person_123"]')
+      #     page.all(:xpath, './/a[@id="person_123"]')
       #
       #
       # If the type of selector is left out, Capybara uses
@@ -164,7 +164,7 @@ module Capybara
       #     page.all("a#person_123")
       #
       #     Capybara.default_selector = :xpath
-      #     page.all('//a[@id="person_123"]')
+      #     page.all('.//a[@id="person_123"]')
       #
       # The set of found elements can further be restricted by specifying
       # options. It's possible to select elements by their text or visibility:

data/lib/capybara/node/matchers.rb

@@ -90,14 +90,11 @@ module Capybara
       # @raise [Capybara::ExpectationNotMet]      If the selector does not exist
       #
       def assert_selector(*args, &optional_filter_block)
-        query = Capybara::Queries::SelectorQuery.new(*args, &optional_filter_block)
-        synchronize(query.wait) do
-          result = query.resolve_for(self)
+        _verify_selector_result(args, optional_filter_block) do |result, query|
           unless result.matches_count? && ((!result.empty?) || query.expects_none?)
             raise Capybara::ExpectationNotMet, result.failure_message
           end
         end
-        return true
       end
 
       ##
@@ -117,14 +114,11 @@ module Capybara
       # @raise [Capybara::ExpectationNotMet]      If the selector exists
       #
       def assert_no_selector(*args, &optional_filter_block)
-        query = Capybara::Queries::SelectorQuery.new(*args, &optional_filter_block)
-        synchronize(query.wait) do
-          result = query.resolve_for(self)
+        _verify_selector_result(args, optional_filter_block) do |result, query|
           if result.matches_count? && ((!result.empty?) || query.expects_none?)
             raise Capybara::ExpectationNotMet, result.negative_failure_message
           end
         end
-        return true
       end
       alias_method :refute_selector, :assert_no_selector
 
@@ -333,7 +327,7 @@ module Capybara
       #
       def has_no_checked_field?(locator=nil, options={}, &optional_filter_block)
         locator, options = nil, locator if locator.is_a? Hash
-        has_no_selector?(:field, locator, options.merge(checked: true))
+        has_no_selector?(:field, locator, options.merge(checked: true), &optional_filter_block)
       end
 
       ##
@@ -455,25 +449,15 @@ module Capybara
       # @raise [Capybara::ExpectationNotMet]      If the selector does not match
       #
       def assert_matches_selector(*args, &optional_filter_block)
-        query = Capybara::Queries::MatchQuery.new(*args, &optional_filter_block)
-        synchronize(query.wait) do
-          result = query.resolve_for(self.query_scope)
-          unless result.include? self
-            raise Capybara::ExpectationNotMet, "Item does not match the provided selector"
-          end
+        _verify_match_result(args, optional_filter_block) do |result|
+          raise Capybara::ExpectationNotMet, "Item does not match the provided selector" unless result.include? self
         end
-        return true
       end
 
       def assert_not_matches_selector(*args, &optional_filter_block)
-        query = Capybara::Queries::MatchQuery.new(*args, &optional_filter_block)
-        synchronize(query.wait) do
-          result = query.resolve_for(self.query_scope)
-          if result.include? self
-            raise Capybara::ExpectationNotMet, 'Item matched the provided selector'
-          end
+        _verify_match_result(args, optional_filter_block) do |result|
+          raise Capybara::ExpectationNotMet, 'Item matched the provided selector' if result.include? self
         end
-        return true
       end
       alias_method :refute_matches_selector, :assert_not_matches_selector
 
@@ -573,14 +557,11 @@ module Capybara
       # @return [true]
       #
       def assert_text(*args)
-        query = Capybara::Queries::TextQuery.new(*args)
-        synchronize(query.wait) do
-          count = query.resolve_for(self)
+        _verify_text(args) do |count, query|
           unless query.matches_count?(count) && ((count > 0) || query.expects_none?)
             raise Capybara::ExpectationNotMet, query.failure_message
           end
         end
-        return true
       end
 
       ##
@@ -592,14 +573,11 @@ module Capybara
       # @return [true]
       #
       def assert_no_text(*args)
-        query = Capybara::Queries::TextQuery.new(*args)
-        synchronize(query.wait) do
-          count = query.resolve_for(self)
+        _verify_text(args) do |count, query|
           if query.matches_count?(count) && ((count > 0) || query.expects_none?)
             raise Capybara::ExpectationNotMet, query.negative_failure_message
           end
         end
-        return true
       end
 
       ##
@@ -645,6 +623,35 @@ module Capybara
         self.eql?(other) || (other.respond_to?(:base) && base == other.base)
       end
 
+    private
+
+      def _verify_selector_result(query_args, optional_filter_block, &result_block)
+        query = Capybara::Queries::SelectorQuery.new(*query_args, &optional_filter_block)
+        synchronize(query.wait) do
+          result = query.resolve_for(self)
+          result_block.call(result, query)
+        end
+        return true
+      end
+
+      def _verify_match_result(query_args, optional_filter_block, &result_block)
+        query = Capybara::Queries::MatchQuery.new(*query_args, &optional_filter_block)
+        synchronize(query.wait) do
+          result = query.resolve_for(self.query_scope)
+          result_block.call(result)
+        end
+        return true
+      end
+
+      def _verify_text(query_args)
+        query = Capybara::Queries::TextQuery.new(*query_args)
+        synchronize(query.wait) do
+          count = query.resolve_for(self)
+          yield(count, query)
+        end
+        return true
+      end
+
     end
   end
 end

data/lib/capybara/node/simple.rb

@@ -148,6 +148,9 @@ module Capybara
         # no op
       end
 
+      ##
+      #
+      # @return [String]     The title of the document
       def title
         if native.respond_to? :title
           native.title

data/lib/capybara/queries/selector_query.rb

@@ -53,7 +53,9 @@ module Capybara
       def matches_filters?(node)
         if options[:text]
           regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text].to_s)
-          return false if not node.text(visible).match(regexp)
+          text_visible = visible
+          text_visible = :all if text_visible == :hidden
+          return false if not node.text(text_visible).match(regexp)
         end
 
         case visible
@@ -71,7 +73,7 @@ module Capybara
           end
         end
 
-        res &&= @filter_block.call(node) unless @filter_block.nil?
+        res &&= Capybara.using_wait_time(0){ @filter_block.call(node)} unless @filter_block.nil?
         res
       end
 

data/lib/capybara/rack_test/node.rb

@@ -152,7 +152,7 @@ private
     end
   end
 
-  def set_radio(value)
+  def set_radio(_value)
     other_radios_xpath = XPath.generate { |x| x.anywhere(:input)[x.attr(:name).equals(self[:name])] }.to_s
     driver.dom.xpath(other_radios_xpath).each { |node| node.remove_attribute("checked") }
     native['checked'] = 'checked'

data/lib/capybara/result.rb

@@ -40,6 +40,8 @@ module Capybara
     alias :index :find_index
 
     def each(&block)
+      return enum_for(:each) unless block_given?
+
       @result_cache.each(&block)
       loop do
         next_result = @results_enum.next
@@ -137,7 +139,7 @@ module Capybara
 
     def lazy_select_elements(&block)
       if @elements.respond_to? :lazy  #Ruby 2.0+
-        @elements.lazy.select &block
+        @elements.lazy.select(&block)
       else
         Enumerator.new do |yielder|
           @elements.each do |val|

data/lib/capybara/rspec/matchers.rb

@@ -4,6 +4,8 @@ module Capybara
     class Matcher
       include ::RSpec::Matchers::Composable if defined?(::RSpec::Expectations::Version) && (Gem::Version.new(RSpec::Expectations::Version::STRING) >= Gem::Version.new('3.0'))
 
+      attr_reader :failure_message, :failure_message_when_negated
+
       def wrap(actual)
         if actual.respond_to?("has_selector?")
           actual
@@ -11,10 +13,29 @@ module Capybara
           Capybara.string(actual.to_s)
         end
       end
+
+      # RSpec 2 compatibility:
+      def failure_message_for_should; failure_message end
+      def failure_message_for_should_not; failure_message_when_negated end
+
+      private
+
+      def wrap_matches?(actual)
+        yield(wrap(actual))
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message = e.message
+        return false
+      end
+
+      def wrap_does_not_match?(actual)
+        yield(wrap(actual))
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message_when_negated = e.message
+        return false
+      end
     end
 
     class HaveSelector < Matcher
-      attr_reader :failure_message, :failure_message_when_negated
 
       def initialize(*args, &filter_block)
         @args = args
@@ -22,17 +43,11 @@ module Capybara
       end
 
       def matches?(actual)
-        wrap(actual).assert_selector(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message = e.message
-        return false
+        wrap_matches?(actual){ |el| el.assert_selector(*@args, &@filter_block) }
       end
 
       def does_not_match?(actual)
-        wrap(actual).assert_no_selector(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message_when_negated = e.message
-        return false
+        wrap_does_not_match?(actual){ |el| el.assert_no_selector(*@args, &@filter_block) }
       end
 
       def description
@@ -42,17 +57,29 @@ module Capybara
       def query
         @query ||= Capybara::Queries::SelectorQuery.new(*@args, &@filter_block)
       end
+    end
 
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
+    class MatchSelector < HaveSelector
+      def matches?(actual)
+        wrap_matches?(actual) { |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) }
+      end
+
+      def description
+        "match #{query.description}"
+      end
+
+      def query
+        @query ||= Capybara::Queries::MatchQuery.new(*@args)
+      end
     end
 
     class HaveText < Matcher
       attr_reader :type, :content, :options
 
-      attr_reader :failure_message, :failure_message_when_negated
-
       def initialize(*args)
         @args = args.dup
 
@@ -63,17 +90,11 @@ module Capybara
       end
 
       def matches?(actual)
-        wrap(actual).assert_text(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message = e.message
-        return false
+        wrap_matches?(actual) { |el| el.assert_text(*@args) }
       end
 
       def does_not_match?(actual)
-        wrap(actual).assert_no_text(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message_when_negated = e.message
-        return false
+        wrap_does_not_match?(actual) { |el| el.assert_no_text(*@args) }
       end
 
       def description
@@ -84,17 +105,11 @@ module Capybara
         content = Capybara::Helpers.normalize_whitespace(content) unless content.is_a? Regexp
         content.inspect
       end
-
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
     end
 
     class HaveTitle < Matcher
       attr_reader :title
 
-      attr_reader :failure_message, :failure_message_when_negated
-
       def initialize(*args)
         @args = args
 
@@ -103,33 +118,21 @@ module Capybara
       end
 
       def matches?(actual)
-        wrap(actual).assert_title(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message = e.message
-        return false
+        wrap_matches?(actual) { |el| el.assert_title(*@args) }
       end
 
       def does_not_match?(actual)
-        wrap(actual).assert_no_title(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message_when_negated = e.message
-        return false
+        wrap_does_not_match?(actual) { |el| el.assert_no_title(*@args) }
       end
 
       def description
         "have title #{title.inspect}"
       end
-
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
     end
 
     class HaveCurrentPath < Matcher
       attr_reader :current_path
 
-      attr_reader :failure_message, :failure_message_when_negated
-
       def initialize(*args)
         @args = args
 
@@ -138,26 +141,16 @@ module Capybara
       end
 
       def matches?(actual)
-        wrap(actual).assert_current_path(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message = e.message
-        return false
+        wrap_matches?(actual) { |el| el.assert_current_path(*@args) }
       end
 
       def does_not_match?(actual)
-        wrap(actual).assert_no_current_path(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message_when_negated = e.message
-        return false
+        wrap_does_not_match?(actual) { |el| el.assert_no_current_path(*@args) }
       end
 
       def description
         "have current path #{current_path.inspect}"
       end
-
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
     end
 
     class BecomeClosed
@@ -188,46 +181,12 @@ module Capybara
       alias_method :failure_message_for_should_not, :failure_message_when_negated
     end
 
-    class MatchSelector < Matcher
-      attr_reader :failure_message, :failure_message_when_negated
-
-      def initialize(*args)
-        @args = args
-      end
-
-      def matches?(actual)
-        actual.assert_matches_selector(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message = e.message
-        return false
-      end
-
-      def does_not_match?(actual)
-        actual.assert_not_matches_selector(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message_when_negated = e.message
-        return false
-      end
-
-      def description
-        "match #{query.description}"
-      end
-
-      def query
-        @query ||= Capybara::Queries::MatchQuery.new(*@args)
-      end
-
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
-    end
-
     def have_selector(*args, &optional_filter_block)
       HaveSelector.new(*args, &optional_filter_block)
     end
 
-    def match_selector(*args)
-      MatchSelector.new(*args)
+    def match_selector(*args, &optional_filter_block)
+      MatchSelector.new(*args, &optional_filter_block)
     end
     # defined_negated_matcher was added in RSpec 3.1 - it's syntactic sugar only since a user can do
     # expect(page).not_to match_selector, so not sure we really need to support not_match_selector for prior to RSpec 3.1
@@ -238,16 +197,16 @@ module Capybara
       HaveSelector.new(:xpath, xpath, options, &optional_filter_block)
     end
 
-    def match_xpath(xpath, options={})
-      MatchSelector.new(:xpath, xpath, options)
+    def match_xpath(xpath, options={}, &optional_filter_block)
+      MatchSelector.new(:xpath, xpath, options, &optional_filter_block)
     end
 
     def have_css(css, options={}, &optional_filter_block)
       HaveSelector.new(:css, css, options, &optional_filter_block)
     end
 
-    def match_css(css, options={})
-      MatchSelector.new(:css, css, options)
+    def match_css(css, options={}, &optional_filter_block)
+      MatchSelector.new(:css, css, options, &optional_filter_block)
     end
 
     def have_text(*args)
@@ -307,6 +266,5 @@ module Capybara
     def become_closed(options = {})
       BecomeClosed.new(options)
     end
-
   end
 end