capybara 2.15.0 → 3.0.0

data/lib/capybara/queries/text_query.rb

@@ -1,22 +1,23 @@
 # frozen_string_literal: true
+
 module Capybara
   # @api private
   module Queries
     class TextQuery < BaseQuery
-      def initialize(*args)
-        @type = (args.first.is_a?(Symbol) || args.first.nil?) ? args.shift : nil
-        # @type = (Capybara.ignore_hidden_elements or Capybara.visible_text_only) ? :visible : :all if @type.nil?
-        @options = if args.last.is_a?(Hash) then args.pop.dup else {} end
+      def initialize(type = nil, expected_text, session_options:, **options) # rubocop:disable Style/OptionalArguments
+        @type = if type.nil?
+          Capybara.ignore_hidden_elements || Capybara.visible_text_only ? :visible : :all
+        else
+          type
+        end
+
+        @expected_text = expected_text.is_a?(Regexp) ? expected_text : expected_text.to_s
+        @options = options
         super(@options)
+        self.session_options = session_options
 
-        @type = (session_options.ignore_hidden_elements or session_options.visible_text_only) ? :visible : :all if @type.nil?
+        @search_regexp = Capybara::Helpers.to_regexp(@expected_text, exact: exact?)
 
-        @expected_text = args.shift
-        unless @expected_text.is_a?(Regexp)
-          @expected_text = Capybara::Helpers.normalize_whitespace(@expected_text)
-        end
-        @search_regexp = Capybara::Helpers.to_regexp(@expected_text, nil, exact?)
-        warn "Unused parameters passed to #{self.class.name} : #{args.to_s}" unless args.empty?
         assert_valid_keys
       end
 
@@ -42,48 +43,47 @@ module Capybara
         end
       end
 
-      private
+    private
 
       def exact?
         options.fetch(:exact, session_options.exact_text)
       end
 
       def build_message(report_on_invisible)
-        message = String.new()
+        message = "".dup
         unless (COUNT_KEYS & @options.keys).empty?
           message << " but found #{@count} #{Capybara::Helpers.declension('time', 'times', @count)}"
         end
         message << " in #{@actual_text.inspect}"
 
         details_message = []
+        details_message << case_insensitive_message if @node and !@expected_text.is_a? Regexp
+        details_message << invisible_message if @node and check_visible_text? and report_on_invisible
+        details_message.compact!
 
-        if @node and !@expected_text.is_a? Regexp
-          insensitive_regexp = Capybara::Helpers.to_regexp(@expected_text, Regexp::IGNORECASE)
-          insensitive_count = @actual_text.scan(insensitive_regexp).size
-          if insensitive_count != @count
-            details_message << "it was found #{insensitive_count} #{Capybara::Helpers.declension("time", "times", insensitive_count)} using a case insensitive search"
-          end
-        end
+        message << ". (However, #{details_message.join(' and ')}.)" unless details_message.empty?
+        message
+      end
 
-        if @node and check_visible_text? and report_on_invisible
-          begin
-            invisible_text = text(@node, :all)
-            invisible_count = invisible_text.scan(@search_regexp).size
-            if invisible_count != @count
-              details_message << ". it was found #{invisible_count} #{Capybara::Helpers.declension("time", "times", invisible_count)} including non-visible text"
-            end
-          rescue
-            # An error getting the non-visible text (if element goes out of scope) should not affect the response
-          end
+      def case_insensitive_message
+        insensitive_regexp = Capybara::Helpers.to_regexp(@expected_text, options: Regexp::IGNORECASE)
+        insensitive_count = @actual_text.scan(insensitive_regexp).size
+        if insensitive_count != @count
+          "it was found #{insensitive_count} #{Capybara::Helpers.declension("time", "times", insensitive_count)} using a case insensitive search"
         end
+      end
 
-        message << ". (However, #{details_message.join(' and ')}.)" unless details_message.empty?
-
-        message
+      def invisible_message
+        invisible_text = text(@node, :all)
+        invisible_count = invisible_text.scan(@search_regexp).size
+        if invisible_count != @count
+          "it was found #{invisible_count} #{Capybara::Helpers.declension("time", "times", invisible_count)} including non-visible text"
+        end
+      rescue # An error getting the non-visible text (if element goes out of scope) should not affect the response
       end
 
       def valid_keys
-        COUNT_KEYS + [:wait, :exact]
+        COUNT_KEYS + %i[wait exact]
       end
 
       def check_visible_text?
@@ -91,7 +91,7 @@ module Capybara
       end
 
       def text(node, query_type)
-        Capybara::Helpers.normalize_whitespace(node.text(query_type))
+        node.text(query_type)
       end
     end
   end

data/lib/capybara/queries/title_query.rb

@@ -1,22 +1,19 @@
 # frozen_string_literal: true
+
 module Capybara
   # @api private
   module Queries
     class TitleQuery < BaseQuery
-      def initialize(expected_title, options = {})
-        @expected_title = expected_title
+      def initialize(expected_title, **options)
+        @expected_title = expected_title.is_a?(Regexp) ? expected_title : expected_title.to_s
         @options = options
         super(@options)
-        unless @expected_title.is_a?(Regexp)
-          @expected_title = Capybara::Helpers.normalize_whitespace(@expected_title)
-        end
-        @search_regexp = Capybara::Helpers.to_regexp(@expected_title, nil, options.fetch(:exact, false))
+        @search_regexp = Capybara::Helpers.to_regexp(@expected_title, all_whitespace: true, exact: options.fetch(:exact, false))
         assert_valid_keys
       end
 
       def resolves_for?(node)
-        @actual_title = node.title
-        @actual_title.match(@search_regexp)
+        (@actual_title = node.title).match(@search_regexp)
       end
 
       def failure_message
@@ -27,15 +24,15 @@ module Capybara
         failure_message_helper(' not')
       end
 
-      private
+    private
 
       def failure_message_helper(negated = '')
-        verb = (@expected_title.is_a?(Regexp))? 'match' : 'include'
+        verb = @expected_title.is_a?(Regexp) ? 'match' : 'include'
         "expected #{@actual_title.inspect}#{negated} to #{verb} #{@expected_title.inspect}"
       end
 
       def valid_keys
-        [:wait, :exact]
+        %i[wait exact]
       end
     end
   end

data/lib/capybara/rack_test/browser.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Capybara::RackTest::Browser
   include ::Rack::Test::Methods
 
@@ -17,7 +18,7 @@ class Capybara::RackTest::Browser
     driver.options
   end
 
-  def visit(path, attributes = {})
+  def visit(path, **attributes)
     reset_host!
     process_and_follow_redirects(:get, path, attributes)
   end
@@ -28,23 +29,24 @@ class Capybara::RackTest::Browser
   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})
+    path = request_path if path.nil? || path.empty?
+    process_and_follow_redirects(method, path, attributes, 'HTTP_REFERER' => current_url)
   end
 
-  def follow(method, path, attributes = {})
+  def follow(method, path, **attributes)
     return if path.gsub(/^#{Regexp.escape(request_path)}/, '').start_with?('#') || path.downcase.start_with?('javascript:')
-    process_and_follow_redirects(method, path, attributes, {'HTTP_REFERER' => current_url})
+    process_and_follow_redirects(method, path, attributes, 'HTTP_REFERER' => current_url)
   end
 
   def process_and_follow_redirects(method, path, attributes = {}, env = {})
     process(method, path, attributes, env)
-    if driver.follow_redirects?
-      driver.redirect_limit.times do
-        process(:get, last_response["Location"], {}, env) if last_response.redirect?
-      end
-      raise Capybara::InfiniteRedirectError, "redirected more than #{driver.redirect_limit} times, check for infinite redirects." if last_response.redirect?
+
+    return unless driver.follow_redirects?
+
+    driver.redirect_limit.times do
+      process(:get, last_response["Location"], {}, env) if last_response.redirect?
     end
+    raise Capybara::InfiniteRedirectError, "redirected more than #{driver.redirect_limit} times, check for infinite redirects." if last_response.redirect?
   end
 
   def process(method, path, attributes = {}, env = {})
@@ -55,7 +57,7 @@ class Capybara::RackTest::Browser
     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?('/')
+      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
@@ -91,7 +93,7 @@ class Capybara::RackTest::Browser
   end
 
   def find(format, selector)
-    if format==:css
+    if format == :css
       dom.css(selector, Capybara::RackTest::CSSHandlers.new)
     else
       dom.xpath(selector)
@@ -105,12 +107,7 @@ class Capybara::RackTest::Browser
   end
 
   def title
-    if dom.respond_to? :title
-      dom.title
-    else
-      #old versions of nokogiri don't have #title - remove in 3.0
-      dom.xpath('/html/head/title | /html/title').first.text
-    end
+    dom.title
   end
 
 protected

data/lib/capybara/rack_test/css_handlers.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
+
 class Capybara::RackTest::CSSHandlers < BasicObject
   include ::Kernel
-  
-  def disabled list
+
+  def disabled(list)
     list.find_all { |node| node.has_attribute? 'disabled' }
-  end        
-  def enabled list
+  end
+
+  def enabled(list)
     list.find_all { |node| !node.has_attribute? 'disabled' }
   end
 end

data/lib/capybara/rack_test/driver.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rack/test'
 require 'rack/utils'
 require 'mini_mime'
@@ -10,10 +11,10 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     respect_data_method: false,
     follow_redirects: true,
     redirect_limit: 5
-  }
+  }.freeze
   attr_reader :app, :options
 
-  def initialize(app, options={})
+  def initialize(app, **options)
     raise ArgumentError, "rack-test requires a rack application, but none was given" unless app
     @session = nil
     @app = app
@@ -40,7 +41,7 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     browser.last_request
   end
 
-  def visit(path, attributes = {})
+  def visit(path, **attributes)
     browser.visit(path, attributes)
   end
 
@@ -52,7 +53,7 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     browser.submit(method, path, attributes)
   end
 
-  def follow(method, path, attributes = {})
+  def follow(method, path, **attributes)
     browser.follow(method, path, attributes)
   end
 
@@ -73,7 +74,7 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
   end
 
   def find_css(selector)
-    browser.find(:css,selector)
+    browser.find(:css, selector)
   end
 
   def html
@@ -92,11 +93,6 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     @browser = nil
   end
 
-  # @deprecated This method is being removed
-  def browser_initialized?
-    super && !@browser.nil?
-  end
-
   def get(*args, &block); browser.get(*args, &block); end
   def post(*args, &block); browser.post(*args, &block); end
   def put(*args, &block); browser.put(*args, &block); end

data/lib/capybara/rack_test/form.rb

@@ -1,4 +1,5 @@
 # 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.
@@ -13,57 +14,28 @@ 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 = make_params
 
-    form_element_types=[:input, :select, :textarea]
-    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))
+    form_element_types = %i[input select textarea]
+    form_elements_xpath = XPath.generate do |x|
+      xpath = x.descendant(*form_element_types).where(!x.attr(:form))
+      xpath += 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'
-        if %w(radio checkbox).include? field['type']
-          if field['checked']
-            node=Capybara::RackTest::Node.new(self.driver, field)
-            merge_param!(params, field['name'].to_s, node.value.to_s)
-          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)
-        elsif field['type'] =='file'
-          if multipart?
-            file = \
-              if (value = field['value']).to_s.empty?
-                NilUploadedFile.new
-              else
-                Rack::Test::UploadedFile.new(value, MiniMime.lookup_by_filename(value).content_type)
-              end
-            merge_param!(params, field['name'].to_s, file)
-          else
-            merge_param!(params, field['name'].to_s, File.basename(field['value'].to_s))
-          end
-        else
-          merge_param!(params, field['name'].to_s, field['value'].to_s)
-        end
+        add_input_param(field, params)
       when 'select'
-        if field['multiple'] == 'multiple'
-          options = field.xpath(".//option[@selected]")
-          options.each do |option|
-            merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s)
-          end
-        else
-          option = field.xpath(".//option[@selected]").first
-          option ||= field.xpath('.//option').first
-          merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s) if option
-        end
+        add_select_param(field, params)
       when 'textarea'
-        merge_param!(params, field['name'].to_s, field['_capybara_raw_value'].to_s.gsub(/\n/, "\r\n"))
+        add_textarea_param(field, params)
       end
     end
     merge_param!(params, button[:name], button[:value] || "") if button[:name]
@@ -108,4 +80,45 @@ private
       ParamsHash.new
     end
   end
+
+  def add_input_param(field, params)
+    if %w[radio checkbox].include? field['type']
+      if field['checked']
+        node = Capybara::RackTest::Node.new(driver, field)
+        merge_param!(params, field['name'].to_s, node.value.to_s)
+      end
+    elsif %w[submit image].include? field['type']
+      # TODO: identify the click button here (in document order, rather
+      # than leaving until the end of the params)
+    elsif field['type'] == 'file'
+      if multipart?
+        file = if (value = field['value']).to_s.empty?
+          NilUploadedFile.new
+        else
+          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
+        merge_param!(params, field['name'].to_s, File.basename(field['value'].to_s))
+      end
+    else
+      merge_param!(params, field['name'].to_s, field['value'].to_s)
+    end
+  end
+
+  def add_select_param(field, params)
+    if field['multiple'] == 'multiple'
+      field.xpath(".//option[@selected]").each do |option|
+        merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s)
+      end
+    else
+      option = field.xpath('.//option[@selected]').first || field.xpath('.//option').first
+      merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s) if option
+    end
+  end
+
+  def add_textarea_param(field, params)
+    merge_param!(params, field['name'].to_s, field['_capybara_raw_value'].to_s.gsub(/\n/, "\r\n"))
+  end
 end