capybara 2.6.2 → 2.7.0

data/lib/capybara/cucumber.rb

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

data/lib/capybara/driver/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Capybara::Driver::Base
   def current_url
     raise NotImplementedError
@@ -90,8 +91,8 @@ class Capybara::Driver::Base
   def no_such_window_error
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#no_such_window_error'
   end
-  
-  
+
+
   ##
   #
   # Execute the block, and then accept the modal opened.
@@ -134,7 +135,9 @@ class Capybara::Driver::Base
     false
   end
 
+  # @deprecated This method is being removed
   def browser_initialized?
+    warn "DEPRECATED: #browser_initialized? is deprecated and will be removed in the next version of Capybara"
     true
   end
 end

data/lib/capybara/driver/node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   module Driver
     class Node

data/lib/capybara/dsl.rb

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

data/lib/capybara/helpers.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Capybara
 
@@ -96,7 +97,7 @@ module Capybara
     # @option [Integer] minimum     Count should have been larger than or equal to this value
     #
     def failure_message(description, options={})
-      message = "expected to find #{description}"
+      message = String.new("expected to find #{description}")
       if options[:count]
         message << " #{options[:count]} #{declension('time', 'times', options[:count])}"
       elsif options[:between]
@@ -129,7 +130,7 @@ module Capybara
 
     if defined?(Process::CLOCK_MONOTONIC)
       def monotonic_time
-       Process.clock_gettime Process::CLOCK_MONOTONIC
+        Process.clock_gettime Process::CLOCK_MONOTONIC
       end
     else
       def monotonic_time

data/lib/capybara/node/actions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   module Node
     module Actions
@@ -150,6 +151,11 @@ module Capybara
       # @param [String] locator       Which field to attach the file to
       # @param [String] path          The path of the file that will be attached, or an array of paths
       #
+      # @option options [Symbol] match (Capybara.match)     The matching strategy to use (:one, :first, :prefer_exact, :smart).
+      # @option options [Boolean] exact (Capybara.exact)    Match the exact label name/contents or accept a partial match.
+      # @option options [Fixnum] wait (Capybara.default_max_wait_time)      If using a Javascript driver, maximum number of seconds during which the element will be searched for.
+      # @option options [Boolean] multiple Match field which allows multiple file selection
+      #
       def attach_file(locator, path, options={})
         Array(path).each do |p|
           raise Capybara::FileNotFound, "cannot attach file, #{p} does not exist" unless File.exist?(p.to_s)

data/lib/capybara/node/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   module Node
 

data/lib/capybara/node/document.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   module Node
 

data/lib/capybara/node/document_matchers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   module Node
     module DocumentMatchers

data/lib/capybara/node/element.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   module Node
 

data/lib/capybara/node/finders.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   module Node
     module Finders
@@ -28,7 +29,7 @@ module Capybara
       # @raise  [Capybara::ElementNotFound]    If the element can't be found before time expires
       #
       def find(*args)
-        query = Capybara::Query.new(*args)
+        query = Capybara::Queries::SelectorQuery.new(*args)
         synchronize(query.wait) do
           if query.match == :smart or query.match == :prefer_exact
             result = query.resolve_for(self, true)
@@ -177,7 +178,7 @@ module Capybara
       # @return [Capybara::Result]                   A collection of found elements
       #
       def all(*args)
-        query = Capybara::Query.new(*args)
+        query = Capybara::Queries::SelectorQuery.new(*args)
         synchronize(query.wait) do
           result = query.resolve_for(self)
           raise Capybara::ExpectationNotMet, result.failure_message unless result.matches_count?

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,4 @@
+# frozen_string_literal: true
 require 'addressable/uri'
 
 module Capybara

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