capybara 2.15.4 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b58346a93d1b784ad960451eea0e16c2cdb5264a
-  data.tar.gz: 6386e073e35c61290e7fdf77353d06f1b887af08
+SHA256:
+  metadata.gz: ee26f641aae1c298d4f5c3d7e8a98376c133c1e2d6ac90b3a3a274ae0dddd13f
+  data.tar.gz: 12a92103cb8b03439ba345d2433385d5d8ec698713c1fda8d8d496c1d7a5db4a
 SHA512:
-  metadata.gz: 5bf103e7ee612aa2ba02f530d77c7cd01430d43df2ac4221a40b8b415e1ccf7f41df84d3ea6795f6629f9d019521169a868dce350c26f4c65d764e92c743f13e
-  data.tar.gz: e94720fb414e4715748628717a13270372e3e1f1238fb8d36e8811d0060782f86a1ff851fdb1b1e78e8624cd4e3d5c6cb72b6de7af5a5b9276bf4098e15e0717
+  metadata.gz: b63bffec8f36f684af468659992edc8368844838a7f92f0cacaca2cfb070c8d5d62baebc6308dc60bac7646a0e4a7221eca416014cbdc2a0f82ce189dedc1172
+  data.tar.gz: 26d2d8319225c85ef3ea5c1c546f321a92063adcf08a97ed1e530782e7af18aa9c7b2e8c59faaac2bf02c5a3d0d7d37d82a124dc1a0472605296745fe26f2ca8

data/History.md

@@ -1,3 +1,19 @@
+# Version 2.16.0
+Release date: 2017-11-13
+
+### Added
+
+* Attempt to move element into view when selenium doesn't correctly do it - See PR #1917 [Thomas Walpole]
+* `current_path` matchers will now autodetect path vs url based on string to be matched. Deprecates
+  `:only_path` in favor of `:ignore_query` option [Thomas Walpole]
+* Session#evaluate_async_script [Thomas Walpole]
+
+### Fixed
+
+* Default prompt value when using headless Chrome works correctly [Thomas Walpole]
+* Support new modal error returned by selenium-webdriver 3.7 for W3C drivers [Thomas Walpole]
+* Calling `respond_to?` on the object passed to `Capybara.configure` block - Issue #1935
+
 # Version 2.15.4
 Release date: 2017-10-07
 
@@ -235,7 +251,7 @@ Release date: 2016-09-19
 
 Release date: 2016-08-25
 
-###Fixed
+### Fixed
 
 * Fixed error message from have_text when text is not found but contains regex special characters [Ryunosuke Sato]
 * Warn when :exact option is passed that has no effect [Thomas Walpole]

data/README.md

@@ -549,7 +549,7 @@ If you find yourself needing to use this a lot you may be better off adding a [c
 ```ruby
 find_field('First Name'){ |el| el['data-xyz'] == '123' }
 find("#img_loading"){ |img| img['complete'] == true }
-````
+```
 
 **Note**: `find` will wait for an element to appear on the page, as explained in the
 Ajax section. If the element does not appear it will raise an error.
@@ -894,7 +894,7 @@ To permanently switch the current session to a different session
 
 ```ruby
 Capybara.session_name = "some other session"
-````
+```
 
 ### <a name="using-sessions-manually"></a>Using sessions manually
 
@@ -1053,7 +1053,9 @@ In normal mode most of Capybara's configuration options are global settings whic
 if using multiple sessions and wanting to change a setting for only one of the sessions.  To provide
 support for this type of usage Capybara now provides a "threadsafe" mode which can be enabled by setting
 
-    Capybara.threadsafe = true
+```ruby
+Capybara.threadsafe = true
+```
 
 This setting can only be changed before any sessions have been created.  In "threadsafe" mode the following
 behaviors of Capybara change
@@ -1063,11 +1065,13 @@ behaviors of Capybara change
   `app`, `reuse_server`, `default_driver`, `javascript_driver`, and (obviously) `threadsafe`.  Any drivers and servers
   registered through `register_driver` and `register_server` are also global.
 
-      my_session = Capybara::Session.new(:driver, some_app) do |config|
-        config.automatic_label_click = true # only set for my_session
-      end
-      my_session.config.default_max_wait_time = 10 # only set for my_session
-      Capybara.default_max_wait_time = 2 # will not change the default_max_wait in my_session
+  ```ruby
+  my_session = Capybara::Session.new(:driver, some_app) do |config|
+    config.automatic_label_click = true # only set for my_session
+  end
+  my_session.config.default_max_wait_time = 10 # only set for my_session
+  Capybara.default_max_wait_time = 2 # will not change the default_max_wait in my_session
+  ```
 
 * `current_driver` and `session_name` are thread specific.  This means that `using_session` and
   `using_driver` also only affect the current thread.

data/lib/capybara/config.rb

@@ -108,6 +108,7 @@ module Capybara
     end
   end
 
+  # @api private
   class ConfigureDeprecator
     def initialize(config)
       @config = config
@@ -125,7 +126,7 @@ module Capybara
     end
 
     def respond_to_missing?(m, include_private = false)
-      @config.respond_to_missing?(m, include_private) || Capybara.respond_to_missing?(m, include_private)
+      @config.respond_to?(m) || Capybara.respond_to?(m) || super
     end
   end
 end

data/lib/capybara/driver/base.rb

@@ -42,6 +42,10 @@ class Capybara::Driver::Base
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#evaluate_script'
   end
 
+  def evaluate_async_script(script, *args)
+    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#evaluate_script_asnyc'
+  end
+
   def save_screenshot(path, options={})
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#save_screenshot'
   end

data/lib/capybara/minitest/spec.rb

@@ -8,13 +8,13 @@ module Capybara
         infect_an_assertion "refute_#{assertion}", "wont_have_#{assertion}", :reverse
       end
 
-      (%w(selector xpath css link button field select table checked_field unchecked_field).map do |assertion|
+      (%w(selector xpath css link button field select table checked_field unchecked_field).flat_map do |assertion|
         [["assert_#{assertion}", "must_have_#{assertion}"],
          ["refute_#{assertion}", "wont_have_#{assertion}"]]
-      end.flatten(1) + %w(selector xpath css).map do |assertion|
+      end + %w(selector xpath css).flat_map do |assertion|
         [["assert_matches_#{assertion}", "must_match_#{assertion}"],
          ["refute_matches_#{assertion}", "wont_match_#{assertion}"]]
-      end.flatten(1)).each do |(meth, new_name)|
+      end).each do |(meth, new_name)|
         self.class_eval <<-EOM, __FILE__, __LINE__ + 1
           def #{new_name} *args, &block
             ::Minitest::Expectation.new(self, ::Minitest::Spec.current).#{new_name}(*args, &block)

data/lib/capybara/node/actions.rb

@@ -5,8 +5,8 @@ module Capybara
 
       ##
       #
-      # Finds a button or link by id, text or value and clicks it. Also looks at image
-      # alt text inside the link.
+      # Finds a button or link and clicks it.  See {Capybara::Node::Actions#click_button} and
+      # {Capybara::Node::Actions#click_link} for what locator will match against for each type of element
       # @!macro waiting_behavior
       #   If the driver is capable of executing JavaScript, +$0+ will wait for a set amount of time
       #   and continuously retry finding the element until either the element is found or the time
@@ -16,7 +16,7 @@ module Capybara
       #
       # @overload click_link_or_button([locator], options)
       #
-      #   @param [String] locator      Text, id or value of link or button
+      #   @param [String] locator      See {Capybara::Node::Actions#click_button} and {Capybara::Node::Actions#click_link}
       #
       # @return [Capybara::Node::Element]  The element clicked
       #
@@ -80,7 +80,7 @@ module Capybara
       #   @option options [String] :id             Match fields that match the id attribute
       #   @option options [String] :name           Match fields that match the name attribute
       #   @option options [String] :placeholder    Match fields that match the placeholder attribute
-      #   @option options [String, Array<String>] :class    Match links that match the class(es) provided
+      #   @option options [String, Array<String>] :class    Match fields that match the class(es) provided
       #
       # @return [Capybara::Node::Element]  The element filled_in
       def fill_in(locator, options={})
@@ -108,7 +108,7 @@ module Capybara
       #   @option options [String] :option  Value of the radio_button to choose
       #   @option options [String] :id             Match fields that match the id attribute
       #   @option options [String] :name           Match fields that match the name attribute
-      #   @option options [String, Array<String>] :class    Match links that match the class(es) provided
+      #   @option options [String, Array<String>] :class    Match fields that match the class(es) provided
       #   @macro waiting_behavior
       #   @macro label_click
       #
@@ -131,7 +131,7 @@ module Capybara
       #   @option options [String] :option  Value of the checkbox to select
       #   @option options [String] id       Match fields that match the id attribute
       #   @option options [String] name     Match fields that match the name attribute
-      #   @option options [String, Array<String>] :class    Match links that match the class(es) provided
+      #   @option options [String, Array<String>] :class    Match fields that match the class(es) provided
       #   @macro label_click
       #   @macro waiting_behavior
       #
@@ -154,7 +154,7 @@ module Capybara
       #   @option options [String] :option  Value of the checkbox to deselect
       #   @option options [String] id       Match fields that match the id attribute
       #   @option options [String] name     Match fields that match the name attribute
-      #   @option options [String, Array<String>] :class    Match links that match the class(es) provided
+      #   @option options [String, Array<String>] :class    Match fields that match the class(es) provided
       #   @macro label_click
       #   @macro waiting_behavior
       #
@@ -229,7 +229,7 @@ module Capybara
       # @option options [Boolean] multiple Match field which allows multiple file selection
       # @option options [String] id             Match fields that match the id attribute
       # @option options [String] name           Match fields that match the name attribute
-      # @option options [String, Array<String>] :class    Match links that match the class(es) provided
+      # @option options [String, Array<String>] :class    Match fields that match the class(es) provided
       # @option options [true, Hash] make_visible   A Hash of CSS styles to change before attempting to attach the file, if `true` { opacity: 1, display: 'block', visibility: 'visible' } is used (may not be supported by all drivers)
       #
       # @return [Capybara::Node::Element]  The file field element

data/lib/capybara/node/finders.rb

@@ -171,7 +171,7 @@ module Capybara
       #   @option options [String] id                 Match buttons with the id provided
       #   @option options [String] title              Match buttons with the title provided
       #   @option options [String] value              Match buttons with the value provided
-      #   @option options [String, Array<String>] class    Match links that match the class(es) provided
+      #   @option options [String, Array<String>] class    Match buttons that match the class(es) provided
       # @return [Capybara::Node::Element]   The found element
       #
       def find_button(locator=nil, options={}, &optional_filter_block)

data/lib/capybara/queries/current_path_query.rb

@@ -8,22 +8,25 @@ module Capybara
       def initialize(expected_path, options = {})
         super(options)
         @expected_path = expected_path
+        warn "DEPRECATED: The :only_path option is deprecated in favor of the :ignore_query option" if options.has_key?(:only_path)
+
         @options = {
-          url: false,
-          only_path: false }.merge(options)
+          url: !@expected_path.is_a?(Regexp) && !::Addressable::URI.parse(@expected_path || "").hostname.nil?,
+          only_path: false,
+          ignore_query: false }.merge(options)
         assert_valid_keys
       end
 
       def resolves_for?(session)
+        uri = ::Addressable::URI.parse(session.current_url)
+        uri.query = nil if uri && options[:ignore_query]
         @actual_path = if options[:url]
-          session.current_url
+          uri.to_s
         else
-          uri = ::Addressable::URI.parse(session.current_url)
-
           if options[:only_path]
-            uri.path unless uri.nil? # Ensure the parsed url isn't nil.
+            uri && uri.path
           else
-            uri.request_uri unless uri.nil? # Ensure the parsed url isn't nil.
+            uri && uri.request_uri
           end
         end
 
@@ -50,7 +53,7 @@ module Capybara
       end
 
       def valid_keys
-        [:wait, :url, :only_path]
+        [:wait, :url, :only_path, :ignore_query]
       end
 
       def assert_valid_keys

data/lib/capybara/queries/selector_query.rb

@@ -17,7 +17,6 @@ module Capybara
         if args[0].is_a?(Symbol)
           @selector = Selector.all.fetch(args.shift) do |selector_type|
             raise ArgumentError, "Unknown selector type (:#{selector_type})"
-            nil
           end
           @locator = args.shift
         else
@@ -26,7 +25,7 @@ module Capybara
         end
         @selector ||= Selector.all[session_options.default_selector]
 
-        warn "Unused parameters passed to #{self.class.name} : #{args.to_s}" unless args.empty?
+        warn "Unused parameters passed to #{self.class.name} : #{args}" unless args.empty?
 
         # for compatibility with Capybara 2.0
         if session_options.exact_options and @selector == Selector.all[:option]
@@ -235,7 +234,7 @@ module Capybara
 
       def warn_exact_usage
         if options.has_key?(:exact) && !supports_exact?
-          warn "The :exact option only has an effect on queries using the XPath#is method. Using it with the query \"#{expression.to_s}\" has no effect."
+          warn "The :exact option only has an effect on queries using the XPath#is method. Using it with the query \"#{expression}\" has no effect."
         end
       end
 

data/lib/capybara/queries/text_query.rb

@@ -16,7 +16,7 @@ module Capybara
           @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?
+        warn "Unused parameters passed to #{self.class.name} : #{args}" unless args.empty?
         assert_valid_keys
       end
 

data/lib/capybara/selenium/driver.rb

@@ -24,7 +24,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
       @w3c = ((defined?(Selenium::WebDriver::Remote::W3CCapabilities) && @browser.capabilities.is_a?(Selenium::WebDriver::Remote::W3CCapabilities)) ||
               (defined?(Selenium::WebDriver::Remote::W3C::Capabilities) && @browser.capabilities.is_a?(Selenium::WebDriver::Remote::W3C::Capabilities)))
-
       main = Process.pid
       at_exit do
         # Store the exit status of the test run since it goes away after calling the at_exit proc...
@@ -114,6 +113,12 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     unwrap_script_result(result)
   end
 
+  def evaluate_async_script(script, *args)
+    browser.manage.timeouts.script_timeout = Capybara.default_max_wait_time
+    result = browser.execute_async_script(script, *args.map { |arg| arg.is_a?(Capybara::Selenium::Node) ? arg.native : arg} )
+    unwrap_script_result(result)
+  end
+
   def save_screenshot(path, _options={})
     browser.save_screenshot(path)
   end
@@ -164,7 +169,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
         begin
           @browser.switch_to.alert.accept
           sleep 0.25 # allow time for the modal to be handled
-        rescue Selenium::WebDriver::Error::NoAlertPresentError
+        rescue modal_error
           # The alert is now gone - nothing to do
         end
         # try cleaning up the browser again
@@ -246,13 +251,15 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   def accept_modal(_type, options={})
     if headless_chrome?
       raise ArgumentError, "Block that triggers the system modal is missing" unless block_given?
-      insert_modal_handlers(true, options[:with], options[:text])
+      insert_modal_handlers(true, options[:with])
       yield
       find_headless_modal(options)
     else
       yield if block_given?
       modal = find_modal(options)
+
       modal.send_keys options[:with] if options[:with]
+
       message = modal.text
       modal.accept
       message
@@ -262,7 +269,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   def dismiss_modal(_type, options={})
     if headless_chrome?
       raise ArgumentError, "Block that triggers the system modal is missing" unless block_given?
-      insert_modal_handlers(false, options[:with], options[:text])
+      insert_modal_handlers(false, options[:with])
       yield
       find_headless_modal(options)
     else
@@ -342,6 +349,14 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     options[:browser].to_s
   end
 
+  def modal_error
+    if defined?(Selenium::WebDriver::Error::NoSuchAlertError)
+      Selenium::WebDriver::Error::NoSuchAlertError
+    else
+      Selenium::WebDriver::Error::NoAlertPresentError
+    end
+  end
+
   def find_window(locator)
     handles = browser.window_handles
     return locator if handles.include? locator
@@ -359,7 +374,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     raise Capybara::ElementNotFound, "Could not find a window identified by #{locator}"
   end
 
-  def insert_modal_handlers(accept, response_text, expected_text=nil)
+  def insert_modal_handlers(accept, response_text)
     script = <<-JS
       if (typeof window.capybara  === 'undefined') {
         window.capybara = {
@@ -391,13 +406,13 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       }
       window.capybara.add_handler(modal_handler);
 
-      window.alert = window.confirm = function(str) {
-        window.capybara.handler_called(modal_handler, str);
+      window.alert = window.confirm = function(str = "") {
+        window.capybara.handler_called(modal_handler, str.toString());
         return #{accept ? 'true' : 'false'};
-      };
-      window.prompt = function(str) {
-        window.capybara.handler_called(modal_handler, str);
-        return #{accept ? "'#{response_text}'" : 'null'};
+      }
+      window.prompt = function(str = "", default_text = "") {
+        window.capybara.handler_called(modal_handler, str.toString());
+        return #{accept ? (response_text.nil? ? "default_text" : "'#{response_text}'") : 'null'};
       }
     JS
     execute_script script
@@ -420,7 +435,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     # Actual wait time may be longer than specified
     wait = Selenium::WebDriver::Wait.new(
       timeout: options.fetch(:wait, session_options.default_max_wait_time) || 0 ,
-      ignore: Selenium::WebDriver::Error::NoAlertPresentError)
+      ignore: modal_error)
     begin
       wait.until do
         alert = @browser.switch_to.alert
@@ -437,7 +452,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     # Actual wait time may be longer than specified
     wait = Selenium::WebDriver::Wait.new(
       timeout: options.fetch(:wait, session_options.default_max_wait_time) || 0 ,
-      ignore: Selenium::WebDriver::Error::NoAlertPresentError)
+      ignore: modal_error)
     begin
       wait.until do
         called, alert_text = evaluate_script('window.capybara && window.capybara.current_modal_status()')

data/lib/capybara/selenium/node.rb

@@ -100,6 +100,15 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
 
   def click
     native.click
+  rescue => e
+    if e.is_a?(::Selenium::WebDriver::Error::ElementClickInterceptedError) ||
+       e.message =~ /Other element would receive the click/
+      begin
+        driver.execute_script("arguments[0].scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'})", self)
+      rescue
+      end
+    end
+    raise e
   end
 
   def right_click

data/lib/capybara/session.rb

@@ -642,6 +642,24 @@ module Capybara
       element_script_result(result)
     end
 
+    ##
+    #
+    # Evaluate the given JavaScript and obtain the result from a callback function which will be passed as the last argument to the script.
+    #
+    # @param  [String] script   A string of JavaScript to evaluate
+    # @return [Object]          The result of the evaluated JavaScript (may be driver specific)
+    #
+    def evaluate_async_script(script, *args)
+      @touched = true
+      result = if args.empty?
+        driver.evaluate_async_script(script)
+      else
+        raise Capybara::NotSupportedByDriverError, "The current driver does not support evaluate_async_script arguments" if driver.method(:evaluate_async_script).arity == 1
+        driver.evaluate_async_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ?  arg.base : arg} )
+      end
+      element_script_result(result)
+    end
+
     ##
     #
     # Execute the block, accepting a alert.

data/lib/capybara/session/matchers.rb

@@ -3,16 +3,18 @@ module Capybara
   module SessionMatchers
     ##
     # Asserts that the page has the given path.
-    # By default this will compare against the path+query portion of the full url
+    # By default, if passed a full url this will compare against the full url,
+    # if passed a path only the path+query portion will be compared, if passed a regexp
+    # the comparison will depend on the :url option
     #
     # @!macro current_path_query_params
     #   @overload $0(string, options = {})
     #     @param string [String]           The string that the current 'path' should equal
     #   @overload $0(regexp, options = {})
     #     @param regexp [Regexp]           The regexp that the current 'path' should match to
-    #   @option options [Numeric] :wait (Capybara.default_max_wait_time) Maximum time that Capybara will wait for the current path to eq/match given string/regexp argument
-    #   @option options [Boolean] :url  (false)  Whether the compare should be done against the full url
-    #   @option options [Boolean] :only_path (false)  Whether the compare should be done against just the path protion of the url
+    #   @option options [Boolean] :url (true if `string` ia a full url, otherwise false) Whether the compare should be done against the full current url or just the path
+    #   @option options [Boolean] :ignore_query (false)  Whether the query portion of the current url/path should be ignored
+    #   @option options [Numeric] :wait (Capybara.default_max_wait_time) Maximum time that Capybara will wait for the current url/path to eq/match given string/regexp argument
     # @raise [Capybara::ExpectationNotMet] if the assertion hasn't succeeded during wait time
     # @return [true]
     #
@@ -22,7 +24,9 @@ module Capybara
 
     ##
     # Asserts that the page doesn't have the given path.
-    # By default this will compare against the path+query portion of the full url
+    # By default, if passed a full url this will compare against the full url,
+    # if passed a path only the path+query portion will be compared, if passed a regexp
+    # the comparison will depend on the :url option
     #
     # @macro current_path_query_params
     # @raise [Capybara::ExpectationNotMet] if the assertion hasn't succeeded during wait time
@@ -34,7 +38,9 @@ module Capybara
 
     ##
     # Checks if the page has the given path.
-    # By default this will compare against the path+query portion of the full url
+    # By default, if passed a full url this will compare against the full url,
+    # if passed a path only the path+query portion will be compared, if passed a regexp
+    # the comparison will depend on the :url option
     #
     # @macro current_path_query_params
     # @return [Boolean]
@@ -47,7 +53,9 @@ module Capybara
 
     ##
     # Checks if the page doesn't have the given path.
-    # By default this will compare against the path+query portion of the full url
+    # By default, if passed a full url this will compare against the full url,
+    # if passed a path only the path+query portion will be compared, if passed a regexp
+    # the comparison will depend on the :url option
     #
     # @macro current_path_query_params
     # @return [Boolean]

data/lib/capybara/spec/public/test.js

@@ -109,6 +109,14 @@ $(function() {
       $(this).attr('response', response);
     }
   });
+  $('#open-prompt-with-default').click(function() {
+    var response = prompt('Prompt opened', 'Default value!');
+    if(response === null) {
+      $(this).attr('response', 'dismissed');
+    } else {
+      $(this).attr('response', response);
+    }
+  });
   $('#open-twice').click(function() {
     if (confirm('Are you sure?')) {
       if (!confirm('Are you really sure?')) {

data/lib/capybara/spec/session/accept_prompt_spec.rb

@@ -11,6 +11,13 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
     expect(@session).to have_xpath("//a[@id='open-prompt' and @response='']")
   end
 
+  it "should accept the prompt with no message when there is a default" do
+    @session.accept_prompt do
+      @session.click_link('Open defaulted prompt')
+    end
+    expect(@session).to have_xpath("//a[@id='open-prompt-with-default' and @response='Default value!']")
+  end
+
   it "should return the message presented" do
     message = @session.accept_prompt do
       @session.click_link('Open prompt')
@@ -25,6 +32,21 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
     expect(@session).to have_xpath("//a[@id='open-prompt' and @response='the response']")
   end
 
+  it "should accept the prompt with a response when there is a default" do
+    @session.accept_prompt with: 'the response' do
+      @session.click_link('Open defaulted prompt')
+    end
+    expect(@session).to have_xpath("//a[@id='open-prompt-with-default' and @response='the response']")
+  end
+
+  it "should accept the prompt with a blank response when there is a default" do
+    pending "Geckodriver doesn't set a blank response currently" if @session.respond_to?(:mode) && @session.mode.to_s == "selenium_marionette"
+    @session.accept_prompt with: '' do
+      @session.click_link('Open defaulted prompt')
+    end
+    expect(@session).to have_xpath("//a[@id='open-prompt-with-default' and @response='']")
+  end
+
   it "should accept the prompt if the message matches" do
     @session.accept_prompt 'Prompt opened', with: 'matched' do
       @session.click_link('Open prompt')

data/lib/capybara/spec/session/evaluate_async_script_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+Capybara::SpecHelper.spec "#evaluate_async_script", requires: [:js] do
+  it "should evaluate the given script and return whatever it produces" do
+    @session.visit('/with_js')
+    expect(@session.evaluate_async_script("arguments[0](4)")).to eq(4)
+  end
+
+  it "should support passing elements as arguments to the script", requires: [:js, :es_args] do
+    @session.visit('/with_js')
+    el = @session.find(:css, '#drag p')
+    result = @session.evaluate_async_script("arguments[2]([arguments[0].innerText, arguments[1]])", el, "Doodle Funk")
+    expect(result).to eq ["This is a draggable element.", "Doodle Funk"]
+  end
+
+  it "should support returning elements after asynchronous operation", requires: [:js, :es_args] do
+    @session.visit('/with_js')
+    @session.find(:css, '#change') # ensure page has loaded and element is available
+    el = @session.evaluate_async_script("var cb = arguments[0]; setTimeout(function(){ cb(document.getElementById('change')) }, 100)")
+    expect(el).to be_instance_of(Capybara::Node::Element)
+    expect(el).to eq(@session.find(:css, '#change'))
+  end
+end

data/lib/capybara/spec/session/evaluate_script_spec.rb

@@ -20,7 +20,7 @@ Capybara::SpecHelper.spec "#evaluate_script", requires: [:js] do
 
   it "should support returning elements", requires: [:js, :es_args] do
     @session.visit('/with_js')
-    el = @session.find(:css, '#change')
+    @session.find(:css, '#change') # ensure page has loaded and element is available
     el = @session.evaluate_script("document.getElementById('change')")
     expect(el).to be_instance_of(Capybara::Node::Element)
     expect(el).to eq(@session.find(:css, '#change'))

data/lib/capybara/spec/session/has_current_path_spec.rb

@@ -37,20 +37,47 @@ Capybara::SpecHelper.spec '#has_current_path?' do
     expect(@session).to have_current_path('/with_js?test=test')
   end
 
-  it "should compare the full url" do
+  it "should compare the full url if url: true is used" do
     expect(@session).to have_current_path(%r{\Ahttp://[^/]*/with_js\Z}, url: true)
+    domain_port = if @session.respond_to?(:server) && @session.server
+      "#{@session.server.host}:#{@session.server.port}"
+    else
+      "www.example.com"
+    end
+    expect(@session).to have_current_path("http://#{domain_port}/with_js", url: true)
+  end
+
+  it "should not compare the full url if url: true is not passed" do
+    expect(@session).to have_current_path(%r{^/with_js\Z})
+    expect(@session).to have_current_path('/with_js')
+  end
+
+  it "should not compare the full url if url: false is passed" do
+    expect(@session).to have_current_path(%r{^/with_js\Z}, url: false)
+    expect(@session).to have_current_path('/with_js', url: false)
+  end
+
+  it "should default to full url if value is a url" do
+    url = @session.current_url
+    expect(url).to match /with_js$/
+    expect(@session).to have_current_path(url)
+    expect(@session).not_to have_current_path("http://www.not_example.com/with_js")
   end
 
   it "should ignore the query" do
     @session.visit('/with_js?test=test')
     expect(@session).to have_current_path('/with_js?test=test')
     expect(@session).to have_current_path('/with_js', only_path: true)
+    expect(@session).to have_current_path('/with_js', ignore_query: true)
+    uri = ::Addressable::URI.parse(@session.current_url)
+    uri.query = nil
+    expect(@session).to have_current_path(uri.to_s, ignore_query: true)
   end
 
   it "should not allow url and only_path at the same time" do
     expect {
       expect(@session).to have_current_path('/with_js', url: true, only_path: true)
-      }. to raise_error ArgumentError
+    }.to raise_error ArgumentError
   end
 
   it "should not raise an exception if the current_url is nil" do
@@ -59,12 +86,17 @@ Capybara::SpecHelper.spec '#has_current_path?' do
     # Without only_path option
     expect {
       expect(@session).to have_current_path(nil)
-    }. not_to raise_exception
+    }.not_to raise_exception
 
     # With only_path option
     expect {
       expect(@session).to have_current_path(nil, only_path: true)
-    }. not_to raise_exception
+    }.not_to raise_exception
+
+    # With ignore_query option
+    expect {
+      expect(@session).to have_current_path(nil, ignore_query: true)
+    }.not_to raise_exception
   end
 end
 
@@ -105,5 +137,10 @@ Capybara::SpecHelper.spec '#has_no_current_path?' do
     expect {
       expect(@session).not_to have_current_path('/with_js', only_path: true)
     }. not_to raise_exception
+
+    # With ignore_query option
+    expect {
+      expect(@session).not_to have_current_path('/with_js', ignore_query: true)
+    }. not_to raise_exception
   end
 end

data/lib/capybara/spec/views/with_fixed_header_footer.erb

@@ -0,0 +1,17 @@
+<html>
+<head>
+  <style>
+    header { height: 45px; position: fixed; top: 0; background-color: red; width: 100%;}
+    footer { height: 45px; position: fixed; bottom: 0; background-color: red; width: 100%;}
+    #main { margin: 45px;}
+    #tall { display: block; height: 2000px;}
+  </style>
+</head>
+<body>
+  <header>My headers</header>
+    <div id="main">
+      <div id="tall">A tall block</div>
+      <a href="/">Go to root</a>
+    </div>
+  <footer>My footer</footer>
+</body>

data/lib/capybara/spec/views/with_js.erb

@@ -96,6 +96,10 @@
       <a href="#" id="open-prompt">Open prompt</a>
     </p>
 
+    <p>
+      <a href="#" id="open-prompt-with-default">Open defaulted prompt</a>
+    </p>
+
     <p>
       <input id="disable-on-click"/>
     </p>

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.15.4'
+  VERSION = '2.16.0'
 end

data/spec/selenium_spec_marionette.rb

@@ -14,7 +14,7 @@ Capybara.register_driver :selenium_marionette do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    desired_capabilities: {:marionette => true},
+    desired_capabilities: {marionette: true, 'moz:webdriverClick': true},
     options: browser_options
     # Get a trace level log from geckodriver
     # :driver_opts => { args: ['-vv'] }
@@ -55,7 +55,7 @@ end
 
 RSpec.describe Capybara::Selenium::Driver do
   before do
-    @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox)
+    @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox, options: browser_options)
   end
 
   describe '#quit' do

data/spec/shared_selenium_session.rb

@@ -61,7 +61,7 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
         skip "Headless Chrome doesn't support blockless modal methods" if @session.driver.send(:headless_chrome?)
         @session.click_link('Open alert')
         @session.accept_alert
-        expect{@session.driver.browser.switch_to.alert}.to raise_error(Selenium::WebDriver::Error::NoAlertPresentError)
+        expect{@session.driver.browser.switch_to.alert}.to raise_error(@session.driver.send(:modal_error))
       end
 
       it "raises if block is missing" do
@@ -180,6 +180,17 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
           }
         })
       end
+
+      describe "#evaluate_async_script" do
+        it "will timeout if the script takes too long" do
+          @session.visit('/with_js')
+          expect do
+            @session.using_wait_time(1) do
+              @session.evaluate_async_script("var cb = arguments[0]; setTimeout(function(){ cb(null) }, 3000)")
+            end
+          end.to raise_error Selenium::WebDriver::Error::ScriptTimeoutError
+        end
+      end
     end
 
     describe "Element#inspect" do
@@ -191,5 +202,17 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
         expect(el.inspect).to eq "Obsolete #<Capybara::Node::Element>"
       end
     end
+
+    describe "Element#click" do
+      it "should handle fixed headers/footers" do
+        if mode == :selenium_marionette && !(ENV['TRAVIS_ALLOW_FAILURE']=='true')
+          pending "geckodriver/firefox/marionette just fail to click without reporting an error - no way for us to detect/catch"
+        end
+        @session.visit('/with_fixed_header_footer')
+        # @session.click_link('Go to root')
+        @session.find(:link, 'Go to root').click
+        expect(@session).to have_current_path('/')
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.15.4
+  version: 2.16.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -376,6 +376,7 @@ files:
 - lib/capybara/spec/session/element/match_css_spec.rb
 - lib/capybara/spec/session/element/match_xpath_spec.rb
 - lib/capybara/spec/session/element/matches_selector_spec.rb
+- lib/capybara/spec/session/evaluate_async_script_spec.rb
 - lib/capybara/spec/session/evaluate_script_spec.rb
 - lib/capybara/spec/session/execute_script_spec.rb
 - lib/capybara/spec/session/fill_in_spec.rb
@@ -447,6 +448,7 @@ files:
 - lib/capybara/spec/views/tables.erb
 - lib/capybara/spec/views/with_base_tag.erb
 - lib/capybara/spec/views/with_count.erb
+- lib/capybara/spec/views/with_fixed_header_footer.erb
 - lib/capybara/spec/views/with_hover.erb
 - lib/capybara/spec/views/with_html.erb
 - lib/capybara/spec/views/with_html_entities.erb
@@ -506,7 +508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,