capybara 3.22.0 → 3.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33bde7b48182b5c3dd5679c621882392d87bc8b9303cffabf963fe84186768b1
-  data.tar.gz: 4d9ccd2f5c45a87586f87f29f9df888af7102bf6e86042993c36ed858fc07537
+  metadata.gz: 99599c60a1bafbd60b15e476dbaff54e5692358aed4e55908a40d537ebf00194
+  data.tar.gz: 26cb00377b6c80746e29838c8a22630a90786d73fa588e0ab9b3dd09fb7de9b9
 SHA512:
-  metadata.gz: a128be647b867602954cc51cf603e020c3eceb938b5761766982a00e91fd0fccbc7aff02c49fc2c3064cdf489cc7a812c25818b5ca675ddf87c6a7a6822bd45a
-  data.tar.gz: 40d9831cc35bf0d1af71722718cea81ac2a075b5bbc067a89edb78e56572d8e0ad56455abd47b2b5ba3e0edd5b76ed4eb77de63255773e70cfd261bfa064092f
+  metadata.gz: ea61766410acfe21525a56d25d44960a3c178b4d2c210bbc1f28bcc6c925f2bcbeeb1fd821a3618f94a775d7054291b3b831e411a75a0cb1ad6dd3ca517c0e91
+  data.tar.gz: de3a8a91967058710ebc0e30953cb22ea1fae30f5475ab32599a0c088ce032cba385721fe79a84cb5f81597bfc8b230afd5dabfb8e28391c1d7102453e251832

data/History.md

@@ -1,3 +1,17 @@
+# Version 3.23.0
+Release date: 2019-06-10
+
+### Added
+
+* Improved error message when using Chrome in W3C mode and attempting to access logs
+* Support driver specific options for Element#drag_to
+* Support setting `<input type="color">` elements with the selenium driver
+
+### Fixed
+
+* Tightened conditions when in expression text option matching will be used
+* Improved Selenium drivers HTML5 drag and drop emulation compatibility with SortableJS library (and others)
+
 # Version 3.22.0
 Release date: 2019-05-29
 

data/README.md

@@ -7,7 +7,7 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jnicklas/capybara?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=capybara&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=capybara&package-manager=bundler&version-scheme=semver)
 
-**Note** You are viewing the README for the 3.22.x version of Capybara.
+**Note** You are viewing the README for the 3.23.x version of Capybara.
 
 
 Capybara helps you test web applications by simulating how a real user would
@@ -610,13 +610,23 @@ In drivers which support it, you can easily execute JavaScript:
 page.execute_script("$('body').empty()")
 ```
 
-For simple expressions, you can return the result of the script. Note
-that this may break with more complicated expressions:
+For simple expressions, you can return the result of the script.
 
 ```ruby
 result = page.evaluate_script('4 + 4');
 ```
 
+For more complicated scripts you'll need to write them as one expression.
+
+```ruby
+result = page.evaluate_script(<<~JS, 3, element)
+  (function(n, el){
+    var val = parseInt(el.value, 10);
+    return n+val;
+  })(arguments[0], arguments[1])
+JS
+```
+
 ### <a name="modals"></a>Modals
 
 In drivers which support it, you can accept, dismiss and respond to alerts, confirms and prompts.

data/lib/capybara.rb

@@ -95,7 +95,7 @@ module Capybara
     # - **server** (Symbol = `:default` (which uses puma)) - The name of the registered server to use when running the app under test.
     # - **server_errors** (Array\<Class> = `[Exception]`) - Error classes that should be raised in the tests if they are raised in the server
     #   and {configure raise_server_errors} is `true`.
-    # - **test_id** (`Symbol`, `String`, `nil` = `nil`) - Optional attribute to match locator against with built-in selectors along with id.
+    # - **test_id** (Symbol, String, `nil` = `nil`) - Optional attribute to match locator against with built-in selectors along with id.
     # - **threadsafe** (Boolean = `false`) - Whether sessions can be configured individually.
     #
     # #### DSL Options

data/lib/capybara/driver/node.rb

@@ -65,7 +65,7 @@ module Capybara
         raise NotImplementedError
       end
 
-      def drag_to(element)
+      def drag_to(element, **options)
         raise NotImplementedError
       end
 

data/lib/capybara/helpers.rb

@@ -3,7 +3,7 @@
 module Capybara
   # @api private
   module Helpers
-  module_function # rubocop:disable Layout/IndentationWidth
+  module_function
 
     ##
     # @deprecated

data/lib/capybara/node/actions.rb

@@ -61,7 +61,7 @@ module Capybara
       ##
       #
       # Locate a text field or text area and fill it in with the given text.
-      # The field can be found via its name, id, {Capybara.configure test_id} attribute, or label text.
+      # The field can be found via its name, id, {Capybara.configure test_id} attribute, placeholder, or label text.
       # If no locator is provided this will operate on self or a descendant.
       #
       #     # will fill in a descendant fillable field with name, id, or label text matching 'Name'
@@ -98,8 +98,8 @@ module Capybara
       ##
       #
       # Find a descendant radio button and mark it as checked. The radio button can be found
-      # via name, id or label text. If no locator is provided this will match against self or
-      # a descendant.
+      # via name, id, {Capybara.configure test_id} attribute or label text. If no locator is
+      # provided this will match against self or a descendant.
       #
       #     # will choose a descendant radio button with a name, id, or label text matching 'Male'
       #     page.choose('Male')
@@ -125,8 +125,8 @@ module Capybara
       ##
       #
       # Find a descendant check box and mark it as checked. The check box can be found
-      # via name, id or label text. If no locator is provided this will match against
-      # self or a descendant.
+      # via name, id, {Capybara.configure test_id} attribute, or label text. If no locator
+      # is provided this will match against self or a descendant.
       #
       #     # will check a descendant checkbox with a name, id, or label text matching 'German'
       #     page.check('German')
@@ -153,8 +153,8 @@ module Capybara
       ##
       #
       # Find a descendant check box and uncheck it. The check box can be found
-      # via name, id or label text. If no locator is provided this will match against
-      # self or a descendant.
+      # via name, id, {Capybara.configure test_id} attribute, or label text. If
+      # no locator is provided this will match against self or a descendant.
       #
       #     # will uncheck a descendant checkbox with a name, id, or label text matching 'German'
       #     page.uncheck('German')
@@ -185,7 +185,8 @@ module Capybara
       # Otherwise it finds an option inside current scope and selects it.
       # If the select box is a multiple select, {#select} can be called multiple times to select more than
       # one option.
-      # The select box can be found via its name, id or label text. The option can be found by its text.
+      # The select box can be found via its name, id, {Capybara.configure test_id} attribute, or label text.
+      # The option can be found by its text.
       #
       #     page.select 'March', from: 'Month'
       #
@@ -212,7 +213,8 @@ module Capybara
       #
       # Find a select box on the page and unselect a particular option from it. If the select
       # box is a multiple select, {#unselect} can be called multiple times to unselect more than
-      # one option. The select box can be found via its name, id or label text.
+      # one option. The select box can be found via its name, id, {Capybara.configure test_id} attribute,
+      # or label text.
       #
       #     page.unselect 'March', from: 'Month'
       #
@@ -234,8 +236,8 @@ module Capybara
       ##
       #
       # Find a descendant file field on the page and attach a file given its path. There are two ways to use
-      # {#attach_file}, in the first method the file field can be found via its name, id or label text.
-      # In the case of the file field being hidden for
+      # {#attach_file}, in the first method the file field can be found via its name, id,
+      # {Capybara.configure test_id} attribute, or label text. In the case of the file field being hidden for
       # styling reasons the `make_visible` option can be used to temporarily change the CSS of
       # the file field, attach the file, and then revert the CSS back to original. If no locator is
       # passed this will match self or a descendant.
@@ -305,12 +307,12 @@ module Capybara
         synchronize(Capybara::Queries::BaseQuery.wait(options, session_options.default_max_wait_time)) do
           begin
             find(:select, from, options)
-          rescue Capybara::ElementNotFound => select_error # _rubocop:disable Naming/RescuedExceptionsVariableName
+          rescue Capybara::ElementNotFound => select_error
             raise if %i[selected with_selected multiple].any? { |option| options.key?(option) }
 
             begin
               find(:datalist_input, from, options)
-            rescue Capybara::ElementNotFound => dlinput_error # _rubocop:disable Naming/RescuedExceptionsVariableName
+            rescue Capybara::ElementNotFound => dlinput_error
               raise Capybara::ElementNotFound, "#{select_error.message} and #{dlinput_error.message}"
             end
           end

data/lib/capybara/node/element.rb

@@ -396,10 +396,11 @@ module Capybara
       #     source.drag_to(target)
       #
       # @param [Capybara::Node::Element] node     The element to drag to
+      # @param [Hash] options  Driver specific options for dragging. May not be supported by all drivers.
       #
       # @return [Capybara::Node::Element]  The element
-      def drag_to(node)
-        synchronize { base.drag_to(node.base) }
+      def drag_to(node, **options)
+        synchronize { base.drag_to(node.base, **options) }
         self
       end
 

data/lib/capybara/queries/selector_query.rb

@@ -89,7 +89,7 @@ module Capybara
           matches_system_filters?(node) &&
           matches_node_filters?(node, node_filter_errors) &&
           matches_filter_block?(node)
-      rescue *(node.respond_to?(:session) ? node.session.driver.invalid_element_errors : []) # _rubocop:disable Naming/RescuedExceptionsVariableName
+      rescue *(node.respond_to?(:session) ? node.session.driver.invalid_element_errors : [])
         false
       end
 
@@ -154,14 +154,16 @@ module Capybara
         @selector.format
       end
 
+      def matching_text
+        options[:text] || options[:exact_text]
+      end
+
       def text_fragments
-        text = (options[:text] || options[:exact_text])
-        text.is_a?(String) ? text.split : []
+        (text = matching_text).is_a?(String) ? text.split : []
       end
 
       def xpath_text_conditions
-        text = (options[:text] || options[:exact_text])
-        case text
+        case (text = matching_text)
         when String
           text.split.map { |txt| XPath.contains(txt) }.reduce(&:&)
         when Regexp
@@ -175,9 +177,9 @@ module Capybara
 
       def try_text_match_in_expression?
         first_try? &&
-          (options[:text] || options[:exact_text]) &&
-          @resolved_node&.respond_to?(:session) &&
-          @resolved_node.session.driver.wait?
+          matching_text &&
+          @resolved_node.is_a?(Capybara::Node::Base) &&
+          @resolved_node.session&.driver&.wait?
       end
 
       def first_try?

data/lib/capybara/selector.rb

@@ -8,7 +8,7 @@ require 'capybara/selector/definition'
 # All Selectors below support the listed selector specific filters in addition to the following system-wide filters
 #   * :id (String, Regexp, XPath::Expression) - Matches the id attribute
 #   * :class (String, Array<String>, Regexp, XPath::Expression) - Matches the class(es) provided
-#   * :style (String, Regexp, Hash<String,String>) - Match on elements style
+#   * :style (String, Regexp, Hash<String, String>) - Match on elements style
 #
 # ### Built-in Selectors
 #
@@ -22,7 +22,8 @@ require 'capybara/selector/definition'
 #   * Locator: (String, Regexp, XPath::Expression) The id of the element to match
 #
 # * **:field** - Select field elements (input [not of type submit, image, or hidden], textarea, select)
-#   * Locator: Matches against the id, {Capybara.configure test_id} attribute, name, or placeholder
+#   * Locator: Matches against the id, {Capybara.configure test_id} attribute, name, placeholder, or
+#     associated label text
 #   * Filters:
 #       * :name (String) - Matches the name attribute
 #       * :placeholder (String) - Matches the placeholder attribute
@@ -41,8 +42,8 @@ require 'capybara/selector/definition'
 #       * :disabled (Boolean) - Match disabled fieldset?
 #
 # * **:link** - Find links (`<a>` elements with an href attribute)
-#   * Locator: Matches the id, {Capybara.configure test_id}, or title attributes, or the string content of the link, or the alt attribute of a contained img element.
-#     By default this selector requires a link to have an href attribute.
+#   * Locator: Matches the id, {Capybara.configure test_id}, or title attributes, or the string content of the link,
+#     or the alt attribute of a contained img element. By default this selector requires a link to have an href attribute.
 #   * Filters:
 #       * :title (String) - Matches the title attribute
 #       * :alt (String) - Matches the alt attribute of a contained img element
@@ -63,7 +64,7 @@ require 'capybara/selector/definition'
 #       * :disabled (Boolean, :all) - Match disabled buttons? (Default: false)
 #
 # * **:fillable_field** - Find text fillable fields ( textarea, input [not of type submit, image, radio, checkbox, hidden, file] )
-#   * Locator: Matches against the id, {Capybara.configure test_id} attribute, name, or placeholder
+#   * Locator: Matches against the id, {Capybara.configure test_id} attribute, name, placeholder, or associated label text
 #   * Filters:
 #       * :name (String) - Matches the name attribute
 #       * :placeholder (String) - Matches the placeholder attribute
@@ -111,7 +112,8 @@ require 'capybara/selector/definition'
 #       * :selected (Boolean) - Match selected option
 #
 # * **:datalist_input** - Find input field with datalist completion
-#   * Locator: Matches against the id, {Capybara.configure test_id} attribute, name, or placeholder
+#   * Locator: Matches against the id, {Capybara.configure test_id} attribute, name,
+#     placeholder, or associated label text
 #   * Filters:
 #       * :name (String) - Matches the name attribute
 #       * :placeholder (String) - Matches the placeholder attribute
@@ -146,17 +148,17 @@ require 'capybara/selector/definition'
 #       * :cols (Array<Array<String>>) - Match all `<td>`s - visibility of `<td>` elements is not considered
 #
 # * **:table_row** - Find table row
-#   * Locator: Array<String>, Hash<String,String> table row `<td>` contents - visibility of `<td>` elements is not considered
+#   * Locator: Array<String>, Hash<String, String> table row `<td>` contents - visibility of `<td>` elements is not considered
 #
 # * **:frame** - Find frame/iframe elements
-#   * Locator: Match id or name
+#   * Locator: Match id, {Capybara.configure test_id} attribute, or name
 #   * Filters:
 #       * :name (String) - Match name attribute
 #
 # * **:element**
 #   * Locator: Type of element ('div', 'a', etc) - if not specified defaults to '*'
 #   * Filters:
-#       * :&lt;any> (String, Regexp) - Match on any specified element attribute
+#       * :\<any> (String, Regexp) - Match on any specified element attribute
 #
 class Capybara::Selector; end
 

data/lib/capybara/selenium/driver.rb

@@ -475,3 +475,4 @@ require 'capybara/selenium/driver_specializations/chrome_driver'
 require 'capybara/selenium/driver_specializations/firefox_driver'
 require 'capybara/selenium/driver_specializations/internet_explorer_driver'
 require 'capybara/selenium/driver_specializations/safari_driver'
+require 'capybara/selenium/driver_specializations/edge_driver'

data/lib/capybara/selenium/driver_specializations/chrome_driver.rb

@@ -1,8 +1,14 @@
 # frozen_string_literal: true
 
 require 'capybara/selenium/nodes/chrome_node'
+require 'capybara/selenium/patches/logs'
 
 module Capybara::Selenium::Driver::ChromeDriver
+  def self.extended(base)
+    bridge = base.send(:bridge)
+    bridge.extend Capybara::Selenium::ChromeLogs unless bridge.respond_to?(:available_log_types)
+  end
+
   def fullscreen_window(handle)
     within_given_window(handle) do
       begin

data/lib/capybara/selenium/driver_specializations/edge_driver.rb

@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+require 'capybara/selenium/nodes/edge_node'
+
+module Capybara::Selenium::Driver::EdgeDriver
+  def fullscreen_window(handle)
+    return super if edgedriver_version < 75
+
+    within_given_window(handle) do
+      begin
+        super
+      rescue NoMethodError => e
+        raise unless e.message.match?(/full_screen_window/)
+
+        result = bridge.http.call(:post, "session/#{bridge.session_id}/window/fullscreen", {})
+        result['value']
+      end
+    end
+  end
+
+  def resize_window_to(handle, width, height)
+    super
+  rescue Selenium::WebDriver::Error::UnknownError => e
+    raise unless e.message.match?(/failed to change window state/)
+
+    # Chromedriver doesn't wait long enough for state to change when coming out of fullscreen
+    # and raises unnecessary error. Wait a bit and try again.
+    sleep 0.25
+    super
+  end
+
+  def reset!
+    return super if edgedriver_version < 75
+    # Use instance variable directly so we avoid starting the browser just to reset the session
+    return unless @browser
+
+    switch_to_window(window_handles.first)
+    window_handles.slice(1..-1).each { |win| close_window(win) }
+
+    timer = Capybara::Helpers.timer(expire_in: 10)
+    begin
+      @browser.navigate.to('about:blank')
+      clear_storage unless uniform_storage_clear?
+      wait_for_empty_page(timer)
+    rescue *unhandled_alert_errors
+      accept_unhandled_reset_alert
+      retry
+    end
+
+    execute_cdp('Storage.clearDataForOrigin', origin: '*', storageTypes: storage_types_to_clear)
+  end
+
+  def download_path=(path)
+    if @browser.respond_to?(:download_path=)
+      @browser.download_path = path
+    else
+      # Not yet implemented in seleniun-webdriver for edge so do it ourselves
+      execute_cdp('Page.setDownloadBehavior', behavior: 'allow', downloadPath: path)
+    end
+  end
+
+private
+
+  def storage_types_to_clear
+    types = ['cookies']
+    types << 'local_storage' if clear_all_storage?
+    types.join(',')
+  end
+
+  def clear_all_storage?
+    options.values_at(:clear_session_storage, :clear_local_storage).none? { |s| s == false }
+  end
+
+  def uniform_storage_clear?
+    clear = options.values_at(:clear_session_storage, :clear_local_storage)
+    clear.all? { |s| s == false } || clear.none? { |s| s == false }
+  end
+
+  def clear_storage
+    # Chrome errors if attempt to clear storage on about:blank
+    # In W3C mode it crashes chromedriver
+    url = current_url
+    super unless url.nil? || url.start_with?('about:')
+  end
+
+  def delete_all_cookies
+    return super if edgedriver_version < 75
+
+    execute_cdp('Network.clearBrowserCookies')
+  rescue *cdp_unsupported_errors
+    # If the CDP clear isn't supported do original limited clear
+    super
+  end
+
+  def cdp_unsupported_errors
+    @cdp_unsupported_errors ||= [Selenium::WebDriver::Error::WebDriverError]
+  end
+
+  def execute_cdp(cmd, params = {})
+    args = { cmd: cmd, params: params }
+    result = bridge.http.call(:post, "session/#{bridge.session_id}/goog/cdp/execute", args)
+    result['value']
+  end
+
+  def build_node(native_node, initial_cache = {})
+    ::Capybara::Selenium::EdgeNode.new(self, native_node, initial_cache)
+  end
+
+  def bridge
+    browser.send(:bridge)
+  end
+
+  def edgedriver_version
+    @edgedriver_version ||= begin
+      caps = browser.capabilities
+      caps['chrome']&.fetch('chromedriverVersion', nil).to_f
+    end
+  end
+end
+
+Capybara::Selenium::Driver.register_specialization :edge, Capybara::Selenium::Driver::EdgeDriver
+Capybara::Selenium::Driver.register_specialization :edge_chrome, Capybara::Selenium::Driver::EdgeDriver

data/lib/capybara/selenium/extensions/html5_drag.rb

@@ -2,25 +2,20 @@
 
 class Capybara::Selenium::Node
   module Html5Drag
-  # Implement methods to emulate HTML5 drag and drop
+    # Implement methods to emulate HTML5 drag and drop
 
-  private # rubocop:disable Layout/IndentationWidth
-
-    def html5_drag_to(element)
+    def drag_to(element, delay: 0.05)
       driver.execute_script MOUSEDOWN_TRACKER
       scroll_if_needed { browser_action.click_and_hold(native).perform }
-      if driver.evaluate_script('window.capybara_mousedown_prevented')
+      if driver.evaluate_script('window.capybara_mousedown_prevented || !arguments[0].draggable', self)
         element.scroll_if_needed { browser_action.move_to(element.native).release.perform }
       else
-        driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
+        driver.evaluate_async_script HTML5_DRAG_DROP_SCRIPT, self, element, delay * 1000
         browser_action.release.perform
       end
     end
 
-    def html5_draggable?
-      # Workaround https://github.com/SeleniumHQ/selenium/issues/6396
-      native.property('draggable')
-    end
+  private
 
     def html5_drop(*args)
       if args[0].is_a? String
@@ -92,9 +87,6 @@ class Capybara::Selenium::Node
     JS
 
     HTML5_DRAG_DROP_SCRIPT = <<~JS
-      var source = arguments[0];
-      var target = arguments[1];
-
       function rectCenter(rect){
         return new DOMPoint(
           (rect.left + rect.right)/2,
@@ -133,6 +125,44 @@ class Capybara::Selenium::Node
         return new DOMPoint(pt.x,pt.y);
       }
 
+      function dragEnterTarget() {
+        target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
+        var targetRect = target.getBoundingClientRect();
+        var sourceCenter = rectCenter(source.getBoundingClientRect());
+
+        // fire 2 dragover events to simulate dragging with a direction
+        var entryPoint = pointOnRect(sourceCenter, targetRect)
+        var dragOverOpts = Object.assign({clientX: entryPoint.x, clientY: entryPoint.y}, opts);
+        var dragOverEvent = new DragEvent('dragover', dragOverOpts);
+        target.dispatchEvent(dragOverEvent);
+        window.setTimeout(dragOnTarget, step_delay);
+      }
+
+      function dragOnTarget() {
+        var targetCenter = rectCenter(target.getBoundingClientRect());
+        var dragOverOpts = Object.assign({clientX: targetCenter.x, clientY: targetCenter.y}, opts);
+        var dragOverEvent = new DragEvent('dragover', dragOverOpts);
+        target.dispatchEvent(dragOverEvent);
+        window.setTimeout(dragLeave, step_delay, dragOverEvent.defaultPrevented);
+      }
+
+      function dragLeave(drop) {
+        var dragLeaveEvent = new DragEvent('dragleave', opts);
+        target.dispatchEvent(dragLeaveEvent);
+        if (drop) {
+          var dropEvent = new DragEvent('drop', opts);
+          target.dispatchEvent(dropEvent);
+        }
+        var dragEndEvent = new DragEvent('dragend', opts);
+        source.dispatchEvent(dragEndEvent);
+        callback.call(true);
+      }
+
+      var source = arguments[0],
+          target = arguments[1],
+          step_delay = arguments[2],
+          callback = arguments[3];
+
       var dt = new DataTransfer();
       var opts = { cancelable: true, bubbles: true, dataTransfer: dt };
 
@@ -147,29 +177,8 @@ class Capybara::Selenium::Node
 
       var dragEvent = new DragEvent('dragstart', opts);
       source.dispatchEvent(dragEvent);
-      target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
-      var targetRect = target.getBoundingClientRect();
-      var sourceCenter = rectCenter(source.getBoundingClientRect());
-
-      // fire 2 dragover events to simulate dragging with a direction
-      var entryPoint = pointOnRect(sourceCenter, targetRect)
-      var dragOverOpts = Object.assign({clientX: entryPoint.x, clientY: entryPoint.y}, opts);
-      var dragOverEvent = new DragEvent('dragover', dragOverOpts);
-      target.dispatchEvent(dragOverEvent);
-
-      var targetCenter = rectCenter(targetRect);
-      dragOverOpts = Object.assign({clientX: targetCenter.x, clientY: targetCenter.y}, opts);
-      dragOverEvent = new DragEvent('dragover', dragOverOpts);
-      target.dispatchEvent(dragOverEvent);
-
-      var dragLeaveEvent = new DragEvent('dragleave', opts);
-      target.dispatchEvent(dragLeaveEvent);
-      if (dragOverEvent.defaultPrevented) {
-        var dropEvent = new DragEvent('drop', opts);
-        target.dispatchEvent(dropEvent);
-      }
-      var dragEndEvent = new DragEvent('dragend', opts);
-      source.dispatchEvent(dragEndEvent);
+
+      window.setTimeout(dragEnterTarget, step_delay);
     JS
   end
 end

data/lib/capybara/selenium/node.rb

@@ -74,6 +74,8 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
         set_time(value)
       when 'datetime-local'
         set_datetime_local(value)
+      when 'color'
+        set_color(value)
       else
         set_text(value, options)
       end
@@ -130,7 +132,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     scroll_if_needed { browser_action.move_to(native).perform }
   end
 
-  def drag_to(element)
+  def drag_to(element, **)
     # Due to W3C spec compliance - The Actions API no longer scrolls to elements when necessary
     # which means Seleniums `drag_and_drop` is now broken - do it manually
     scroll_if_needed { browser_action.click_and_hold(native).perform }
@@ -281,6 +283,10 @@ private
     update_value_js(value.to_datetime_str)
   end
 
+  def set_color(value) # rubocop:disable Naming/AccessorMethodName
+    update_value_js(value)
+  end
+
   def update_value_js(value)
     driver.execute_script(<<-JS, self, value)
       if (arguments[0].readOnly) { return };

data/lib/capybara/selenium/nodes/chrome_node.rb

@@ -21,19 +21,13 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
         }
       JS
     end
-    super(value)
+    super
   rescue *file_errors => e
     raise ArgumentError, "Selenium < 3.14 with remote Chrome doesn't support multiple file upload" if e.message.match?(/File not found : .+\n.+/m)
 
     raise
   end
 
-  def drag_to(element)
-    return super unless html5_draggable?
-
-    html5_drag_to(element)
-  end
-
   def drop(*args)
     html5_drop(*args)
   end

data/lib/capybara/selenium/nodes/edge_node.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'capybara/selenium/extensions/html5_drag'
+
+class Capybara::Selenium::EdgeNode < Capybara::Selenium::Node
+  include Html5Drag
+
+  def set_text(value, clear: nil, **_unused)
+    return super unless chrome_edge?
+
+    super.tap do
+      # React doesn't see the chromedriver element clear
+      send_keys(:space, :backspace) if value.to_s.empty? && clear.nil?
+    end
+  end
+
+  def set_file(value) # rubocop:disable Naming/AccessorMethodName
+    # In Chrome 75+ files are appended (due to WebDriver spec - why?) so we have to clear here if its multiple and already set
+    if chrome_edge?
+      driver.execute_script(<<~JS, self)
+        if (arguments[0].multiple && (arguments[0].files.length > 0)){
+          arguments[0].value = null;
+        }
+      JS
+    end
+    super
+  rescue *file_errors => e
+    raise ArgumentError, "Selenium < 3.14 with remote Chrome doesn't support multiple file upload" if e.message.match?(/File not found : .+\n.+/m)
+
+    raise
+  end
+
+  def drop(*args)
+    return super unless chrome_edge?
+
+    html5_drop(*args)
+  end
+
+  # def click(*)
+  #   super
+  # rescue ::Selenium::WebDriver::Error::WebDriverError => e
+  #   # chromedriver 74 (at least on mac) raises the wrong error for this
+  #   raise ::Selenium::WebDriver::Error::ElementClickInterceptedError, e.message if e.message.match?(/element click intercepted/)
+  #
+  #   raise
+  # end
+
+  def disabled?
+    return super unless chrome_edge?
+
+    driver.evaluate_script("arguments[0].matches(':disabled, select:disabled *')", self)
+  end
+
+  def select_option
+    return super unless chrome_edge?
+
+    # To optimize to only one check and then click
+    selected_or_disabled = driver.evaluate_script(<<~JS, self)
+      arguments[0].matches(':disabled, select:disabled *, :checked')
+    JS
+    click unless selected_or_disabled
+  end
+
+private
+
+  def file_errors
+    @file_errors = ::Selenium::WebDriver.logger.suppress_deprecations do
+      [::Selenium::WebDriver::Error::ExpectedError]
+    end
+  end
+
+  def bridge
+    driver.browser.send(:bridge)
+  end
+
+  def browser_version
+    @browser_version ||= begin
+      caps = driver.browser.capabilities
+      (caps[:browser_version] || caps[:version]).to_f
+    end
+  end
+
+  def chrome_edge?
+    browser_version >= 75
+  end
+end

data/lib/capybara/selenium/nodes/firefox_node.rb

@@ -46,12 +46,6 @@ class Capybara::Selenium::FirefoxNode < Capybara::Selenium::Node
     _send_keys(args).perform
   end
 
-  def drag_to(element)
-    return super unless (browser_version >= 62.0) && html5_draggable?
-
-    html5_drag_to(element)
-  end
-
   def drop(*args)
     html5_drop(*args)
   end

data/lib/capybara/selenium/patches/atoms.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module CapybaraAtoms
-private # rubocop:disable Layout/IndentationWidth
+private
 
   def read_atom(function)
     @atoms ||= Hash.new do |hash, key|

data/lib/capybara/selenium/patches/logs.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Capybara
+  module Selenium
+    module ChromeLogs
+      LOG_MSG = <<~MSG
+        Chromedriver 75+ defaults to W3C mode. The W3C webdriver spec does not define methods for accessing \
+        logs or log types. If you need to access the logs, in the short term, you can configure you driver to not use the W3C mode. \
+        It is unknown how long non-W3C mode will be supported by chromedriver (it won't be supported by selenium-webdriver 4+) \
+        so you may need to consider other solutions in the near future.
+      MSG
+
+      def method_missing(meth, *) # rubocop:disable Style/MissingRespondToMissing
+        raise NotImplementedError, LOG_MSG if %i[available_log_types log].include? meth
+
+        super
+      end
+    end
+  end
+end

data/lib/capybara/server/checker.rb

@@ -12,7 +12,7 @@ module Capybara
 
       def request(&block)
         ssl? ? https_request(&block) : http_request(&block)
-      rescue *TRY_HTTPS_ERRORS # _rubocop:disable Naming/RescuedExceptionsVariableName
+      rescue *TRY_HTTPS_ERRORS
         res = https_request(&block)
         @ssl = true
         res

data/lib/capybara/session.rb

@@ -736,9 +736,7 @@ module Capybara
     # @param [Hash] options   a customizable set of options
     #
     def save_and_open_screenshot(path = nil, **options)
-      # rubocop:disable Lint/Debugger
-      save_screenshot(path, options).tap { |s_path| open_file(s_path) }
-      # rubocop:enable Lint/Debugger
+      save_screenshot(path, options).tap { |s_path| open_file(s_path) } # rubocop:disable Lint/Debugger
     end
 
     def document

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

@@ -34,4 +34,16 @@ Capybara::SpecHelper.spec '#evaluate_script', requires: [:js] do
     expect(el).to be_instance_of(Capybara::Node::Element)
     expect(el).to eq(@session.find(:css, '#change'))
   end
+
+  it 'should support multi statement via IIFE' do
+    @session.visit('/with_js')
+    @session.find(:css, '#change')
+    el = @session.evaluate_script(<<~JS)
+      (function(){
+        var el = document.getElementById('change');
+        return el;
+      })()
+    JS
+    expect(el).to eq(@session.find(:css, '#change'))
+  end
 end

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

@@ -89,6 +89,12 @@ Capybara::SpecHelper.spec '#fill_in' do
     expect(extract_results(@session)['description']).to eq("\r\nSome text\r\n")
   end
 
+  it 'should fill in a color field' do
+    @session.fill_in('Html5 Color', with: '#112233')
+    @session.click_button('html5_submit')
+    expect(extract_results(@session)['html5_color']).to eq('#112233')
+  end
+
   it 'should fill in a field with a custom type' do
     @session.fill_in('Schmooo', with: 'Schmooo is the game')
     @session.click_button('awesome')

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

@@ -461,6 +461,16 @@ Capybara::SpecHelper.spec 'node' do
         link.drag_to target
         expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped")]')
       end
+
+      it 'should work with SortableJS' do
+        @session.visit('/with_sortable_js')
+        @session.within(:css, '#sortable') do
+          src = @session.find('div', text: 'Item 1')
+          target = @session.find('div', text: 'Item 3')
+          src.drag_to target
+          expect(@session).to have_content(/Item 3.*Item 1/, normalize_ws: true)
+        end
+      end
     end
   end
 
@@ -774,6 +784,18 @@ Capybara::SpecHelper.spec 'node' do
       expect(el).to be_instance_of(Capybara::Node::Element)
       expect(el).to eq(change)
     end
+
+    it 'should support multiple statements via IIFE' do
+      @session.visit('/with_js')
+      change = @session.find(:css, '#change') # ensure page has loaded and element is available
+      res = change.evaluate_script(<<~JS, 3)
+        (function(n){
+          var el = this;
+          return [el, n];
+        }).apply(this, arguments)
+      JS
+      expect(res).to eq [change, 3]
+    end
   end
 
   describe '#evaluate_async_script', requires: %i[js es_args] do

data/lib/capybara/spec/session/window/window_spec.rb

@@ -130,11 +130,12 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
       other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
-      other_window.resize_to(600, 300)
+
+      other_window.resize_to(600, 400)
       expect(@session.current_window).to eq(orig_window)
 
       @session.within_window(other_window) do
-        expect(@session.current_window.size).to eq([600, 300])
+        expect(@session.current_window.size).to eq([600, 400])
       end
     end
   end

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

@@ -0,0 +1,21 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>with_sortable_js</title>
+    <script src="https://sortablejs.github.io/Sortable/Sortable.js" type="text/javascript"></script>
+  </head>
+
+  <body id="with_sortable_js">
+    <div id="sortable">
+      <div class="item1">Item 1</div>
+      <div class="item2">Item 2</div>
+      <div class="item3">Item 3</div>
+      <div class="item4">Item 4</div>
+      <div class="item5">Item 5</div>
+    </div>
+    <script>
+      new Sortable(document.getElementById("sortable"));
+    </script>
+  </body>
+</html>
+

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.22.0'
+  VERSION = '3.23.0'
 end

data/lib/capybara/window.rb

@@ -49,7 +49,7 @@ module Capybara
     # @return [Boolean] whether this window is the window in which commands are being executed
     def current?
       @driver.current_window_handle == @handle
-    rescue @driver.no_such_window_error # _rubocop:disable Naming/RescuedExceptionsVariableName
+    rescue @driver.no_such_window_error
       false
     end
 

data/spec/selenium_spec_chrome.rb

@@ -8,11 +8,11 @@ require 'rspec/shared_spec_matchers'
 
 CHROME_DRIVER = :selenium_chrome
 
-Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV['CI'] && ENV['W3C']
+Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV['CI'] && ENV['CHROME_BETA']
 
 browser_options = ::Selenium::WebDriver::Chrome::Options.new
 browser_options.headless! if ENV['HEADLESS']
-browser_options.add_option(:w3c, !!ENV['W3C'])
+browser_options.add_option(:w3c, ENV['W3C'] != 'false')
 
 Capybara.register_driver :selenium_chrome do |app|
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options, timeout: 30).tap do |driver|
@@ -121,4 +121,20 @@ RSpec.describe 'Capybara::Session with chrome' do
       expect(session).to have_current_path('/form')
     end
   end
+
+  describe 'log access' do
+    before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
+
+    it 'errors when getting log types' do
+      expect do
+        session.driver.browser.manage.logs.available_types
+      end.to raise_error(NotImplementedError, /Chromedriver 75\+ defaults to W3C mode/)
+    end
+
+    it 'errors when getting logs' do
+      expect do
+        session.driver.browser.manage.logs.get(:browser)
+      end.to raise_error(NotImplementedError, /Chromedriver 75\+ defaults to W3C mode/)
+    end
+  end
 end

data/spec/selenium_spec_edge.rb

@@ -6,24 +6,34 @@ require 'shared_selenium_session'
 require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
+Selenium::WebDriver::Edge::Service.driver_path = '/usr/local/bin/msedgedriver'
+Selenium::WebDriver::EdgeChrome.path = '/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary'
+
 Capybara.register_driver :selenium_edge do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
-  Capybara::Selenium::Driver.new(app, browser: :edge)
+  Capybara::Selenium::Driver.new(app, browser: :edge_chrome).tap do |driver|
+    driver.browser
+    driver.download_path = Capybara.save_path
+  end
 end
 
 module TestSessions
   SeleniumEdge = Capybara::Session.new(:selenium_edge, TestApp)
 end
 
-skipped_tests = %i[response_headers status_code trigger modals]
+skipped_tests = %i[response_headers status_code trigger]
 
 Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Edge) if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::SeleniumEdge, 'selenium', capybara_skip: skipped_tests do |example|
-  case example.metadata[:description]
-  when /#refresh it reposts$/
-    skip 'Edge insists on prompting without providing a way to suppress'
-  end
+  # case example.metadata[:description]
+  # when /#refresh it reposts$/
+  #   skip 'Edge insists on prompting without providing a way to suppress'
+  # when /should be able to open non-http url/
+  #   skip 'Crashes'
+  # when /when Capybara.always_include_port is true/
+  #   skip 'Crashes'
+  # end
 end
 
 RSpec.describe 'Capybara::Session with Edge', capybara_skip: skipped_tests do

data/spec/shared_selenium_session.rb

@@ -41,6 +41,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
 
       it 'should have return code 1 when running selenium_driver_rspec_failure.rb' do
         skip 'only setup for local non-headless' if headless_or_remote?
+        skip 'Not setup for edge' if edge?(session)
 
         system(env, 'rspec spec/fixtures/selenium_driver_rspec_failure.rb', out: File::NULL, err: File::NULL)
         expect($CHILD_STATUS.exitstatus).to eq(1)
@@ -48,6 +49,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
 
       it 'should have return code 0 when running selenium_driver_rspec_success.rb' do
         skip 'only setup for local non-headless' if headless_or_remote?
+        skip 'Not setup for edge' if edge?(session)
 
         system(env, 'rspec spec/fixtures/selenium_driver_rspec_success.rb', out: File::NULL, err: File::NULL)
         expect($CHILD_STATUS.exitstatus).to eq(0)
@@ -309,8 +311,9 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         pending "Selenium remote doesn't support transferring a directory" if remote?(session)
         pending "Headless Chrome doesn't support directory upload - https://bugs.chromium.org/p/chromedriver/issues/detail?id=2521&q=directory%20upload&colspec=ID%20Status%20Pri%20Owner%20Summary" if chrome?(session) && ENV['HEADLESS']
         pending "IE doesn't support uploading a directory" if ie?(session)
-        pending 'Chrome/chromedriver 73 breaks this' if chrome?(session) && !chrome_lt?(73, session)
+        pending 'Chrome/chromedriver 73 breaks this' if chrome?(session) && chrome_gte?(73, session) && chrome_lt?(75, session)
         pending "Safari doesn't support uploading a directory" if safari?(session)
+        # pending "Edge/msedgedriver doesn't support directory upload" if edge?(session) && edge_gte?(75, session)
 
         session.visit('/form')
         test_file_dir = File.expand_path('./fixtures', File.dirname(__FILE__))

data/spec/spec_helper.rb

@@ -32,18 +32,35 @@ module Capybara
       browser_name(session) == :chrome
     end
 
+    def chrome_version(session)
+      (session.driver.browser.capabilities[:browser_version] ||
+        session.driver.browser.capabilities[:version]).to_f
+    end
+
     def chrome_lt?(version, session)
-      chrome?(session) && (session.driver.browser.capabilities[:version].to_f < version)
+      chrome?(session) && (chrome_version(session) < version)
     end
 
     def chrome_gte?(version, session)
-      chrome?(session) && (session.driver.browser.capabilities[:version].to_f >= version)
+      chrome?(session) && (chrome_version(session) >= version)
     end
 
     def edge?(session)
+      browser_name(session).match?(/^edge/)
+    end
+
+    def legacy_edge?(session)
       browser_name(session) == :edge
     end
 
+    def edge_lt?(version, session)
+      edge?(session) && (chrome_version(session) < version)
+    end
+
+    def edge_gte?(version, session)
+      edge?(session) && (chrome_version(session) >= version)
+    end
+
     def ie?(session)
       %i[internet_explorer ie].include?(browser_name(session))
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.22.0
+  version: 3.23.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -510,6 +510,7 @@ files:
 - lib/capybara/selenium/atoms/src/isDisplayed.js
 - lib/capybara/selenium/driver.rb
 - lib/capybara/selenium/driver_specializations/chrome_driver.rb
+- lib/capybara/selenium/driver_specializations/edge_driver.rb
 - lib/capybara/selenium/driver_specializations/firefox_driver.rb
 - lib/capybara/selenium/driver_specializations/internet_explorer_driver.rb
 - lib/capybara/selenium/driver_specializations/safari_driver.rb
@@ -519,10 +520,12 @@ files:
 - lib/capybara/selenium/logger_suppressor.rb
 - lib/capybara/selenium/node.rb
 - lib/capybara/selenium/nodes/chrome_node.rb
+- lib/capybara/selenium/nodes/edge_node.rb
 - lib/capybara/selenium/nodes/firefox_node.rb
 - lib/capybara/selenium/nodes/ie_node.rb
 - lib/capybara/selenium/nodes/safari_node.rb
 - lib/capybara/selenium/patches/atoms.rb
+- lib/capybara/selenium/patches/logs.rb
 - lib/capybara/selenium/patches/pause_duration_fix.rb
 - lib/capybara/selenium/patches/persistent_client.rb
 - lib/capybara/server.rb
@@ -665,6 +668,7 @@ files:
 - lib/capybara/spec/views/with_scope_other.erb
 - lib/capybara/spec/views/with_simple_html.erb
 - lib/capybara/spec/views/with_slow_unload.erb
+- lib/capybara/spec/views/with_sortable_js.erb
 - lib/capybara/spec/views/with_title.erb
 - lib/capybara/spec/views/with_unload_alert.erb
 - lib/capybara/spec/views/with_windows.erb