capybara 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e081025be98ae57e3e43ef0fb2a156b3bfb3ff4d54f8f25bfc09a4bcff2fc59c
-  data.tar.gz: 95e8d6fffe004d4802cd0f97d3bddeae5394041dc774d341c3ad10a60d0b04eb
+  metadata.gz: 814367062843328d421eb8c9db0476cabe5a16405866951855507dd63250bfb9
+  data.tar.gz: 2b6605e124b8eed5d4efbc7f2e06d56dcf2ddaa8775d2ec7f42b18aca4144f3a
 SHA512:
-  metadata.gz: 93e42ca9e9ad0bde5911fe2c7e86ad2d0ac1c40428dfcd256aa01b21b6a8c2e1755df018a272f1917e0628c5c7e1a68b35eb930c3abdb5ffec4e9079187ca5b8
-  data.tar.gz: c7faa43983241d170cf725c22fcc595d2fde4572a71abcf3271d32993bbb6e2874a96c74b850090089598d277b8793b072315fc1e34c9e7a876daeb64a007f7e
+  metadata.gz: 76d6d964d8e204497e9f57b61e96ecf32631325c6c4b600ead18009817f45e324f241520d134881bfa62bba754d820f5e1d91710e4c78ca98ccdd06325a206fb
+  data.tar.gz: ee215bc20878dcce34e1df44f2081e3867528358bd1c7cae542b5996e945ca1f6c16decba834ec3c13bd46052873c6988ef7c141674648eae8f5894fec405f38

data/History.md

@@ -1,3 +1,31 @@
+# Version 3.8.0
+Release date: 2018-09-20
+
+### Added
+
+* Workaround gecodriver 0.22 issue with undefined pause durations
+* :element selector ignores XML namespaces
+
+### Fixed
+
+* Added Errno::ECONNRESET to the errors which will allows https server detection
+
+# Version 3.7.2
+Release date: 2018-09-12
+
+### Fixed
+
+* Fix MatchQuery based matchers when used on a root element found using any type of parent/ancestor query - Issue #2097
+
+* Fix Chrome/FF HTML5 drag simulation for elements (a, img) which default to draggable - Issue #2098
+
+# Version 3.7.1
+Release date: 2018-09-05
+
+### Fixed
+
+* Restored ability to pass symbol as the CSS selector when calling `has_css?`/`have_css`/etc - Issue #2093
+
 # Version 3.7.0
 Release date: 2018-09-02
 
@@ -12,7 +40,6 @@ Release date: 2018-09-02
 
 * All CSS styles applied by the `Element#attach_file` `:make_visible` option will now have `!important` priority set to ensure they override any other specified style.
 * Firefox file inputs are only manually cleared when necessary.
-*
 
 # Version 3.6.0
 Release date: 2018-08-14

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.7_stable/README.md
+you can find the README at https://github.com/teamcapybara/capybara/blob/3.8_stable/README.md
 
 
 Capybara helps you test web applications by simulating how a real user would

data/lib/capybara/helpers.rb

@@ -86,6 +86,7 @@ module Capybara
       end
 
       def expired?
+        raise Capybara::FrozenInTime, 'Time appears to be frozen. Capybara does not work with libraries which freeze time, consider using time travelling instead' if stalled?
         current - @start >= @expire_in
       end
 

data/lib/capybara/node/actions.rb

@@ -64,8 +64,12 @@ module Capybara
       # The field can be found via its name, id, Capybara.test_id attribute, or label text.
       # If no locator is provided will operate on self or a descendant
       #
+      #     # will fill in a descendant fillable field with name, id, or label text matching 'Name'
       #     page.fill_in 'Name', with: 'Bob'
       #
+      #     # will fill in `el` if it's a fillable field
+      #     el.fill_in with: 'Tom'
+      #
       #
       # @overload fill_in([locator], with:, **options)
       #   @param [String] locator                 Which field to fill in
@@ -96,8 +100,12 @@ module Capybara
       # via name, id 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')
       #
+      #     # will choose `el` if it's a radio button element
+      #     el.choose()
+      #
       # @overload choose([locator], **options)
       #   @param [String] locator           Which radio button to choose
       #
@@ -119,8 +127,12 @@ module Capybara
       # via name, id 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')
       #
+      #     # will check `el` if it's a checkbox element
+      #     el.check()
+      #
       #
       # @overload check([locator], **options)
       #   @param [String] locator           Which check box to check
@@ -139,12 +151,16 @@ module Capybara
 
       ##
       #
-      # Find a descendant check box and mark uncheck it. The check box can be found
+      # 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.
       #
+      #     # will uncheck a descendant checkbox with a name, id, or label text matching 'German'
       #     page.uncheck('German')
       #
+      #     # will uncheck `el` if it's a checkbox element
+      #     el.uncheck()
+      #
       #
       # @overload uncheck([locator], **options)
       #   @param [String] locator           Which check box to uncheck
@@ -215,7 +231,11 @@ module Capybara
       # 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.
       #
-      #     page.attach_file(locator, '/path/to/file.png')
+      #     # will attach file to a descendant file input element that has a name, id, or label_text matching 'My File'
+      #     page.attach_file('My File', '/path/to/file.png')
+      #
+      #     # will attach file to el if it's a file input element
+      #     el.attach_file('/path/to/file.png')
       #
       # @overload attach_file([locator], paths, **options)
       #   @macro waiting_behavior

data/lib/capybara/node/base.rb

@@ -85,7 +85,6 @@ module Capybara
           raise err unless driver.wait? && catch_error?(err, errors)
           raise err if timer.expired?
           sleep(0.05)
-          raise Capybara::FrozenInTime, 'Time appears to be frozen. Capybara does not work with libraries which freeze time, consider using time travelling instead' if timer.stalled?
           reload if session_options.automatic_reload
           retry
         ensure

data/lib/capybara/node/finders.rb

@@ -309,6 +309,10 @@ module Capybara
       def options_include_minimum?(opts)
         %i[count minimum between].any? { |key| opts.key?(key) }
       end
+
+      def parent
+        first(:xpath, './parent::*', minimum: 0)
+      end
     end
   end
 end

data/lib/capybara/node/matchers.rb

@@ -713,7 +713,7 @@ module Capybara
         query_args = _set_query_session_options(*query_args)
         query = Capybara::Queries::MatchQuery.new(*query_args, &optional_filter_block)
         synchronize(query.wait) do
-          yield query.resolve_for(first(:xpath, './parent::*', minimum: 0) || query_scope)
+          yield query.resolve_for(parent || session&.document || query_scope)
         end
         true
       end

data/lib/capybara/selector/css.rb

@@ -30,7 +30,7 @@ module Capybara
       class Splitter
         def split(css)
           selectors = []
-          StringIO.open(css) do |str|
+          StringIO.open(css.to_s) do |str|
             selector = ''
             while (char = str.getc)
               case char

data/lib/capybara/selector.rb

@@ -468,7 +468,7 @@ end
 
 Capybara.add_selector(:element) do
   xpath do |locator, **|
-    locator ? XPath.descendant(locator.to_sym) : XPath.descendant
+    XPath.descendant.where(locator ? XPath.local_name == locator.to_s : nil)
   end
 
   expression_filter(:attributes, matcher: /.+/) do |xpath, name, val|

data/lib/capybara/selenium/driver.rb

@@ -28,6 +28,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
         setup_exit_handler
       end
     end
+    @browser
   end
 
   def initialize(app, **options)
@@ -143,11 +144,8 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       handles.clear
       browser.switch_to.default_content
     when :parent
-      # would love to use browser.switch_to.parent_frame here
-      # but it has an issue if the current frame is removed from within it
       handles.pop
-      browser.switch_to.default_content
-      handles.each { |fh| browser.switch_to.frame(fh) }
+      browser.switch_to.parent_frame
     else
       handles << frame.native
       browser.switch_to.frame(frame.native)
@@ -363,6 +361,7 @@ private
     when :chrome
       extend ChromeDriver
     when :firefox
+      require 'capybara/selenium/patches/pause_duration_fix' if sel_driver.capabilities['moz:geckodriverVersion']&.start_with?('0.22.')
       extend MarionetteDriver if sel_driver.capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities)
     end
   end

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

@@ -32,6 +32,15 @@ module Capybara::Selenium::Driver::MarionetteDriver
     # No modal was opened - page has refreshed - ignore
   end
 
+  def switch_to_frame(frame)
+    return super unless frame == :parent
+    # geckodriver/firefox has an issue if the current frame is removed from within it
+    # so we have to move to the default_content and iterate back through the frames
+    handles = @frame_handles[current_window_handle]
+    browser.switch_to.default_content
+    handles.tap(&:pop).each { |fh| browser.switch_to.frame(fh) }
+  end
+
 private
 
   def build_node(native_node)

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class Capybara::Selenium::Node
+  module Html5Drag
+  private
+
+    def html5_drag_to(element)
+      driver.execute_script MOUSEDOWN_TRACKER
+      scroll_if_needed { browser_action.click_and_hold(native).perform }
+      if driver.evaluate_script('window.capybara_mousedown_prevented')
+        element.scroll_if_needed { browser_action.move_to(element.native).release.perform }
+      else
+        driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
+        browser_action.release.perform
+      end
+    end
+
+    def html5_draggable?
+      # Workaround https://github.com/SeleniumHQ/selenium/issues/6396
+      native.property('draggable')
+    end
+
+    MOUSEDOWN_TRACKER = <<~JS
+      document.addEventListener('mousedown', ev => {
+        window.capybara_mousedown_prevented = ev.defaultPrevented;
+      }, { once: true, passive: true })
+    JS
+
+    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 };
+
+      if (source.tagName == 'A'){
+        dt.setData('text/uri-list', source.href);
+        dt.setData('text', source.href);
+      }
+      if (source.tagName == 'IMG'){
+        dt.setData('text/uri-list', source.src);
+        dt.setData('text', source.src);
+      }
+      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
+end

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

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
+require 'capybara/selenium/extensions/html5_drag'
+
 class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
+  include Html5Drag
+
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
     super(value)
   rescue ::Selenium::WebDriver::Error::ExpectedError => err
@@ -11,10 +15,8 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
   end
 
   def drag_to(element)
-    return super unless self[:draggable] == 'true'
-
-    scroll_if_needed { browser_action.click_and_hold(native).perform }
-    driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
+    return super unless html5_draggable?
+    html5_drag_to(element)
   end
 
 private
@@ -22,26 +24,4 @@ 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

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
+require 'capybara/selenium/extensions/html5_drag'
+
 class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
+  include Html5Drag
+
   def click(keys = [], **options)
     super
   rescue ::Selenium::WebDriver::Error::ElementNotInteractableError
@@ -54,10 +58,8 @@ class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
   end
 
   def drag_to(element)
-    return super unless (browser_version >= 62.0) && (self[:draggable] == 'true')
-
-    scroll_if_needed { browser_action.click_and_hold(native).perform }
-    driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
+    return super unless (browser_version >= 62.0) && html5_draggable?
+    html5_drag_to(element)
   end
 
 private
@@ -116,26 +118,4 @@ private
   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/selenium/patches/pause_duration_fix.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module PauseDurationFix
+  def encode
+    super.tap { |output| output[:duration] ||= 0 }
+  end
+end
+
+if defined?(::Selenium::WebDriver::Interactions::Pause)
+  ::Selenium::WebDriver::Interactions::Pause.prepend PauseDurationFix
+end

data/lib/capybara/server/checker.rb

@@ -3,6 +3,8 @@
 module Capybara
   class Server
     class Checker
+      TRY_HTTPS_ERRORS = [EOFError, Net::ReadTimeout, Errno::ECONNRESET].freeze
+
       def initialize(host, port)
         @host, @port = host, port
         @ssl = false
@@ -10,7 +12,7 @@ module Capybara
 
       def request(&block)
         ssl? ? https_request(&block) : http_request(&block)
-      rescue EOFError, Net::ReadTimeout
+      rescue *TRY_HTTPS_ERRORS
         res = https_request(&block)
         @ssl = true
         res

data/lib/capybara/session.rb

@@ -364,7 +364,7 @@ module Capybara
     # @overload switch_to_frame(element)
     #   @param [Capybara::Node::Element]  iframe/frame element to switch to
     # @overload switch_to_frame(:parent)
-    #   Switch to the parent element
+    #   Switch to the parent frame
     # @overload switch_to_frame(:top)
     #   Switch to the top level document
     #

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

@@ -1,7 +1,7 @@
 var activeRequests = 0;
 $(function() {
   $('#change').text('I changed it');
-  $('#drag, #drag_scroll').draggable();
+  $('#drag, #drag_scroll, #drag_link').draggable();
   $('#drop, #drop_scroll').droppable({
     drop: function(event, ui) {
       ui.draggable.remove();

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

@@ -72,7 +72,7 @@ Capybara::SpecHelper.spec '#assert_selector' do
   end
 end
 
-Capybara::SpecHelper.spec '#refute_selector' do
+Capybara::SpecHelper.spec '#refute_selector', requires: [:driver] do
   it 'should warn not to use' do
     @session.visit('/with_html')
     doc = @session.document

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

@@ -96,7 +96,7 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
     expect(@session.current_path).to eq('/replaced')
   end
 
-  it "doesn't raise exception on a nil current_url" do
+  it "doesn't raise exception on a nil current_url", requires: [:driver] do
     allow(@session.driver).to receive(:current_url).and_return(nil)
     @session.visit('/')
     expect { @session.current_url }.not_to raise_exception

data/lib/capybara/spec/session/element/match_css_spec.rb

@@ -22,4 +22,10 @@ Capybara::SpecHelper.spec '#match_css?' do
     expect(@element).to match_css('span') { |el| el[:class] == 'number' }
     expect(@element).not_to match_css('span') { |el| el[:class] == 'not_number' }
   end
+
+  it 'should work with root element found via ancestor' do
+    el = @session.find(:css, 'body').find(:xpath, '..')
+    expect(el).to match_css('html')
+    expect { expect(el).to not_match_css('html') }.to raise_exception(RSpec::Expectations::ExpectationNotMetError)
+  end
 end

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

@@ -10,6 +10,13 @@ Capybara::SpecHelper.spec '#has_css?' do
     expect(@session).to have_css('p a#foo')
   end
 
+  it 'should take a symbol as the selector' do
+    # This was never a specifically accepted format but it has worked for a
+    # lot of versions. Probably should keep it until at least 4.0
+    # TODO: consider not supporting symbol for the CSS selector.
+    expect(@session).to have_css(:p)
+  end
+
   it 'should be false if the given selector is not on the page' do
     expect(@session).not_to have_css('abbr')
     expect(@session).not_to have_css('p a#doesnotexist')

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

@@ -316,6 +316,14 @@ Capybara::SpecHelper.spec 'node' do
       element.drag_to(target)
       expect(@session).to have_xpath('//div[contains(., "Dropped!")]')
     end
+
+    it 'should drag a link' do
+      @session.visit('/with_js')
+      link = @session.find_link('drag_link')
+      target = @session.find(:id, 'drop')
+      link.drag_to target
+      expect(@session).to have_xpath('//div[contains(., "Dropped!")]')
+    end
   end
 
   describe '#hover', requires: [:hover] do

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

@@ -130,13 +130,11 @@ 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(400, 300)
+      @other_window.resize_to(600, 300)
       expect(@session.current_window).to eq(@window)
 
-      # #size returns values larger than availWidth, availHeight with Chromedriver
       @session.within_window(@other_window) do
-        expect(@session.current_window.size).to eq([400, 300])
-        # expect(@session.evaluate_script("[window.outerWidth, window.outerHeight]")).to eq([400,300])
+        expect(@session.current_window.size).to eq([600, 300])
       end
     end
   end

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

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Namespace</title>
+  </head>
+  <body id="body">
+    <div>
+      <svg viewBox="0 0 100 100" preserveAspectRatio="xMidYMid slice"
+           style="width:100%; height:100%; position:absolute; top:0; left:0; z-index:-1;">
+        <linearGradient id="gradient">
+          <stop class="begin" offset="0%"/>
+          <stop class="end" offset="100%"/>
+        </linearGradient>
+        <rect x="0" y="0" width="100" height="100" style="fill:url(#gradient)" />
+        <rect x="150" y="150" width="25" height="25" style="fill:url(#gradient)" />
+        <circle cx="50" cy="50" r="30" style="fill:url(#gradient)" />
+      </svg>
+    <div>
+  </body>
+</html>

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

@@ -12,6 +12,7 @@
     <h1>FooBar</h1>
 
     <p id="change">This is text</p>
+    <a id="drag_link" href='#'>This link is non-HTML5 draggable</a>
     <div id="drag">
       <p>This is a draggable element.</p>
     </div>
@@ -27,6 +28,7 @@
     <div id="drag_html5" draggable="true">
       <p>This is an HTML5 draggable element.</p>
     </div>
+    <a id="drag_link_html5" href="#">This is an HTML5 draggable link</a>
     <div id="drop_html5" class="drop">
       <p>It should be dropped here.</p>
     </div>

data/lib/capybara/version.rb

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

data/lib/capybara/window.rb

@@ -129,14 +129,12 @@ module Capybara
 
     def wait_for_stable_size(seconds = session.config.default_max_wait_time)
       res = yield if block_given?
-      prev_size = size
-      start_time = Capybara::Helpers.monotonic_time
+      timer = Capybara::Helpers.timer(expire_in: seconds)
       loop do
+        prev_size = size
         sleep 0.05
-        cur_size = size
-        return res if cur_size == prev_size
-        prev_size = cur_size
-        break if (Capybara::Helpers.monotonic_time - start_time) >= seconds
+        return res if prev_size == size
+        break if timer.expired?
       end
       raise Capybara::WindowError, "Window size not stable within #{seconds} seconds."
     end

data/lib/capybara.rb

@@ -430,7 +430,6 @@ module Capybara
   require 'capybara/rack_test/css_handlers.rb'
 
   require 'capybara/selenium/node'
-  require 'capybara/selenium/nodes/marionette_node'
   require 'capybara/selenium/driver'
 end
 
@@ -448,6 +447,10 @@ Capybara.register_server :puma do |app, port, host, **options|
     require 'rack/handler/puma'
   rescue LoadError
     raise LoadError, 'Capybara is unable to load `puma` for its server, please add `puma` to your project or specify a different server via something like `Capybara.server = :webrick`.'
+  else
+    unless Rack::Handler::Puma.respond_to?(:config)
+      raise LoadError, 'Capybara requires `puma` version 3.8.0 or higher, please upgrade `puma` or register and specify your own server block'
+    end
   end
   # If we just run the Puma Rack handler it installs signal handlers which prevent us from being able to interrupt tests.
   # Therefore construct and run the Server instance ourselves.

data/spec/dsl_spec.rb

@@ -8,14 +8,8 @@ class TestClass
 end
 
 Capybara::SpecHelper.run_specs TestClass.new, 'DSL', capybara_skip: %i[
-  js modals screenshot frames windows send_keys server hover about_scheme psc download css
-] do |example|
-  case example.metadata[:full_description]
-  when /doesn't raise exception on a nil current_url$/,
-       /#refute_selector should warn not to use$/
-    skip 'Only makes sense when there is a real driver'
-  end
-end
+  js modals screenshot frames windows send_keys server hover about_scheme psc download css driver
+]
 
 RSpec.describe Capybara::DSL do
   after do

data/spec/selenium_spec_chrome.rb

@@ -45,7 +45,12 @@ skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLE
 
 $stdout.puts `#{Selenium::WebDriver::Chrome.driver_path} --version` if ENV['CI']
 
-Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests
+Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests do |example|
+  case example.metadata[:full_description]
+  when /#click_link can download a file$/
+    skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
+  end
+end
 
 RSpec.describe 'Capybara::Session with chrome' do
   include Capybara::SpecHelper

data/spec/selenium_spec_firefox_remote.rb

@@ -61,14 +61,14 @@ 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 #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/
-    pending "selenium-webdriver/geckodriver doesn't generate double click event" if marionette_lt?(59, @session)
+    skip "Firefox doesn't generate an event for shift+control+click" if marionette_gte?(62, @session)
   when 'Capybara::Session selenium_firefox_remote #accept_prompt should accept the prompt with a blank response when there is a default'
     pending "Geckodriver doesn't set a blank response in FF < 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1486485" if marionette_lt?(63, @session)
-  when 'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once for each set of files uploaded',
-       'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once when uploading multiple files from empty'
-    pending 'Due to having to work around selenium remote lack of multiple file upload support the change event count is off'
+  when 'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once for each set of files uploaded'
+    pending 'Gekcodriver appends files so we have to first call clear for multiple files which creates an extra change ' \
+            'if files are already set'
+  when 'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once when uploading multiple files from empty'
+    pending "FF < 62 doesn't support setting all files at once" if marionette_lt?(62, @session)
   end
 end
 

data/spec/selenium_spec_marionette.rb

@@ -51,7 +51,7 @@ $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 #click should allow multiple modifiers'
-    pending "Firefox doesn't generate an event for shift+control+click" if marionette_gte?(62, @session)
+    pending "Firefox doesn't generate an event for shift+control+click" if marionette_gte?(62, @session) && !Gem.win_platform?
   when /^Capybara::Session selenium node #double_click/
     pending "selenium-webdriver/geckodriver doesn't generate double click event" if marionette_lt?(59, @session)
   when 'Capybara::Session selenium #accept_prompt should accept the prompt with a blank response when there is a default'
@@ -61,6 +61,10 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, 'selenium', cap
             'if files are already set'
   when 'Capybara::Session selenium #attach_file with multipart form should fire change once when uploading multiple files from empty'
     pending "FF < 62 doesn't support setting all files at once" if marionette_lt?(62, @session)
+  when 'Capybara::Session selenium #accept_confirm should work with nested modals'
+    skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if marionette_gte?(63, @session)
+  when 'Capybara::Session selenium #click_link can download a file'
+    skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
   end
 end
 

data/spec/shared_selenium_session.rb

@@ -202,7 +202,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         expect(element.path).to eq('/HTML/BODY/DIV[2]/A[1]')
       end
 
-      it 'handles namespaces' do
+      it 'handles namespaces in xhtml' do
         pending "IE 11 doesn't handle all XPath querys (namespace-uri, etc)" if ie?(session)
         session.visit '/with_namespace'
         rect = session.find(:css, 'div svg rect:first-of-type')
@@ -210,6 +210,14 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         expect(session.find(:xpath, rect.path)).to eq rect
       end
 
+      it 'handles default namespaces in html5' do
+        pending "IE 11 doesn't handle all XPath querys (namespace-uri, etc)" if ie?(session)
+        session.visit '/with_html5_svg'
+        rect = session.find(:css, 'div svg rect:first-of-type')
+        expect(rect.path).to eq("/HTML/BODY/DIV/./*[((local-name(.) = 'svg') and (namespace-uri(.) = 'http://www.w3.org/2000/svg'))]/./*[((local-name(.) = 'rect') and (namespace-uri(.) = 'http://www.w3.org/2000/svg'))][1]")
+        expect(session.find(:xpath, rect.path)).to eq rect
+      end
+
       it 'handles case sensitive element names' do
         pending "IE 11 doesn't handle all XPath querys (namespace-uri, etc)" if ie?(session)
         session.visit '/with_namespace'
@@ -286,8 +294,12 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
     end
 
     describe 'Element#drag_to' do
+      before do
+        skip "Firefox < 62 doesn't support a DataTransfer constuctor" if marionette_lt?(62.0, session)
+        skip "IE doesn't support a DataTransfer constuctor" if ie?(session)
+      end
+
       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"]')
@@ -306,13 +318,20 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
 
       it 'should HTML5 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
+
+      it 'should drag HTML5 default draggable elements' do
+        session.visit('/with_js')
+        link = session.find_link('drag_link_html5')
+        target = session.find(:id, 'drop_html5')
+        link.drag_to target
+        expect(session).to have_xpath('//div[contains(., "HTML5 Dropped")]')
+      end
     end
 
     context 'Windows' do
@@ -403,6 +422,16 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         end
       end
     end
+
+    describe ':element selector' do
+      it 'can find html5 svg elements' do
+        session.visit('with_html5_svg')
+        expect(session).to have_selector(:element, :svg)
+        expect(session).to have_selector(:element, :rect, visible: true)
+        expect(session).to have_selector(:element, :circle)
+        expect(session).to have_selector(:element, :linearGradient, visible: :all)
+      end
+    end
   end
 
   def headless_or_remote?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -311,9 +311,11 @@ files:
 - lib/capybara/selenium/driver.rb
 - lib/capybara/selenium/driver_specializations/chrome_driver.rb
 - lib/capybara/selenium/driver_specializations/marionette_driver.rb
+- lib/capybara/selenium/extensions/html5_drag.rb
 - lib/capybara/selenium/node.rb
 - lib/capybara/selenium/nodes/chrome_node.rb
 - lib/capybara/selenium/nodes/marionette_node.rb
+- lib/capybara/selenium/patches/pause_duration_fix.rb
 - lib/capybara/server.rb
 - lib/capybara/server/animation_disabler.rb
 - lib/capybara/server/checker.rb
@@ -437,6 +439,7 @@ files:
 - 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_html5_svg.erb
 - lib/capybara/spec/views/with_html_entities.erb
 - lib/capybara/spec/views/with_js.erb
 - lib/capybara/spec/views/with_namespace.erb