capybara 2.6.0 → 2.7.0

data/lib/capybara/node/matchers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   module Node
     module Matchers
@@ -55,6 +56,36 @@ module Capybara
         return false
       end
 
+      ##
+      #
+      # Checks if the current node matches given selector
+      # Usage is identical to Capybara::Node::Matchers#has_selector?
+      #
+      # @param (see Capybara::Node::Finders#has_selector?)
+      # @return [Boolean]
+      #
+      def matches_selector?(*args)
+        assert_matches_selector(*args)
+      rescue Capybara::ExpectationNotMet
+        return false
+      end
+
+
+      ##
+      #
+      # Checks if the current node does not match given selector
+      # Usage is identical to Capybara::Node::Matchers#has_selector?
+      #
+      # @param (see Capybara::Node::Finders#has_selector?)
+      # @return [Boolean]
+      #
+      def not_matches_selector?(*args)
+        assert_not_matches_selector(*args)
+      rescue Capybara::ExpectationNotMet
+        return false
+      end
+
+
       ##
       #
       # Asserts that a given selector is on the page or current node.
@@ -89,7 +120,7 @@ module Capybara
       # @raise [Capybara::ExpectationNotMet]      If the selector does not exist
       #
       def assert_selector(*args)
-        query = Capybara::Query.new(*args)
+        query = Capybara::Queries::SelectorQuery.new(*args)
         synchronize(query.wait) do
           result = query.resolve_for(self)
           matches_count = Capybara::Helpers.matches_count?(result.size, query.options)
@@ -117,7 +148,7 @@ module Capybara
       # @raise [Capybara::ExpectationNotMet]      If the selector exists
       #
       def assert_no_selector(*args)
-        query = Capybara::Query.new(*args)
+        query = Capybara::Queries::SelectorQuery.new(*args)
         synchronize(query.wait) do
           result = query.resolve_for(self)
           matches_count = Capybara::Helpers.matches_count?(result.size, query.options)
@@ -129,6 +160,45 @@ module Capybara
       end
       alias_method :refute_selector, :assert_no_selector
 
+      ##
+      #
+      # Asserts that the current_node matches a given selector
+      #
+      #     node.assert_matches_selector('p#foo')
+      #     node.assert_matches_selector(:xpath, '//p[@id="foo"]')
+      #     node.assert_matches_selector(:foo)
+      #
+      # It also accepts all options that {Capybara::Node::Finders#all} accepts,
+      # such as :text and :visible.
+      #
+      #     node.assert_matches_selector('li', :text => 'Horse', :visible => true)
+      #
+      # @param (see Capybara::Node::Finders#all)
+      # @raise [Capybara::ExpectationNotMet]      If the selector does not match
+      #
+      def assert_matches_selector(*args)
+        query = Capybara::Queries::MatchQuery.new(*args)
+        synchronize(query.wait) do
+          result = query.resolve_for(self.parent)
+          unless result.include? self
+            raise Capybara::ExpectationNotMet, "Item does not match the provided selector"
+          end
+        end
+        return true
+      end
+
+      def assert_not_matches_selector(*args)
+        query = Capybara::Queries::MatchQuery.new(*args)
+        synchronize(query.wait) do
+          result = query.resolve_for(self.parent)
+          if result.include? self
+            raise Capybara::ExpectationNotMet, 'Item matched the provided selector'
+          end
+        end
+        return true
+      end
+      alias_method :refute_matches_selector, :assert_not_matches_selector
+
       ##
       #
       # Checks if a given XPath expression is on the page or current node.

data/lib/capybara/node/simple.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   module Node
 
@@ -99,6 +100,8 @@ module Capybara
       # @return [Boolean]     Whether the element is visible
       #
       def visible?(check_ancestors = true)
+        return false if (tag_name == 'input') && (native[:type]=="hidden")
+
         if check_ancestors
           #check size because oldest supported nokogiri doesnt support xpath boolean() function
           native.xpath("./ancestor-or-self::*[contains(@style, 'display:none') or contains(@style, 'display: none') or @hidden or name()='script' or name()='head']").size() == 0
@@ -115,7 +118,7 @@ module Capybara
       # @return [Boolean]     Whether the element is checked
       #
       def checked?
-        native[:checked]
+        native.has_attribute?('checked')
       end
 
       ##
@@ -124,7 +127,7 @@ module Capybara
       #
       # @return [Boolean]     Whether the element is disabled
       def disabled?
-        native[:disabled]
+        native.has_attribute?('disabled')
       end
 
       ##
@@ -134,7 +137,7 @@ module Capybara
       # @return [Boolean]     Whether the element is selected
       #
       def selected?
-        native[:selected]
+        native.has_attribute?('selected')
       end
 
       def synchronize(seconds=nil)

data/lib/capybara/queries/base_query.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   # @api private
   module Queries

data/lib/capybara/queries/current_path_query.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+require 'addressable/uri'
+
 module Capybara
   # @api private
   module Queries
@@ -15,16 +18,16 @@ module Capybara
           session.current_url
         else
           if options[:only_path]
-            Addressable::URI.parse(session.current_url).path
+            ::Addressable::URI.parse(session.current_url).path
           else
-            Addressable::URI.parse(session.current_url).request_uri
+            ::Addressable::URI.parse(session.current_url).request_uri
           end
         end
 
         if @expected_path.is_a? Regexp
           @actual_path.match(@expected_path)
         else
-          Addressable::URI.parse(@expected_path) == Addressable::URI.parse(@actual_path)
+          ::Addressable::URI.parse(@expected_path) == Addressable::URI.parse(@actual_path)
         end
       end
 

data/lib/capybara/queries/match_query.rb

@@ -0,0 +1,21 @@
+module Capybara
+  module Queries
+    class MatchQuery < Capybara::Queries::SelectorQuery
+      VALID_KEYS = [:text, :visible, :exact, :wait]
+
+      def visible
+        if options.has_key?(:visible)
+          super
+        else
+          :all
+        end
+      end
+
+      private
+
+      def valid_keys
+        VALID_KEYS + @selector.custom_filters.keys
+      end
+    end
+  end
+end

data/lib/capybara/queries/selector_query.rb

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+module Capybara
+  module Queries
+    class SelectorQuery < Queries::BaseQuery
+      attr_accessor :selector, :locator, :options, :expression, :find, :negative
+
+      VALID_KEYS = [:text, :visible, :between, :count, :maximum, :minimum, :exact, :match, :wait]
+      VALID_MATCH = [:first, :smart, :prefer_exact, :one]
+
+      def initialize(*args)
+        @options = if args.last.is_a?(Hash) then args.pop.dup else {} end
+
+        if args[0].is_a?(Symbol)
+          @selector = Selector.all[args.shift]
+          @locator = args.shift
+        else
+          @selector = Selector.all.values.find { |s| s.match?(args[0]) }
+          @locator = args.shift
+        end
+        @selector ||= Selector.all[Capybara.default_selector]
+
+        warn "Unused parameters passed to #{self.class.name} : #{args.to_s}" unless args.empty?
+
+        # for compatibility with Capybara 2.0
+        if Capybara.exact_options and @selector == Selector.all[:option]
+          @options[:exact] = true
+        end
+
+        @expression = @selector.call(@locator)
+        assert_valid_keys
+      end
+
+      def name; selector.name; end
+      def label; selector.label or selector.name; end
+
+      def description
+        @description = String.new("#{label} #{locator.inspect}")
+        @description << " with text #{options[:text].inspect}" if options[:text]
+        @description << selector.description(options)
+        @description
+      end
+
+      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)
+        end
+        case visible
+          when :visible then return false unless node.visible?
+          when :hidden then return false if node.visible?
+        end
+        selector.custom_filters.each do |name, filter|
+          if options.has_key?(name)
+            return false unless filter.matches?(node, options[name])
+          elsif filter.default?
+            return false unless filter.matches?(node, filter.default)
+          end
+        end
+      end
+
+      def visible
+        if options.has_key?(:visible)
+          case @options[:visible]
+            when true then :visible
+            when false then :all
+            else @options[:visible]
+          end
+        else
+          if Capybara.ignore_hidden_elements
+            :visible
+          else
+            :all
+          end
+        end
+      end
+
+      def exact?
+        if options.has_key?(:exact)
+          @options[:exact]
+        else
+          Capybara.exact
+        end
+      end
+
+      def match
+        if options.has_key?(:match)
+          @options[:match]
+        else
+          Capybara.match
+        end
+      end
+
+      def xpath(exact=nil)
+        exact = self.exact? if exact == nil
+        if @expression.respond_to?(:to_xpath) and exact
+          @expression.to_xpath(:exact)
+        else
+          @expression.to_s
+        end
+      end
+
+      def css
+        @expression
+      end
+
+      # @api private
+      def resolve_for(node, exact = nil)
+        node.synchronize do
+          children = if selector.format == :css
+            node.find_css(self.css)
+          else
+            node.find_xpath(self.xpath(exact))
+          end.map do |child|
+            if node.is_a?(Capybara::Node::Base)
+              Capybara::Node::Element.new(node.session, child, node, self)
+            else
+              Capybara::Node::Simple.new(child)
+            end
+          end
+          Capybara::Result.new(children, self)
+        end
+      end
+
+      private
+
+      def valid_keys
+        COUNT_KEYS + [:text, :visible, :exact, :match, :wait] + @selector.custom_filters.keys
+      end
+
+      def assert_valid_keys
+        super
+        unless VALID_MATCH.include?(match)
+          raise ArgumentError, "invalid option #{match.inspect} for :match, should be one of #{VALID_MATCH.map(&:inspect).join(", ")}"
+        end
+      end
+    end
+  end
+end

data/lib/capybara/queries/text_query.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   # @api private
   module Queries

data/lib/capybara/queries/title_query.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   # @api private
   module Queries

data/lib/capybara/query.rb

@@ -1,135 +1,7 @@
+# frozen_string_literal: true
+require 'capybara/queries/selector_query'
 module Capybara
   # @deprecated This class and its methods are not supposed to be used by users of Capybara's public API.
   #   It may be removed in future versions of Capybara.
-  class Query < Queries::BaseQuery
-    attr_accessor :selector, :locator, :options, :expression, :find, :negative
-
-    VALID_KEYS = [:text, :visible, :between, :count, :maximum, :minimum, :exact, :match, :wait]
-    VALID_MATCH = [:first, :smart, :prefer_exact, :one]
-
-    def initialize(*args)
-      @options = if args.last.is_a?(Hash) then args.pop.dup else {} end
-
-      if args[0].is_a?(Symbol)
-        @selector = Selector.all[args[0]]
-        @locator = args[1]
-      else
-        @selector = Selector.all.values.find { |s| s.match?(args[0]) }
-        @locator = args[0]
-      end
-      @selector ||= Selector.all[Capybara.default_selector]
-
-      # for compatibility with Capybara 2.0
-      if Capybara.exact_options and @selector == Selector.all[:option]
-        @options[:exact] = true
-      end
-
-      @expression = @selector.call(@locator)
-      assert_valid_keys
-    end
-
-    def name; selector.name; end
-    def label; selector.label or selector.name; end
-
-    def description
-      @description = "#{label} #{locator.inspect}"
-      @description << " with text #{options[:text].inspect}" if options[:text]
-      @description << selector.description(options)
-      @description
-    end
-
-    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)
-      end
-      case visible
-        when :visible then return false unless node.visible?
-        when :hidden then return false if node.visible?
-      end
-      selector.custom_filters.each do |name, filter|
-        if options.has_key?(name)
-          return false unless filter.matches?(node, options[name])
-        elsif filter.default?
-          return false unless filter.matches?(node, filter.default)
-        end
-      end
-    end
-
-    def visible
-      if options.has_key?(:visible)
-        case @options[:visible]
-          when true then :visible
-          when false then :all
-          else @options[:visible]
-        end
-      else
-        if Capybara.ignore_hidden_elements
-          :visible
-        else
-          :all
-        end
-      end
-    end
-
-    def exact?
-      if options.has_key?(:exact)
-        @options[:exact]
-      else
-        Capybara.exact
-      end
-    end
-
-    def match
-      if options.has_key?(:match)
-        @options[:match]
-      else
-        Capybara.match
-      end
-    end
-
-    def xpath(exact=nil)
-      exact = self.exact? if exact == nil
-      if @expression.respond_to?(:to_xpath) and exact
-        @expression.to_xpath(:exact)
-      else
-        @expression.to_s
-      end
-    end
-
-    def css
-      @expression
-    end
-
-    # @api private
-    def resolve_for(node, exact = nil)
-      node.synchronize do
-        children = if selector.format == :css
-          node.find_css(self.css)
-        else
-          node.find_xpath(self.xpath(exact))
-        end.map do |child|
-          if node.is_a?(Capybara::Node::Base)
-            Capybara::Node::Element.new(node.session, child, node, self)
-          else
-            Capybara::Node::Simple.new(child)
-          end
-        end
-        Capybara::Result.new(children, self)
-      end
-    end
-
-    private
-
-    def valid_keys
-      COUNT_KEYS + [:text, :visible, :exact, :match, :wait] + @selector.custom_filters.keys
-    end
-
-    def assert_valid_keys
-      super
-      unless VALID_MATCH.include?(match)
-        raise ArgumentError, "invalid option #{match.inspect} for :match, should be one of #{VALID_MATCH.map(&:inspect).join(", ")}"
-      end
-    end
-  end
+  Query = Queries::SelectorQuery
 end

data/lib/capybara/rack_test/browser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Capybara::RackTest::Browser
   include ::Rack::Test::Methods
 

data/lib/capybara/rack_test/css_handlers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Capybara::RackTest::CSSHandlers < BasicObject
   include ::Kernel
   

data/lib/capybara/rack_test/driver.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rack/test'
 require 'rack/utils'
 require 'mime/types'
@@ -65,11 +66,11 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
   def find_xpath(selector)
     browser.find(:xpath, selector)
   end
-  
+
   def find_css(selector)
     browser.find(:css,selector)
   end
-  
+
   def html
     browser.html
   end
@@ -77,7 +78,7 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
   def dom
     browser.dom
   end
-  
+
   def title
     browser.title
   end
@@ -86,8 +87,9 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     @browser = nil
   end
 
+  # @deprecated This method is being removed
   def browser_initialized?
-    !@browser.nil?
+    super && !@browser.nil?
   end
 
   def get(*args, &block); browser.get(*args, &block); end

data/lib/capybara/rack_test/form.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Capybara::RackTest::Form < Capybara::RackTest::Node
   # This only needs to inherit from Rack::Test::UploadedFile because Rack::Test checks for
   # the class specifically when determining whether to construct the request as multipart.

data/lib/capybara/rack_test/node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Capybara::RackTest::Node < Capybara::Driver::Node
   def all_text
     Capybara::Helpers.normalize_whitespace(native.text)

data/lib/capybara/rails.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'capybara/dsl'
 
 Capybara.app = Rack::Builder.new do
@@ -11,7 +12,7 @@ Capybara.app = Rack::Builder.new do
   end
 end.to_app
 
-Capybara.save_and_open_page_path = Rails.root.join('tmp/capybara')
+Capybara.save_path = Rails.root.join('tmp/capybara')
 
 # Override default rack_test driver to respect data-method attributes.
 Capybara.register_driver :rack_test do |app|

data/lib/capybara/result.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'forwardable'
 
 module Capybara

data/lib/capybara/rspec/features.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 if RSpec::Core::Version::STRING.to_f >= 3.0
   RSpec.shared_context "Capybara Features", :capybara_feature => true do
     instance_eval do

data/lib/capybara/rspec/matchers.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 module Capybara
   module RSpecMatchers
     class Matcher
-      include ::RSpec::Matchers::Composable if defined?(::RSpec::Expectations::Version) && RSpec::Expectations::Version::STRING.to_f >= 3.0
+      include ::RSpec::Matchers::Composable if defined?(::RSpec::Expectations::Version) && (Gem::Version.new(RSpec::Expectations::Version::STRING) >= Gem::Version.new('3.0'))
 
       def wrap(actual)
         if actual.respond_to?("has_selector?")
@@ -38,7 +39,7 @@ module Capybara
       end
 
       def query
-        @query ||= Capybara::Query.new(*@args)
+        @query ||= Capybara::Queries::SelectorQuery.new(*@args)
       end
 
       # RSpec 2 compatibility:
@@ -160,7 +161,7 @@ module Capybara
 
     class BecomeClosed
       def initialize(options)
-        @wait_time = Capybara::Query.new(options).wait
+        @wait_time = Capybara::Queries::SelectorQuery.new(options).wait
       end
 
       def matches?(window)
@@ -186,18 +187,68 @@ 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)
       HaveSelector.new(*args)
     end
 
+    def match_selector(*args)
+      MatchSelector.new(*args)
+    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
+    ::RSpec::Matchers.define_negated_matcher :not_match_selector, :match_selector if defined?(::RSpec::Expectations::Version) && (Gem::Version.new(RSpec::Expectations::Version::STRING) >= Gem::Version.new('3.1'))
+
+
     def have_xpath(xpath, options={})
       HaveSelector.new(:xpath, xpath, options)
     end
 
+    def match_xpath(xpath, options={})
+      MatchSelector.new(:xpath, xpath, options)
+    end
+
     def have_css(css, options={})
       HaveSelector.new(:css, css, options)
     end
 
+    def match_css(css, options={})
+      MatchSelector.new(:css, css, options)
+    end
+
     def have_text(*args)
       HaveText.new(*args)
     end

data/lib/capybara/rspec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'capybara/dsl'
 require 'rspec/core'
 require 'capybara/rspec/matchers'