capybara 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c416e36d54b64d622c2a65481f5f60b3ca81618e8b8288accebe3d1aca55083
-  data.tar.gz: dc271c3d46f477b3b9930647a55ec826bd477bc5c3b371fa39b3e02bbc916284
+  metadata.gz: 1f61329ea428004635c5d6768afcdc61fcc22a2dd3a4cb0f14bde2d3b05102cb
+  data.tar.gz: d9d3de632455c5a3a8eecbef2c2fccc7b8d301bb589dcd7a5a21c719e639a5f5
 SHA512:
-  metadata.gz: c7e961f7131054a93ba9213e9a258f163e99f5a9484e6ba6ea1a2868ac0db435967e64bab16d382d5db04b6a485582c05da82bf4fb94b9f6403ca333b3c82a27
-  data.tar.gz: f8b5c7a34e33813e687ba31a9e4eee74ede985e725d1755093eab20a0d3a30e6ceb7cb05529403cb42ea3e0b77cea52db3b9b43ab61c697ba2e57a312dd5f49b
+  metadata.gz: 79e61c8494174a8006f158dc0b26d143a14525e4c0e77b4a1b5148f7f46c79207d4d5d89d0f5ef6f3ed3a8374bf2b54e915160770c6c254147c9aea52da48bf1
+  data.tar.gz: b329ae727a2c0d47903f9c992e8acd9e7e26e3bb280751fb8f681cb67c29650ad11d002ad9bfae627c1e767a00483e97a74667e564d4cec0bae2c529afc27452

data/History.md

@@ -1,3 +1,12 @@
+# Version 3.6.0
+Release date: 2018-08-14
+
+### Added
+
+* Workaround geckodriver/firefox send_keys issues as much as possible using the Selenium actions API
+* Workaround lack of HTML5 native drag and drop events when using Selenium driver with Chrome and FF >= 62
+* `Capybara.predicates_wait` option which sets whether or not Capybaras matcher predicate methods (`has_css?`, `has_selector?`, `has_text?`, etc.) default to using waiting/retrying behavior (defaults to true)
+
 # Version 3.5.1
 Release date: 2018-08-03
 

data/README.md

@@ -7,7 +7,7 @@
 [![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 development version of Capybara.  If you are using the current release version
-you can find the README at https://github.com/teamcapybara/capybara/blob/3.5_stable/README.md
+you can find the README at https://github.com/teamcapybara/capybara/blob/3.6_stable/README.md
 
 
 Capybara helps you test web applications by simulating how a real user would
@@ -389,9 +389,20 @@ See the section on adding and configuring drivers.
 
 Capybara supports [Selenium 3.5+
 (Webdriver)](https://www.seleniumhq.org/projects/webdriver/).
-In order to use Selenium, you'll need to install the`selenium-webdriver` gem,
+In order to use Selenium, you'll need to install the `selenium-webdriver` gem,
 and add it to your Gemfile if you're using bundler.
 
+Capybara pre-registers a number of named drives that use Selenium - they are:
+
+  * :selenium                 => Selenium driving Firefox
+  * :selenium_chrome          => Selenium driving Chrome
+  * :selenium_chrome_headless => Selenium driving Chrome in a headless configuration
+
+These should work (with relevant software installation) in a local desktop configuration but you may
+need to customize them if using in a CI environment where additional options may need to be passed
+to the browsers.  See the section on adding and configuring drivers.
+
+
 **Note**: drivers which run the server in a different thread may not share the
 same transaction as your tests, causing data not to be shared between your test
 and test server, see "Transactions and database setup" below.
@@ -1000,6 +1011,7 @@ end
 However, it's also possible to give this configuration a different name.
 
 ```ruby
+# Note: Capybara registers this by default
 Capybara.register_driver :selenium_chrome do |app|
   Capybara::Selenium::Driver.new(app, :browser => :chrome)
 end

data/lib/capybara.rb

@@ -84,6 +84,7 @@ module Capybara
     # [server = Symbol]  The name of the registered server to use when running the app under test (Default: :webrick)
     # [default_set_options = Hash]  The default options passed to Node::set (Default: {})
     # [test_id = Symbol/String/nil] Optional attribute to match locator aginst with builtin selectors along with id (Default: nil)
+    # [predicates_wait = Boolean]  Whether Capybaras predicate matchers use waiting behavior by default (Default: true)
     #
     # === DSL Options
     #
@@ -484,6 +485,7 @@ Capybara.configure do |config|
   config.reuse_server = true
   config.default_set_options = {}
   config.test_id = nil
+  config.predicates_wait = true
 end
 
 Capybara.register_driver :rack_test do |app|

data/lib/capybara/driver/base.rb

@@ -159,6 +159,12 @@ class Capybara::Driver::Base
   end
 
   def session_options
-    @session&.config || Capybara.session_options
+    session&.config || Capybara.session_options
+  end
+
+private
+
+  def session
+    @session ||= nil
   end
 end

data/lib/capybara/node/document.rb

@@ -20,8 +20,8 @@ module Capybara
       #
       # @return [String]    The text of the document
       #
-      def text(type = nil)
-        find(:xpath, '/html').text(type)
+      def text(type = nil, normalize_ws: false)
+        find(:xpath, '/html').text(type, normalize_ws: normalize_ws)
       end
 
       ##

data/lib/capybara/node/document_matchers.rb

@@ -38,9 +38,7 @@ module Capybara
       # @return [Boolean]
       #
       def has_title?(title, **options)
-        assert_title(title, options)
-      rescue Capybara::ExpectationNotMet
-        false
+        make_predicate(options) { assert_title(title, options) }
       end
 
       ##
@@ -50,9 +48,7 @@ module Capybara
       # @return [Boolean]
       #
       def has_no_title?(title, **options)
-        assert_no_title(title, options)
-      rescue Capybara::ExpectationNotMet
-        false
+        make_predicate(options) { assert_no_title(title, options) }
       end
 
     private

data/lib/capybara/node/element.rb

@@ -53,9 +53,10 @@ module Capybara
       # @param type [:all, :visible]  Whether to return only visible or all text
       # @return [String]              The text of the element
       #
-      def text(type = nil)
+      def text(type = nil, normalize_ws: false)
         type ||= :all unless session_options.ignore_hidden_elements || session_options.visible_text_only
-        synchronize { type == :all ? base.all_text : base.visible_text }
+        t = synchronize { type == :all ? base.all_text : base.visible_text }
+        normalize_ws ? t.gsub(/[[:space:]]+/, ' ').strip : t
       end
 
       ##

data/lib/capybara/node/matchers.rb

@@ -36,10 +36,8 @@ module Capybara
       # @option args [Range]   :between (nil)   Range of times that should contain number of times text occurs
       # @return [Boolean]                       If the expression exists
       #
-      def has_selector?(*args, &optional_filter_block)
-        assert_selector(*args, &optional_filter_block)
-      rescue Capybara::ExpectationNotMet
-        false
+      def has_selector?(*args, **options, &optional_filter_block)
+        make_predicate(options) { assert_selector(*args, options, &optional_filter_block) }
       end
 
       ##
@@ -50,10 +48,8 @@ module Capybara
       # @param (see Capybara::Node::Finders#has_selector?)
       # @return [Boolean]
       #
-      def has_no_selector?(*args, &optional_filter_block)
-        assert_no_selector(*args, &optional_filter_block)
-      rescue Capybara::ExpectationNotMet
-        false
+      def has_no_selector?(*args, **options, &optional_filter_block)
+        make_predicate(options) { assert_no_selector(*args, options, &optional_filter_block) }
       end
 
       ##
@@ -66,9 +62,7 @@ module Capybara
       # @return [Boolean]                       If the styles match
       #
       def has_style?(styles, **options)
-        assert_style(styles, **options)
-      rescue Capybara::ExpectationNotMet
-        false
+        make_predicate(options) { assert_style(styles, options) }
       end
 
       ##
@@ -554,10 +548,8 @@ module Capybara
       # @param (see Capybara::Node::Finders#has_selector?)
       # @return [Boolean]
       #
-      def matches_selector?(*args, &optional_filter_block)
-        assert_matches_selector(*args, &optional_filter_block)
-      rescue Capybara::ExpectationNotMet
-        false
+      def matches_selector?(*args, **options, &optional_filter_block)
+        make_predicate(options) { assert_matches_selector(*args, options, &optional_filter_block) }
       end
 
       ##
@@ -590,10 +582,8 @@ module Capybara
       # @param (see Capybara::Node::Finders#has_selector?)
       # @return [Boolean]
       #
-      def not_matches_selector?(*args, &optional_filter_block)
-        assert_not_matches_selector(*args, &optional_filter_block)
-      rescue Capybara::ExpectationNotMet
-        false
+      def not_matches_selector?(*args, **options, &optional_filter_block)
+        make_predicate(options) { assert_not_matches_selector(*args, options, &optional_filter_block) }
       end
 
       ##
@@ -683,10 +673,8 @@ module Capybara
       # @macro text_query_params
       # @return [Boolean]                            Whether it exists
       #
-      def has_text?(*args)
-        assert_text(*args)
-      rescue Capybara::ExpectationNotMet
-        false
+      def has_text?(*args, **options)
+        make_predicate(options) { assert_text(*args, options) }
       end
       alias_method :has_content?, :has_text?
 
@@ -697,10 +685,8 @@ module Capybara
       # @macro text_query_params
       # @return [Boolean]  Whether it doesn't exist
       #
-      def has_no_text?(*args)
-        assert_no_text(*args)
-      rescue Capybara::ExpectationNotMet
-        false
+      def has_no_text?(*args, **options)
+        make_predicate(options) { assert_no_text(*args, options) }
       end
       alias_method :has_no_content?, :has_no_text?
 
@@ -745,6 +731,13 @@ module Capybara
         query_options[:session_options] = session_options
         query_args.push(query_options)
       end
+
+      def make_predicate(options)
+        options[:wait] = 0 unless options.key?(:wait) || session_options.predicates_wait
+        yield
+      rescue Capybara::ExpectationNotMet
+        false
+      end
     end
   end
 end

data/lib/capybara/node/simple.rb

@@ -28,8 +28,9 @@ module Capybara
       #
       # @return [String]    The text of the element
       #
-      def text(_type = nil)
-        native.text
+      def text(_type = nil, normalize_ws: false)
+        t = native.text
+        normalize_ws ? t.gsub(/[[:space:]]+/, ' ').strip : t
       end
 
       ##

data/lib/capybara/queries/text_query.rb

@@ -5,12 +5,7 @@ module Capybara
   module Queries
     class TextQuery < BaseQuery
       def initialize(type = nil, expected_text, session_options:, **options) # rubocop:disable Style/OptionalArguments
-        @type = if type.nil?
-          Capybara.ignore_hidden_elements || Capybara.visible_text_only ? :visible : :all
-        else
-          type
-        end
-
+        @type = type.nil? ? default_type : type
         @expected_text = expected_text.is_a?(Regexp) ? expected_text : expected_text.to_s
         @options = options
         super(@options)
@@ -23,8 +18,7 @@ module Capybara
 
       def resolve_for(node)
         @node = node
-        @actual_text = text(node, @type)
-        @actual_text.gsub!(/[[:space:]]+/, ' ').strip! if options[:normalize_ws]
+        @actual_text = text
         @count = @actual_text.scan(@search_regexp).size
       end
 
@@ -74,7 +68,7 @@ module Capybara
       end
 
       def invisible_message
-        invisible_text = text(@node, :all)
+        invisible_text = text(query_type: :all)
         invisible_count = invisible_text.scan(@search_regexp).size
         return if invisible_count == @count
         "it was found #{invisible_count} #{Capybara::Helpers.declension('time', 'times', invisible_count)} including non-visible text"
@@ -95,8 +89,12 @@ module Capybara
         !@expected_text.is_a?(Regexp)
       end
 
-      def text(node, query_type)
-        node.text(query_type)
+      def text(node: @node, query_type: @type)
+        node.text(query_type, normalize_ws: options[:normalize_ws])
+      end
+
+      def default_type
+        Capybara.ignore_hidden_elements || Capybara.visible_text_only ? :visible : :all
       end
     end
   end

data/lib/capybara/rack_test/driver.rb

@@ -16,7 +16,6 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
 
   def initialize(app, **options)
     raise ArgumentError, 'rack-test requires a rack application, but none was given' unless app
-    @session = nil
     @app = app
     @options = DEFAULT_OPTIONS.merge(options)
   end

data/lib/capybara/selenium/driver.rb

@@ -46,7 +46,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def initialize(app, **options)
     self.class.load_selenium
-    @session = nil
     @app = app
     @browser = nil
     @exit_status = nil

data/lib/capybara/selenium/node.rb

@@ -47,7 +47,6 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   #   Array => an array of keys to send before the value being set, e.g. [[:command, 'a'], :backspace]
   def set(value, **options)
     raise ArgumentError, "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}" if value.is_a?(Array) && !multiple?
-
     case tag_name
     when 'input'
       case self[:type]
@@ -212,17 +211,17 @@ private
     elsif clear == :backspace
       # Clear field by sending the correct number of backspace keys.
       backspaces = [:backspace] * self.value.to_s.length
-      native.send_keys(*([:end] + backspaces + [value.to_s]))
+      send_keys(*([:end] + backspaces + [value.to_s]))
     elsif clear == :none
-      native.send_keys(value.to_s)
+      send_keys(value.to_s)
     elsif clear.is_a? Array
-      native.send_keys(*clear, value.to_s)
+      send_keys(*clear, value.to_s)
     else
       # Clear field by JavaScript assignment of the value property.
       # Script can change a readonly element which user input cannot, so
       # don't execute if readonly.
       driver.execute_script "arguments[0].value = ''", self
-      native.send_keys(value.to_s)
+      send_keys(value.to_s)
     end
   end
 

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

@@ -10,9 +10,38 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
     raise
   end
 
+  def drag_to(element)
+    return super unless self[:draggable] == 'true'
+
+    scroll_if_needed { driver.browser.action.click_and_hold(native).perform }
+    driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
+  end
+
 private
 
   def bridge
     driver.browser.send(:bridge)
   end
+
+  HTML5_DRAG_DROP_SCRIPT = <<~JS
+    var source = arguments[0];
+    var target = arguments[1];
+
+    var dt = new DataTransfer();
+    var opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+
+    var dragEvent = new DragEvent('dragstart', opts);
+    source.dispatchEvent(dragEvent);
+    target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
+    var dragOverEvent = new DragEvent('dragover', opts);
+    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);
+  JS
 end

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

@@ -14,7 +14,7 @@ class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
 
   def disabled?
     # Not sure exactly what version of FF fixed the below issue, but it is definitely fixed in 61+
-    return super unless driver.browser.capabilities[:browser_version].to_f < 61.0
+    return super unless browser_version < 61.0
 
     return true if super
     # workaround for selenium-webdriver/geckodriver reporting elements as enabled when they are nested in disabling elements
@@ -27,7 +27,7 @@ class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
 
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
     native.clear # By default files are appended so we have to clear here
-    return super if driver.browser.capabilities[:browser_version].to_f >= 62.0
+    return super if browser_version >= 62.0
 
     # Workaround lack of support for multiple upload by uploading one at a time
     path_names = value.to_s.empty? ? [] : value
@@ -42,8 +42,58 @@ class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
     end
   end
 
+  def send_keys(*args)
+    # https://github.com/mozilla/geckodriver/issues/846
+    return super(*args.map { |arg| arg == :space ? ' ' : arg }) if args.none? { |s| s.is_a? Array }
+
+    native.click
+    actions = driver.browser.action
+    args.each do |keys|
+      _send_keys(keys, actions)
+    end
+    actions.perform
+  end
+
+  def drag_to(element)
+    return super unless (browser_version >= 62.0) && (self[:draggable] == 'true')
+
+    scroll_if_needed { driver.browser.action.click_and_hold(native).perform }
+    driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
+  end
+
 private
 
+  def _send_keys(keys, actions, down_keys = nil)
+    case keys
+    when String
+      keys = keys.upcase if down_keys&.include?(:shift) # https://bugzilla.mozilla.org/show_bug.cgi?id=1405370
+      actions.send_keys(keys)
+    when :space
+      actions.send_keys(' ') # https://github.com/mozilla/geckodriver/issues/846
+    when :control, :left_control, :right_control,
+         :alt, :left_alt, :right_alt,
+         :shift, :left_shift, :right_shift,
+         :meta, :left_meta, :right_meta,
+         :command
+      if down_keys.nil?
+        actions.send_keys(keys)
+      else
+        down_keys << keys
+        actions.key_down(keys)
+      end
+    when Symbol
+      actions.send_keys(keys)
+    when Array
+      local_down_keys = []
+      keys.each do |sub_keys|
+        _send_keys(sub_keys, actions, local_down_keys)
+      end
+      local_down_keys.each { |key| actions.key_up(key) }
+    else
+      raise ArgumentError, 'Unknown keys type'
+    end
+  end
+
   def bridge
     driver.browser.send(:bridge)
   end
@@ -56,4 +106,30 @@ private
     result = bridge.http.call(:post, "session/#{bridge.session_id}/file", file: Selenium::WebDriver::Zipper.zip_file(local_file))
     result['value']
   end
+
+  def browser_version
+    driver.browser.capabilities[:browser_version].to_f
+  end
+
+  HTML5_DRAG_DROP_SCRIPT = <<~JS
+    var source = arguments[0];
+    var target = arguments[1];
+
+    var dt = new DataTransfer();
+    var opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+
+    var dragEvent = new DragEvent('dragstart', opts);
+    source.dispatchEvent(dragEvent);
+    target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
+    var dragOverEvent = new DragEvent('dragover', opts);
+    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);
+  JS
 end

data/lib/capybara/session/config.rb

@@ -7,7 +7,8 @@ module Capybara
     OPTIONS = %i[always_include_port run_server default_selector default_max_wait_time ignore_hidden_elements
                  automatic_reload match exact exact_text raise_server_errors visible_text_only
                  automatic_label_click enable_aria_label save_path asset_host default_host app_host
-                 server_host server_port server_errors default_set_options disable_animation test_id].freeze
+                 server_host server_port server_errors default_set_options disable_animation test_id
+                 predicates_wait].freeze
 
     attr_accessor(*OPTIONS)
 

data/lib/capybara/session/matchers.rb

@@ -47,9 +47,7 @@ module Capybara
     # @return [Boolean]
     #
     def has_current_path?(path, **options)
-      assert_current_path(path, options)
-    rescue Capybara::ExpectationNotMet
-      false
+      make_predicate(options) { assert_current_path(path, options) }
     end
 
     ##
@@ -62,9 +60,7 @@ module Capybara
     # @return [Boolean]
     #
     def has_no_current_path?(path, **options)
-      assert_no_current_path(path, options)
-    rescue Capybara::ExpectationNotMet
-      false
+      make_predicate(options) { assert_no_current_path(path, options) }
     end
 
   private
@@ -76,5 +72,12 @@ module Capybara
       end
       true
     end
+
+    def make_predicate(options)
+      options[:wait] = 0 unless options.key?(:wait) || config.predicates_wait
+      yield
+    rescue Capybara::ExpectationNotMet
+      false
+    end
   end
 end

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

@@ -8,6 +8,16 @@ $(function() {
       $(this).html('Dropped!');
     }
   });
+  $('#drag_html5, #drag_html5_scroll').on('dragstart', function(ev){
+    ev.originalEvent.dataTransfer.setData("text", ev.target.id);
+  });
+  $('#drop_html5, #drop_html5_scroll').on('dragover', function(ev){
+    if ($(this).hasClass('drop')) { ev.preventDefault(); }
+  });
+  $('#drop_html5, #drop_html5_scroll').on('drop', function(ev){
+    ev.preventDefault();
+    $(this).html('HTML5 Dropped ' + ev.originalEvent.dataTransfer.getData("text"));
+  });
   $('#clickable').click(function(e) {
     var link = $(this);
     setTimeout(function() {

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

@@ -30,6 +30,26 @@ Capybara::SpecHelper.spec '#has_css?' do
     expect(@session).to have_css("input[type='submit'][value='New Here']")
   end
 
+  context 'with predicates_wait == true' do
+    it 'should wait for content to appear', requires: [:js] do
+      Capybara.predicates_wait = true
+      Capybara.default_max_wait_time = 2
+      @session.visit('/with_js')
+      @session.click_link('Click me')
+      expect(@session.has_css?("input[type='submit'][value='New Here']")).to be true
+    end
+  end
+
+  context 'with predicates_wait == false' do
+    it 'should not wait for content to appear', requires: [:js] do
+      Capybara.predicates_wait = false
+      Capybara.default_max_wait_time = 2
+      @session.visit('/with_js')
+      @session.click_link('Click me')
+      expect(@session.has_css?("input[type='submit'][value='New Here']")).to be false
+    end
+  end
+
   context 'with between' do
     it 'should be true if the content occurs within the range given' do
       expect(@session).to have_css('p', between: 1..4)

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

@@ -7,6 +7,7 @@ Capybara::SpecHelper.spec '#has_title?' do
 
   it 'should be true if the page has the given title' do
     expect(@session).to have_title('with_js')
+    expect(@session.has_title?('with_js')).to be true
   end
 
   it 'should allow regexp matches' do
@@ -21,6 +22,7 @@ Capybara::SpecHelper.spec '#has_title?' do
 
   it 'should be false if the page has not the given title' do
     expect(@session).not_to have_title('monkey')
+    expect(@session.has_title?('monkey')).to be false
   end
 
   it 'should default to exact: false matching' do
@@ -31,6 +33,8 @@ Capybara::SpecHelper.spec '#has_title?' do
   it 'should match exactly if exact: true option passed' do
     expect(@session).to have_title('with_js', exact: true)
     expect(@session).not_to have_title('with_', exact: true)
+    expect(@session.has_title?('with_js', exact: true)).to be true
+    expect(@session.has_title?('with_', exact: true)).to be false
   end
 
   it 'should match partial if exact: false option passed' do
@@ -62,5 +66,6 @@ Capybara::SpecHelper.spec '#has_no_title?' do
 
   it 'should be true if the page has not the given title' do
     expect(@session).to have_no_title('monkey')
+    expect(@session.has_no_title?('monkey')).to be true
   end
 end

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

@@ -306,7 +306,7 @@ Capybara::SpecHelper.spec 'node' do
       element = @session.find('//div[@id="drag"]')
       target = @session.find('//div[@id="drop"]')
       element.drag_to(target)
-      expect(@session.find('//div[contains(., "Dropped!")]')).not_to be_nil
+      expect(@session).to have_xpath('//div[contains(., "Dropped!")]')
     end
 
     it 'should drag and drop if scrolling is needed' do
@@ -314,7 +314,7 @@ Capybara::SpecHelper.spec 'node' do
       element = @session.find('//div[@id="drag_scroll"]')
       target = @session.find('//div[@id="drop_scroll"]')
       element.drag_to(target)
-      expect(@session.find('//div[contains(., "Dropped!")]')).not_to be_nil
+      expect(@session).to have_xpath('//div[contains(., "Dropped!")]')
     end
   end
 

data/lib/capybara/spec/spec_helper.rb

@@ -34,6 +34,7 @@ module Capybara
         Capybara.default_set_options = {}
         Capybara.disable_animation = false
         Capybara.test_id = nil
+        Capybara.predicates_wait = true
         reset_threadsafe
       end
 

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

@@ -19,6 +19,16 @@
       <p>It should be dropped here.</p>
     </div>
 
+    <div id="drop_html5_scroll" class="drop">
+      <p>It should be dropped here.</p>
+    </div>
+    <div id="drag_html5" draggable="true">
+      <p>This is an HTML5 draggable element.</p>
+    </div>
+    <div id="drop_html5" class="drop">
+      <p>It should be dropped here.</p>
+    </div>
+
     <p><a href="#" id="clickable">Click me</a></p>
     <p><a href="#" id="slow-click">Slowly</a></p>
 
@@ -135,6 +145,9 @@
     <div id="drop_scroll">
       <p>It should be dropped here.</p>
     </div>
+    <div id="drag_html5_scroll" draggable="true">
+      <p>This is an HTML5 draggable element.</p>
+    </div>
 
     <script type="text/javascript">
       // a javascript comment

data/lib/capybara/version.rb

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

data/spec/selenium_spec_firefox_remote.rb

@@ -60,10 +60,6 @@ skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLE
 
 Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVER.to_s, capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
-  when 'Capybara::Session selenium_firefox_remote node #send_keys should generate key events',
-       'Capybara::Session selenium_firefox_remote node #send_keys should allow for multiple simultaneous keys',
-       'Capybara::Session selenium_firefox_remote node #send_keys should send special characters'
-    pending "selenium-webdriver/geckodriver doesn't support complex sets of characters"
   when 'Capybara::Session selenium_firefox_remote node #click should allow multiple modifiers'
     pending "Firefox doesn't generate an event for shift+control+click" if marionette_gte?(62, @session)
   when /^Capybara::Session selenium node #double_click/

data/spec/selenium_spec_marionette.rb

@@ -50,10 +50,6 @@ $stdout.puts `#{Selenium::WebDriver::Firefox.driver_path} --version` if ENV['CI'
 
 Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, 'selenium', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
-  when 'Capybara::Session selenium node #send_keys should generate key events',
-       'Capybara::Session selenium node #send_keys should allow for multiple simultaneous keys',
-       'Capybara::Session selenium node #send_keys should send special characters'
-    pending "selenium-webdriver/geckodriver doesn't support complex sets of characters"
   when 'Capybara::Session selenium node #click should allow multiple modifiers'
     pending "Firefox doesn't generate an event for shift+control+click" if marionette_gte?(62, @session)
   when /^Capybara::Session selenium node #double_click/

data/spec/shared_selenium_session.rb

@@ -185,7 +185,6 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
 
     context '#fill_in with { clear: Array } fill_options' do
       it 'should pass the array through to the element' do
-        pending "selenium-webdriver/geckodriver doesn't support complex sets of characters" if marionette?(session)
         # this is mainly for use with [[:control, 'a'], :backspace] - however since that is platform dependant I'm testing with something less useful
         session.visit('/form')
         session.fill_in('form_first_name',
@@ -286,6 +285,36 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
     end
 
+    describe 'Element#drag_to' do
+      it 'should HTML5 drag and drop an object' do
+        pending "Firefox < 62 doesn't support a DataTransfer constuctor" if marionette_lt?(62.0, session)
+        session.visit('/with_js')
+        element = session.find('//div[@id="drag_html5"]')
+        target = session.find('//div[@id="drop_html5"]')
+        element.drag_to(target)
+        expect(session).to have_xpath('//div[contains(., "HTML5 Dropped drag_html5")]')
+      end
+
+      it 'should not HTML5 drag and drop on a non HTML5 drop element' do
+        session.visit('/with_js')
+        element = session.find('//div[@id="drag_html5"]')
+        target = session.find('//div[@id="drop_html5"]')
+        target.execute_script("$(this).removeClass('drop');")
+        element.drag_to(target)
+        sleep 1
+        expect(session).not_to have_xpath('//div[contains(., "HTML5 Dropped drag_html5")]')
+      end
+
+      it 'should HTML6 drag and drop when scrolling needed' do
+        pending "Firefox < 62 doesn't support a DataTransfer constuctor" if marionette_lt?(62.0, session)
+        session.visit('/with_js')
+        element = session.find('//div[@id="drag_html5_scroll"]')
+        target = session.find('//div[@id="drop_html5_scroll"]')
+        element.drag_to(target)
+        expect(session).to have_xpath('//div[contains(., "HTML5 Dropped drag_html5_scroll")]')
+      end
+    end
+
     context 'Windows' do
       it "can't close the primary window" do
         expect do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -503,7 +503,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,