capybara 2.13.0 → 2.14.0

data/lib/capybara/queries/text_query.rb

@@ -5,13 +5,18 @@ module Capybara
     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?
-        @expected_text, @options = args
+        # @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
+        self.session_options = @options.delete(:session_options)
+
+        @type = (session_options.ignore_hidden_elements or session_options.visible_text_only) ? :visible : :all if @type.nil?
+
+        @expected_text = args.shift
         unless @expected_text.is_a?(Regexp)
           @expected_text = Capybara::Helpers.normalize_whitespace(@expected_text)
         end
-        @options ||= {}
         @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
 
@@ -40,7 +45,7 @@ module Capybara
       private
 
       def exact?
-        options.fetch(:exact, Capybara.exact_text)
+        options.fetch(:exact, session_options.exact_text)
       end
 
       def build_message(report_on_invisible)

data/lib/capybara/rack_test/browser.rb

@@ -45,10 +45,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
@@ -68,7 +71,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/rspec.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
-require 'capybara/dsl'
 require 'rspec/core'
+require 'capybara/dsl'
 require 'capybara/rspec/matchers'
 require 'capybara/rspec/features'
+require 'capybara/rspec/matcher_proxies'
 
 RSpec.configure do |config|
   config.include Capybara::DSL, :type => :feature
@@ -22,6 +23,7 @@ RSpec.configure do |config|
       Capybara.use_default_driver
     end
   end
+
   config.before do
     if self.class.include?(Capybara::DSL)
       example = fetch_current_example.call(self)

data/lib/capybara/rspec/matcher_proxies.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+module Capybara
+  module RSpecMatcherProxies
+    def all(*args)
+      if defined?(::RSpec::Matchers::BuiltIn::All) && args.first.respond_to?(:matches?)
+        ::RSpec::Matchers::BuiltIn::All.new(*args)
+      else
+        find_all(*args)
+      end
+    end
+
+    def within(*args)
+      if block_given?
+        within_element(*args, &Proc.new)
+      else
+        be_within(*args)
+      end
+    end
+  end
+
+  module DSL
+    def self.included(base)
+      warn "including Capybara::DSL in the global scope is not recommended!" if base == Object
+
+      if defined?(::RSpec::Matchers) && base.include?(::RSpec::Matchers)
+        base.send(:include, ::Capybara::RSpecMatcherProxies)
+      end
+
+      super
+    end
+  end
+end
+
+if defined?(::RSpec::Matchers)
+  module  ::RSpec::Matchers
+    def self.included(base)
+      base.send(:include, ::Capybara::RSpecMatcherProxies) if base.include?(::Capybara::DSL)
+      super
+    end
+  end
+end

data/lib/capybara/rspec/matchers.rb

@@ -7,7 +7,7 @@ module Capybara
       attr_reader :failure_message, :failure_message_when_negated
 
       def wrap(actual)
-        if actual.respond_to?("has_selector?")
+        @context_el = if actual.respond_to?("has_selector?")
           actual
         else
           Capybara.string(actual.to_s)
@@ -33,6 +33,19 @@ module Capybara
         @failure_message_when_negated = e.message
         return false
       end
+
+      def session_query_args
+        if @args.last.is_a? Hash
+          @args.last[:session_options] = session_options
+        else
+          @args.push(session_options: session_options)
+        end
+        @args
+      end
+
+      def session_options
+        @context_el ? @context_el.session_options : Capybara.session_options
+      end
     end
 
     class HaveSelector < Matcher
@@ -55,7 +68,7 @@ module Capybara
       end
 
       def query
-        @query ||= Capybara::Queries::SelectorQuery.new(*@args, &@filter_block)
+        @query ||= Capybara::Queries::SelectorQuery.new(*session_query_args, &@filter_block)
       end
     end
 
@@ -73,7 +86,7 @@ module Capybara
       end
 
       def query
-        @query ||= Capybara::Queries::MatchQuery.new(*@args)
+        @query ||= Capybara::Queries::MatchQuery.new(*session_query_args, &@filter_block)
       end
     end
 
@@ -155,11 +168,12 @@ module Capybara
 
     class BecomeClosed
       def initialize(options)
-        @wait_time = Capybara::Queries::BaseQuery.wait(options)
+        @options = options
       end
 
       def matches?(window)
         @window = window
+        @wait_time = Capybara::Queries::BaseQuery.wait(@options, window.session.config.default_max_wait_time)
         start_time = Capybara::Helpers.monotonic_time
         while window.exists?
           return false if (Capybara::Helpers.monotonic_time - start_time) > @wait_time
@@ -267,4 +281,4 @@ module Capybara
       BecomeClosed.new(options)
     end
   end
-end
+end

data/lib/capybara/selector.rb

@@ -139,7 +139,7 @@ Capybara.add_selector(:link) do
                  XPath.string.n.is(locator) |
                  XPath.attr(:title).is(locator) |
                  XPath.descendant(:img)[XPath.attr(:alt).is(locator)]
-      matchers |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
+      matchers |= XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
       xpath = xpath[matchers]
     end
     xpath = [:title].inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
@@ -185,14 +185,14 @@ Capybara.add_selector(:button) do
     unless locator.nil?
       locator = locator.to_s
       locator_matches = XPath.attr(:id).equals(locator) | XPath.attr(:value).is(locator) | XPath.attr(:title).is(locator)
-      locator_matches |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
+      locator_matches |= XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
 
       input_btn_xpath = input_btn_xpath[locator_matches]
 
       btn_xpath = btn_xpath[locator_matches | XPath.string.n.is(locator) | XPath.descendant(:img)[XPath.attr(:alt).is(locator)]]
 
       alt_matches = XPath.attr(:alt).is(locator)
-      alt_matches |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
+      alt_matches |= XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
       image_btn_xpath = image_btn_xpath[alt_matches]
     end
 
@@ -237,14 +237,23 @@ end
 # @filter [String] :name  Matches the name attribute
 # @filter [String] :placeholder  Matches the placeholder attribute
 # @filter [String] :with  Matches the current value of the field
+# @filter [String] :type Matches the type attribute of the field or element type for 'textarea'
 # @filter [String, Array<String>] :class  Matches the class(es) provided
 # @filter [Boolean] :disabled Match disabled field?
 # @filter [Boolean] :multiple Match fields that accept multiple values
 #
 Capybara.add_selector(:fillable_field) do
   label "field"
-  xpath(:name, :placeholder) do |locator, options|
+  xpath(:name, :placeholder, :type) do |locator, options|
     xpath = XPath.descendant(:input, :textarea)[~XPath.attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')]
+    if options[:type]
+      type=options[:type].to_s
+      if ['textarea'].include?(type)
+        xpath = XPath.descendant(type.to_sym)
+      else
+        xpath = xpath[XPath.attr(:type).equals(type)]
+      end
+    end
     locate_field(xpath, locator, options)
   end
 

data/lib/capybara/selector/selector.rb

@@ -201,9 +201,9 @@ module Capybara
       @default_visibility = default_visibility
     end
 
-    def default_visibility
+    def default_visibility(fallback = Capybara.ignore_hidden_elements)
       if @default_visibility.nil?
-        Capybara.ignore_hidden_elements
+        fallback
       else
         @default_visibility
       end
@@ -219,7 +219,7 @@ module Capybara
                          XPath.attr(:name).equals(locator) |
                          XPath.attr(:placeholder).equals(locator) |
                          XPath.attr(:id).equals(XPath.anywhere(:label)[XPath.string.n.is(locator)].attr(:for))
-        attr_matchers |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
+        attr_matchers |= XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
 
         locate_xpath = locate_xpath[attr_matchers]
         locate_xpath += XPath.descendant(:label)[XPath.string.n.is(locator)].descendant(xpath)

data/lib/capybara/selenium/driver.rb

@@ -35,6 +35,13 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   def initialize(app, options={})
     begin
       require 'selenium-webdriver'
+      # Fix for selenium-webdriver 3.4.0 which misnamed these
+      if !defined?(::Selenium::WebDriver::Error::ElementNotInteractableError)
+        ::Selenium::WebDriver::Error.const_set('ElementNotInteractableError', Class.new(::Selenium::WebDriver::Error::WebDriverError))
+      end
+      if !defined?(::Selenium::WebDriver::Error::ElementClickInterceptedError)
+        ::Selenium::WebDriver::Error.const_set('ElementClickInterceptedError', Class.new(::Selenium::WebDriver::Error::WebDriverError))
+      end
     rescue LoadError => e
       if e.message =~ /selenium-webdriver/
         raise LoadError, "Capybara's selenium driver is unable to load `selenium-webdriver`, please install the gem and add `gem 'selenium-webdriver'` to your Gemfile if you are using bundler."
@@ -185,7 +192,12 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def resize_window_to(handle, width, height)
     within_given_window(handle) do
-      browser.manage.window.resize_to(width, height)
+      # Don't set the size if already set - See https://github.com/mozilla/geckodriver/issues/643
+      if marionette? && (window_size(handle) == [width, height])
+        {}
+      else
+        browser.manage.window.resize_to(width, height)
+      end
     end
   end
 
@@ -250,10 +262,12 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def invalid_element_errors
-    [Selenium::WebDriver::Error::StaleElementReferenceError,
-     Selenium::WebDriver::Error::UnhandledError,
-     Selenium::WebDriver::Error::ElementNotVisibleError,
-     Selenium::WebDriver::Error::InvalidSelectorError]  # Work around a race condition that can occur with chromedriver and #go_back/#go_forward
+    [::Selenium::WebDriver::Error::StaleElementReferenceError,
+     ::Selenium::WebDriver::Error::UnhandledError,
+     ::Selenium::WebDriver::Error::ElementNotVisibleError,
+     ::Selenium::WebDriver::Error::InvalidSelectorError, # Work around a race condition that can occur with chromedriver and #go_back/#go_forward
+     ::Selenium::WebDriver::Error::ElementNotInteractableError,
+     ::Selenium::WebDriver::Error::ElementClickInterceptedError]
   end
 
   def no_such_window_error
@@ -306,7 +320,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     # Selenium has its own built in wait (2 seconds)for a modal to show up, so this wait is really the minimum time
     # Actual wait time may be longer than specified
     wait = Selenium::WebDriver::Wait.new(
-      timeout: (options[:wait] || Capybara.default_max_wait_time),
+      timeout: options.fetch(:wait, session_options.default_max_wait_time) || 0 ,
       ignore: Selenium::WebDriver::Error::NoAlertPresentError)
     begin
       wait.until do

data/lib/capybara/selenium/node.rb

@@ -77,16 +77,20 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     elsif native.attribute('isContentEditable')
       #ensure we are focused on the element
       native.click
+
       script = <<-JS
         var range = document.createRange();
+        var sel = window.getSelection();
         arguments[0].focus();
         range.selectNodeContents(arguments[0]);
-        window.getSelection().addRange(range);
+        sel.removeAllRanges();
+        sel.addRange(range);
       JS
       driver.execute_script script, self
+
       if (driver.options[:browser].to_s == "chrome") ||
          (driver.options[:browser].to_s == "firefox" && !driver.marionette?)
-        # chromedriver raises a can't focus element if we use native.send_keys
+        # chromedriver raises a can't focus element for child elements if we use native.send_keys
         # we've already focused it so just use action api
         driver.browser.action.send_keys(value.to_s).perform
       else

data/lib/capybara/server.rb

@@ -25,9 +25,10 @@ module Capybara
 
       attr_accessor :error
 
-      def initialize(app)
+      def initialize(app, server_errors)
         @app = app
         @counter = Counter.new
+        @server_errors = server_errors
       end
 
       def pending_requests?
@@ -41,7 +42,7 @@ module Capybara
           @counter.increment
           begin
             @app.call(env)
-          rescue *Capybara.server_errors => e
+          rescue *@server_errors => e
             @error = e unless @error
             raise e
           ensure
@@ -59,10 +60,10 @@ module Capybara
 
     attr_reader :app, :port, :host
 
-    def initialize(app, port=Capybara.server_port, host=Capybara.server_host)
+    def initialize(app, port=Capybara.server_port, host=Capybara.server_host, server_errors=Capybara.server_errors)
       @app = app
       @server_thread = nil # suppress warnings
-      @host, @port = host, port
+      @host, @port, @server_errors = host, port, server_errors
       @port ||= Capybara::Server.ports[port_key]
       @port ||= find_available_port(host)
     end
@@ -112,7 +113,7 @@ module Capybara
   private
 
     def middleware
-      @middleware ||= Middleware.new(app)
+      @middleware ||= Middleware.new(app, @server_errors)
     end
 
     def port_key

data/lib/capybara/session.rb

@@ -17,6 +17,14 @@ module Capybara
   #     session = Capybara::Session.new(:culerity)
   #     session.visit('http://www.google.com')
   #
+  # When Capybara.threadsafe == true the sessions options will be initially set to the
+  # current values of the global options and a configuration block can be passed to the session initializer.
+  # For available options see {Capybara::SessionConfig::OPTIONS}
+  #
+  #     session = Capybara::Session.new(:driver, MyRackApp) do |config|
+  #       config.app_host = "http://my_host.dev"
+  #     end
+  #
   # Session provides a number of methods for controlling the navigation of the page, such as +visit+,
   # +current_path, and so on. It also delegate a number of methods to a Capybara::Document, representing
   # the current HTML document. This allows interaction:
@@ -69,10 +77,15 @@ module Capybara
 
     def initialize(mode, app=nil)
       raise TypeError, "The second parameter to Session::new should be a rack app if passed." if app && !app.respond_to?(:call)
+      @@instance_created = true
       @mode = mode
       @app = app
-      if Capybara.run_server and @app and driver.needs_server?
-        @server = Capybara::Server.new(@app).boot
+      if block_given?
+        raise "A configuration block is only accepted when Capybara.threadsafe == true" unless Capybara.threadsafe
+        yield config if block_given?
+      end
+      if config.run_server and @app and driver.needs_server?
+        @server = Capybara::Server.new(@app, config.server_port, config.server_host, config.server_errors).boot
       else
         @server = nil
       end
@@ -85,7 +98,9 @@ module Capybara
           other_drivers = Capybara.drivers.keys.map { |key| key.inspect }
           raise Capybara::DriverNotFoundError, "no driver called #{mode.inspect} was found, available drivers: #{other_drivers.join(', ')}"
         end
-        Capybara.drivers[mode].call(app)
+        driver = Capybara.drivers[mode].call(app)
+        driver.session = self if driver.respond_to?(:session=)
+        driver
       end
     end
 
@@ -126,7 +141,7 @@ module Capybara
       if @server and @server.error
         # Force an explanation for the error being raised as the exception cause
         begin
-          if Capybara.raise_server_errors
+          if config.raise_server_errors
             raise CapybaraError, "Your application server raised an error - It has been raised in your test code because Capybara.raise_server_errors == true"
           end
         rescue CapybaraError
@@ -235,10 +250,10 @@ module Capybara
       visit_uri = URI.parse(visit_uri.to_s)
 
       uri_base = if @server
-        visit_uri.port = @server.port if Capybara.always_include_port && (visit_uri.port == visit_uri.default_port)
-        URI.parse(Capybara.app_host || "http://#{@server.host}:#{@server.port}")
+        visit_uri.port = @server.port if config.always_include_port && (visit_uri.port == visit_uri.default_port)
+        URI.parse(config.app_host || "http://#{@server.host}:#{@server.port}")
       else
-        Capybara.app_host && URI.parse(Capybara.app_host)
+        config.app_host && URI.parse(config.app_host)
       end
 
       # TODO - this is only for compatability with previous 2.x behavior that concatenated
@@ -481,7 +496,7 @@ module Capybara
         driver.switch_to_window(window.handle)
         window
       else
-        wait_time = Capybara::Queries::BaseQuery.wait(options)
+        wait_time = Capybara::Queries::BaseQuery.wait(options, config.default_max_wait_time)
         document.synchronize(wait_time, errors: [Capybara::WindowError]) do
           original_window_handle = driver.current_window_handle
           begin
@@ -578,7 +593,7 @@ module Capybara
       old_handles = driver.window_handles
       block.call
 
-      wait_time = Capybara::Queries::BaseQuery.wait(options)
+      wait_time = Capybara::Queries::BaseQuery.wait(options, config.default_max_wait_time)
       document.synchronize(wait_time, errors: [Capybara::WindowError]) do
         opened_handles = (driver.window_handles - old_handles)
         if opened_handles.size != 1
@@ -701,7 +716,7 @@ module Capybara
     #
     def save_page(path = nil)
       path = prepare_path(path, 'html')
-      File.write(path, Capybara::Helpers.inject_asset_host(body), mode: 'wb')
+      File.write(path, Capybara::Helpers.inject_asset_host(body, config.asset_host), mode: 'wb')
       path
     end
 
@@ -786,7 +801,49 @@ module Capybara
       scope
     end
 
+    ##
+    #
+    # Yield a block using a specific wait time
+    #
+    def using_wait_time(seconds)
+      if Capybara.threadsafe
+        begin
+          previous_wait_time = config.default_max_wait_time
+          config.default_max_wait_time = seconds
+          yield
+        ensure
+          config.default_max_wait_time = previous_wait_time
+        end
+      else
+        Capybara.using_wait_time(seconds) { yield }
+      end
+    end
+
+    ##
+    #
+    #  Accepts a block to set the configuration options if Capybara.threadsafe == true. Note that some options only have an effect
+    #  if set at initialization time, so look at the configuration block that can be passed to the initializer too
+    #
+    def configure
+      raise "Session configuration is only supported when Capybara.threadsafe == true" unless Capybara.threadsafe
+      yield config
+    end
+
+    def self.instance_created?
+      @@instance_created
+    end
+
+    def config
+      @config ||= if Capybara.threadsafe
+        Capybara.session_options.dup
+      else
+        Capybara::ReadOnlySessionConfig.new(Capybara.session_options)
+      end
+    end
   private
+
+    @@instance_created = false
+
     def accept_modal(type, text_or_options, options, &blk)
       driver.accept_modal(type, modal_options(text_or_options, options), &blk)
     end
@@ -798,7 +855,7 @@ module Capybara
     def modal_options(text_or_options, options)
       text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
       options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
+      options[:wait] ||= config.default_max_wait_time
       options
     end
 
@@ -814,10 +871,10 @@ module Capybara
     end
 
     def prepare_path(path, extension)
-      if Capybara.save_path || Capybara.save_and_open_page_path.nil?
-        path = File.expand_path(path || default_fn(extension), Capybara.save_path)
+      if config.save_path || config.save_and_open_page_path.nil?
+        path = File.expand_path(path || default_fn(extension), config.save_path)
       else
-        path = File.expand_path(default_fn(extension), Capybara.save_and_open_page_path) if path.nil?
+        path = File.expand_path(default_fn(extension), config.save_and_open_page_path) if path.nil?
       end
       FileUtils.mkdir_p(File.dirname(path))
       path