capybara 2.5.0 → 2.18.0

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
 
@@ -21,6 +22,11 @@ class Capybara::RackTest::Browser
     process_and_follow_redirects(:get, path, attributes)
   end
 
+  def refresh
+    reset_cache!
+    request(last_request.fullpath, last_request.env)
+  end
+
   def submit(method, path, attributes)
     path = request_path if not path or path.empty?
     process_and_follow_redirects(method, path, attributes, {'HTTP_REFERER' => current_url})
@@ -44,10 +50,13 @@ class Capybara::RackTest::Browser
   def process(method, path, attributes = {}, env = {})
     new_uri = URI.parse(path)
     method.downcase! unless method.is_a? Symbol
-
-    new_uri.path = request_path if path.start_with?("?")
-    new_uri.path = "/" if new_uri.path.empty?
-    new_uri.path = request_path.sub(%r(/[^/]*$), '/') + new_uri.path unless new_uri.path.start_with?('/')
+    if path.empty?
+      new_uri.path = request_path
+    else
+      new_uri.path = request_path if path.start_with?("?")
+      new_uri.path = "/" if new_uri.path.empty?
+      new_uri.path = request_path.sub(%r(/[^/]*$), '/') + new_uri.path unless new_uri.path.start_with?('/')
+    end
     new_uri.scheme ||= @current_scheme
     new_uri.host ||= @current_host
     new_uri.port ||= @current_port unless new_uri.default_port == @current_port
@@ -67,7 +76,7 @@ class Capybara::RackTest::Browser
   end
 
   def reset_host!
-    uri = URI.parse(Capybara.app_host || Capybara.default_host)
+    uri = URI.parse(driver.session_options.app_host || driver.session_options.default_host)
     @current_scheme = uri.scheme
     @current_host = uri.host
     @current_port = uri.port

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,19 +1,21 @@
+# frozen_string_literal: true
 require 'rack/test'
 require 'rack/utils'
-require 'mime/types'
+require 'mini_mime'
 require 'nokogiri'
 require 'cgi'
 
 class Capybara::RackTest::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
-    :respect_data_method => false,
-    :follow_redirects => true,
-    :redirect_limit => 5
+    respect_data_method: false,
+    follow_redirects: true,
+    redirect_limit: 5
   }
   attr_reader :app, :options
 
   def initialize(app, options={})
     raise ArgumentError, "rack-test requires a rack application, but none was given" unless app
+    @session = nil
     @app = app
     @options = DEFAULT_OPTIONS.merge(options)
   end
@@ -42,6 +44,10 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     browser.visit(path, attributes)
   end
 
+  def refresh
+    browser.refresh
+  end
+
   def submit(method, path, attributes)
     browser.submit(method, path, attributes)
   end
@@ -65,11 +71,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 +83,7 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
   def dom
     browser.dom
   end
-  
+
   def title
     browser.title
   end
@@ -86,8 +92,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.
@@ -12,18 +13,20 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
     def original_filename; ""; end
     def content_type; "application/octet-stream"; end
     def path; @empty_file.path; end
+    def size; 0; end
+    def read; ""; end
   end
 
   def params(button)
-    params = {}
+    params = make_params
 
     form_element_types=[:input, :select, :textarea]
-    form_elements_xpath=XPath.generate do |x| 
+    form_elements_xpath=XPath.generate do |x|
       xpath=x.descendant(*form_element_types).where(~x.attr(:form))
       xpath=xpath.union(x.anywhere(*form_element_types).where(x.attr(:form) == native[:id])) if native[:id]
       xpath.where(~x.attr(:disabled))
     end.to_s
-    
+
     native.xpath(form_elements_xpath).map do |field|
       case field.name
       when 'input'
@@ -31,7 +34,7 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
           if field['checked']
             node=Capybara::RackTest::Node.new(self.driver, field)
             merge_param!(params, field['name'].to_s, node.value.to_s)
-          end          
+          end
         elsif %w(submit image).include? field['type']
           # TO DO identify the click button here (in document order, rather
           # than leaving until the end of the params)
@@ -41,8 +44,8 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
               if (value = field['value']).to_s.empty?
                 NilUploadedFile.new
               else
-                content_type = MIME::Types.type_for(value).first.to_s
-                Rack::Test::UploadedFile.new(value, content_type)
+                mime_info = MiniMime.lookup_by_filename(value)
+                Rack::Test::UploadedFile.new(value, (mime_info && mime_info.content_type).to_s)
               end
             merge_param!(params, field['name'].to_s, file)
           else
@@ -63,17 +66,18 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
           merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s) if option
         end
       when 'textarea'
-        merge_param!(params, field['name'].to_s, field.text.to_s.gsub(/\n/, "\r\n"))
+        merge_param!(params, field['name'].to_s, field['_capybara_raw_value'].to_s.gsub(/\n/, "\r\n"))
       end
     end
     merge_param!(params, button[:name], button[:value] || "") if button[:name]
-    params
+
+    params.to_params_hash
   end
 
   def submit(button)
     action = (button && button['formaction']) || native['action']
-    requset_method = (button && button['formmethod']) || method
-    driver.submit(requset_method, action.to_s, params(button))
+    method = (button && button['formmethod']) || request_method
+    driver.submit(method, action.to_s, params(button))
   end
 
   def multipart?
@@ -82,11 +86,29 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
 
 private
 
-  def method
+  class ParamsHash < Hash
+    def to_params_hash
+      self
+    end
+  end
+
+  def request_method
     self[:method] =~ /post/i ? :post : :get
   end
 
   def merge_param!(params, key, value)
-    Rack::Utils.normalize_params(params, key, value)
+    if Rack::Utils.respond_to?(:default_query_parser)
+      Rack::Utils.default_query_parser.normalize_params(params, key, value, Rack::Utils.param_depth_limit)
+    else
+      Rack::Utils.normalize_params(params, key, value)
+    end
+  end
+
+  def make_params
+    if Rack::Utils.respond_to?(:default_query_parser)
+      Rack::Utils.default_query_parser.make_params
+    else
+      ParamsHash.new
+    end
   end
 end

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)
@@ -16,8 +17,14 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
   end
 
   def set(value)
-    if (Array === value) && !self[:multiple]
-      raise ArgumentError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
+    return if disabled?
+    if readonly?
+      warn "Attempt to set readonly element with value: #{value} \n * This will raise an exception in a future version of Capybara"
+      return
+    end
+
+    if (Array === value) && !multiple?
+      raise TypeError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
     end
 
     if radio?
@@ -27,11 +34,7 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     elsif input_field?
       set_input(value)
     elsif textarea?
-      if self[:readonly]
-        warn "Attempt to set readonly element with value: #{value} \n * This will raise an exception in a future version of Capybara"
-      else
-        native.content = value.to_s
-      end
+      native['_capybara_raw_value'] = value.to_s
     end
   end
 
@@ -59,6 +62,18 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
         ((tag_name == 'button') and type.nil? or type == "submit")
       associated_form = form
       Capybara::RackTest::Form.new(driver, associated_form).submit(self) if associated_form
+    elsif (tag_name == 'input' and %w(checkbox radio).include?(type))
+      set(!checked?)
+    elsif (tag_name == 'label')
+      labelled_control = if native[:for]
+        find_xpath("//input[@id='#{native[:for]}']").first
+      else
+        find_xpath(".//input").first
+      end
+
+      if labelled_control && (labelled_control.checkbox? || labelled_control.radio?)
+        labelled_control.set(!labelled_control.checked?)
+      end
     end
   end
 
@@ -80,9 +95,9 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
 
   def disabled?
     if %w(option optgroup).include? tag_name
-      string_node.disabled? || find_xpath("parent::*")[0].disabled?
+      string_node.disabled? || find_xpath("parent::*[self::optgroup or self::select]")[0].disabled?
     else
-      string_node.disabled?
+      string_node.disabled? || !find_xpath("parent::fieldset[@disabled] | ancestor::*[not(self::legend) or preceding-sibling::legend][parent::fieldset[@disabled]]").empty?
     end
   end
 
@@ -126,7 +141,7 @@ private
 
   # a reference to the select node if this is an option node
   def select_node
-    find_xpath('./ancestor::select').first
+    find_xpath('./ancestor::select[1]').first
   end
 
   def type
@@ -141,7 +156,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'
@@ -170,7 +185,7 @@ private
       end
       native.remove
     else
-      if self[:readonly]
+      if readonly?
         warn "Attempt to set readonly element with value: #{value} \n *This will raise an exception in a future version of Capybara"
       else
         native['value'] = value.to_s
@@ -182,6 +197,8 @@ private
     self[attribute] && !self[attribute].empty?
   end
 
+protected
+
   def checkbox?
     input_field? && type == 'checkbox'
   end

data/lib/capybara/rails.rb

@@ -1,4 +1,4 @@
-require 'capybara'
+# frozen_string_literal: true
 require 'capybara/dsl'
 
 Capybara.app = Rack::Builder.new do
@@ -12,9 +12,9 @@ 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|
-  Capybara::RackTest::Driver.new(app, :respect_data_method => true)
+  Capybara::RackTest::Driver.new(app, respect_data_method: true)
 end

data/lib/capybara/result.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'forwardable'
 
 module Capybara
@@ -24,27 +25,93 @@ module Capybara
 
     def initialize(elements, query)
       @elements = elements
-      @result = elements.select { |node| query.matches_filters?(node) }
-      @rest = @elements - @result
+      @result_cache = []
+      @results_enum = lazy_select_elements { |node| query.matches_filters?(node) }
       @query = query
     end
 
-    def_delegators :@result, :each, :[], :at, :size, :count, :length,
-                   :first, :last, :values_at, :empty?, :inspect, :sample, :index
+    def_delegators :full_results, :size, :length, :last, :values_at, :inspect, :sample
+
+    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
+        @result_cache << next_result
+        block.call(next_result)
+      end
+      self
+    end
+
+    def [](*args)
+      if (args.size == 1) && ((idx = args[0]).is_a? Integer) && (idx >= 0)
+        @result_cache << @results_enum.next while @result_cache.size <= idx
+        @result_cache[idx]
+      else
+        full_results[*args]
+      end
+    rescue StopIteration
+      return nil
+    end
+    alias :at :[]
+
+    def empty?
+      !any?
+    end
 
     def matches_count?
-      Capybara::Helpers.matches_count?(@result.size, @query.options)
+      # Only check filters for as many elements as necessary to determine result
+      if @query.options[:count]
+        count_opt = Integer(@query.options[:count])
+        loop do
+          break if @result_cache.size > count_opt
+          @result_cache << @results_enum.next
+        end
+        return @result_cache.size == count_opt
+      end
+
+      if @query.options[:minimum]
+        min_opt = Integer(@query.options[:minimum])
+        begin
+          @result_cache << @results_enum.next while @result_cache.size < min_opt
+        rescue StopIteration
+          return false
+        end
+      end
+
+      if @query.options[:maximum]
+        max_opt = Integer(@query.options[:maximum])
+        begin
+          @result_cache << @results_enum.next while @result_cache.size <= max_opt
+          return false
+        rescue StopIteration
+        end
+      end
+
+      if @query.options[:between]
+        max =  Integer(@query.options[:between].max)
+        loop do
+          break if @result_cache.size > max
+          @result_cache << @results_enum.next
+        end
+        return false unless (@query.options[:between] === @result_cache.size)
+      end
+
+      return true
     end
 
     def failure_message
-      message = Capybara::Helpers.failure_message(@query.description, @query.options)
+      message = @query.failure_message
       if count > 0
-        message << ", found #{count} #{Capybara::Helpers.declension("match", "matches", count)}: " << @result.map(&:text).map(&:inspect).join(", ")
+        message << ", found #{count} #{Capybara::Helpers.declension("match", "matches", count)}: " << full_results.map(&:text).map(&:inspect).join(", ")
       else
         message << " but there were no matches"
       end
-      unless @rest.empty?
-        elements = @rest.map(&:text).map(&:inspect).join(", ")
+      unless rest.empty?
+        elements = rest.map(&:text).map(&:inspect).join(", ")
         message << ". Also found " << elements << ", which matched the selector but not all filters."
       end
       message
@@ -53,5 +120,33 @@ module Capybara
     def negative_failure_message
       failure_message.sub(/(to find)/, 'not \1')
     end
+
+    private
+
+    def full_results
+      loop { @result_cache << @results_enum.next }
+      @result_cache
+    end
+
+    def rest
+      @rest ||= @elements - full_results
+    end
+
+    def lazy_select_elements(&block)
+      # JRuby has an issue with lazy enumerators which
+      # causes a concurrency issue with network requests here
+      # https://github.com/jruby/jruby/issues/4212
+      if RUBY_PLATFORM == 'java'
+        @elements.select(&block).to_enum  # non-lazy evaluation
+      elsif @elements.respond_to? :lazy  #Ruby 2.0+
+        @elements.lazy.select(&block)
+      else
+        Enumerator.new do |yielder|
+          @elements.each do |val|
+            yielder.yield(val) if block.call(val)
+          end
+        end
+      end
+    end
   end
 end