capybara 3.20.0 → 3.21.0

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

@@ -244,6 +244,11 @@ Capybara::SpecHelper.spec 'node' do
       expect(@session.find('//input[@id="hidden_input"]')).not_to be_visible
     end
 
+    it 'template elements should not be visible' do
+      Capybara.ignore_hidden_elements = false
+      expect(@session.find('//template')).not_to be_visible
+    end
+
     it 'should be boolean' do
       Capybara.ignore_hidden_elements = false
       expect(@session.first('//a').visible?).to be true
@@ -413,6 +418,87 @@ Capybara::SpecHelper.spec 'node' do
       link.drag_to target
       expect(@session).to have_xpath('//div[contains(., "Dropped!")]')
     end
+
+    context 'HTML5', requires: %i[js html5_drag] do
+      it 'should HTML5 drag and drop an object' do
+        @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 string: text/plain drag_html5")]')
+      end
+
+      it 'should set clientX/Y in dragover events' do
+        @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_css('div.log', text: /DragOver with client position: [1-9]\d*,[1-9]\d*/, count: 2)
+      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")]')
+      end
+
+      it 'should HTML5 drag and drop when scrolling needed' do
+        @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 string: text/plain 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
+  end
+
+  describe 'Element#drop', requires: %i[js html5_drag] do
+    it 'can drop a file' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop(
+        with_os_path_separators(File.expand_path('../fixtures/capybara.jpg', File.dirname(__FILE__)))
+      )
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped file: capybara.jpg")]')
+    end
+
+    it 'can drop multiple files' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop(
+        with_os_path_separators(File.expand_path('../fixtures/capybara.jpg', File.dirname(__FILE__))),
+        with_os_path_separators(File.expand_path('../fixtures/test_file.txt', File.dirname(__FILE__)))
+      )
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped file: capybara.jpg")]')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped file: test_file.txt")]')
+    end
+
+    it 'can drop strings' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop('text/plain' => 'Some dropped text')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain Some dropped text")]')
+    end
+
+    it 'can drop multiple strings' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop('text/plain' => 'Some dropped text', 'text/url' => 'http://www.google.com')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain Some dropped text")]')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/url http://www.google.com")]')
+    end
   end
 
   describe '#hover', requires: [:hover] do

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

@@ -24,7 +24,7 @@ Capybara::SpecHelper.spec '#scroll_to', requires: [:scroll] do
     @session.scroll_to(el, align: :center)
     el_center = el.evaluate_script('(function(rect){return (rect.top + rect.bottom)/2})(this.getBoundingClientRect())')
     viewport_bottom = el.evaluate_script('document.body.clientHeight')
-    expect(el_center).to be_within(1).of(viewport_bottom / 2)
+    expect(el_center).to be_within(2).of(viewport_bottom / 2)
   end
 
   it 'can scroll the window to the vertical top' do

data/lib/capybara/spec/spec_helper.rb

@@ -124,6 +124,10 @@ module Capybara
     def be_an_invalid_element_error(session)
       satisfy { |error| session.driver.invalid_element_errors.any? { |e| error.is_a? e } }
     end
+
+    def with_os_path_separators(path)
+      Gem.win_platform? ? path.to_s.tr('/', '\\') : path.to_s
+    end
   end
 end
 

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

@@ -178,5 +178,9 @@ banana</textarea>
 &#x20;&#x1680;&#x2000;&#x2001;&#x2002; &#x2003;&#x2004;&nbsp;&#x2005; &#x2006;&#x2007;&#x2008;&#x2009;&#x200A;&#x202F;&#x205F;&#x3000;
 </div>
 
+<template id="template">
+  <input />
+</template>
+
 <a href="/download.csv" download>Download Me</a>
 <a href="/download.csv" download="other.csv">Download Other</a>

data/lib/capybara/version.rb

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

data/lib/capybara.rb

@@ -73,22 +73,24 @@ module Capybara
     # [asset_host = String]               Where dynamic assets are hosted - will be prepended to relative asset locations if present (Default: nil)
     # [run_server = Boolean]              Whether to start a Rack server for the given Rack app (Default: true)
     # [raise_server_errors = Boolean]     Should errors raised in the server be raised in the tests? (Default: true)
-    # [server_errors = Array\<Class\>]    Error classes that should be raised in the tests if they are raised in the server and Capybara.raise_server_errors is true (Default: [Exception])
+    # [server_errors = Array\<Class\>]    Error classes that should be raised in the tests if they are raised in the server and {configure raise_server_errors} is true (Default: [Exception])
     # [default_selector = :css/:xpath]    Methods which take a selector use the given type by default (Default: :css)
     # [default_max_wait_time = Numeric]   The maximum number of seconds to wait for asynchronous processes to finish (Default: 2)
     # [ignore_hidden_elements = Boolean]  Whether to ignore hidden elements on the page (Default: true)
     # [automatic_reload = Boolean]        Whether to automatically reload elements as Capybara is waiting (Default: true)
     # [save_path = String]  Where to put pages saved through save_(page|screenshot), save_and_open_(page|screenshot) (Default: Dir.pwd)
-    # [automatic_label_click = Boolean]   Whether Node#choose, Node#check, Node#uncheck will attempt to click the associated label element if the checkbox/radio button are non-visible (Default: false)
+    # [automatic_label_click = Boolean]   Whether {Capybara::Node::Element#choose Element#choose}, {Capybara::Node::Element#check Element#check}, {Capybara::Node::Element#uncheck Element#uncheck} will attempt to click the associated label element if the checkbox/radio button are non-visible (Default: false)
     # [enable_aria_label = Boolean]  Whether fields, links, and buttons will match against aria-label attribute (Default: false)
     # [reuse_server = Boolean]  Reuse the server thread between multiple sessions using the same app object (Default: true)
     # [threadsafe = Boolean]  Whether sessions can be configured individually (Default: false)
-    # [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: {})
+    # [server = Symbol]  The name of the registered server to use when running the app under test (Default: :default which uses puma)
+    # [default_set_options = Hash]  The default options passed to {Capybara::Node::Element#set Element#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)
+    # [predicates_wait = Boolean]  Whether Capybara's predicate matchers use waiting behavior by default (Default: true)
     # [default_normalize_ws = Boolean] Whether text predicates and matchers use normalize whitespace behaviour (Default: false)
     # [allow_gumbo = Boolean] When `nokogumbo` is available, whether it will be used to parse HTML strings (Default: false)
+    # [match = :one/:first/:prefer_exact/:smart] The matching strategy to find nodes (Default: :smart)
+    # [exact_text = Boolean] Whether the text matchers and `:text` filter match exactly or on substrings (Default: false)
     #
     # === DSL Options
     #
@@ -201,15 +203,13 @@ module Capybara
     # any string containing HTML in the exact same way you would query the current document in a Capybara
     # session.
     #
-    # Example: A single element
-    #
+    # @example A single element
     #     node = Capybara.string('<a href="foo">bar</a>')
     #     anchor = node.first('a')
     #     anchor[:href] #=> 'foo'
     #     anchor.text #=> 'bar'
     #
-    # Example: Multiple elements
-    #
+    # @example Multiple elements
     #     node = Capybara.string <<-HTML
     #       <ul>
     #         <li id="home">Home</li>
@@ -297,7 +297,7 @@ module Capybara
 
     ##
     #
-    # The current Capybara::Session based on what is set as Capybara.app and Capybara.current_driver
+    # The current {Capybara::Session} based on what is set as {app} and {current_driver}.
     #
     # @return [Capybara::Session]     The currently used session
     #
@@ -340,7 +340,7 @@ module Capybara
 
     ##
     #
-    # Yield a block using a specific session name or Capybara::Session instance.
+    # Yield a block using a specific session name or {Capybara::Session} instance.
     #
     def using_session(name_or_session)
       previous_session_info = {
@@ -371,6 +371,10 @@ module Capybara
     def HTML(html) # rubocop:disable Naming/MethodName
       if Nokogiri.respond_to?(:HTML5) && Capybara.allow_gumbo # Nokogumbo installed and allowed for use
         Nokogiri::HTML5(html).tap do |document|
+          document.xpath('//template').each do |template|
+            # template elements content is not part of the document
+            template.inner_html = ''
+          end
           document.xpath('//textarea').each do |textarea|
             # The Nokogumbo HTML5 parser already returns spec compliant contents
             textarea['_capybara_raw_value'] = textarea.content
@@ -378,6 +382,10 @@ module Capybara
         end
       else
         Nokogiri::HTML(html).tap do |document|
+          document.xpath('//template').each do |template|
+            # template elements content is not part of the document
+            template.inner_html = ''
+          end
           document.xpath('//textarea').each do |textarea|
             textarea['_capybara_raw_value'] = textarea.content.sub(/\A\n/, '')
           end

data/spec/selenium_spec_firefox.rb

@@ -64,6 +64,8 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
     pending "Geckodriver doesn't provide a way to remove cookies outside the current domain"
   when 'Capybara::Session selenium #attach_file with a block can upload by clicking the file input'
     pending "Geckodriver doesn't allow clicking on file inputs"
+  when /drag_to.*HTML5/
+    pending "Firefox < 62 doesn't support a DataTransfer constuctor" if firefox_lt?(62.0, @session)
   end
 end
 

data/spec/selenium_spec_ie.rb

@@ -6,13 +6,13 @@ require 'shared_selenium_session'
 require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
-if ENV['CI']
-  if ::Selenium::WebDriver::Service.respond_to? :driver_path=
-    ::Selenium::WebDriver::IE::Service
-  else
-    ::Selenium::WebDriver::IE
-  end.driver_path = 'C:\Tools\WebDriver\IEDriverServer.exe'
-end
+# if ENV['CI']
+#   if ::Selenium::WebDriver::Service.respond_to? :driver_path=
+#     ::Selenium::WebDriver::IE::Service
+#   else
+#     ::Selenium::WebDriver::IE
+#   end.driver_path = 'C:\Tools\WebDriver\IEDriverServer.exe'
+# end
 
 def selenium_host
   ENV.fetch('SELENIUM_HOST', '192.168.56.102')
@@ -110,6 +110,12 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, 'selenium', capybara_sk
     pending 'IE treats blank href as a parent request (against HTML spec)'
   when /#attach_file with a block/
     skip 'Hangs IE testing for unknown reason'
+  when /drag_to.*HTML5/
+    pending "IE doesn't support a DataTransfer constuctor"
+  when /template elements should not be visible/
+    skip "IE doesn't support template elements"
+  when /Element#drop/
+    pending "IE doesn't support DataTransfer constructor"
   end
 end
 

data/spec/selenium_spec_safari.rb

@@ -73,6 +73,8 @@ Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybar
   when 'Capybara::Session selenium_safari #go_back should fetch a response from the driver from the previous page',
        'Capybara::Session selenium_safari #go_forward should fetch a response from the driver from the previous page'
     skip 'safaridriver loses the ability to find elements in the document after `go_back`'
+  when /drag_to.*HTML5/
+    pending "Safari doesn't support"
   end
 end
 

data/spec/shared_selenium_session.rb

@@ -303,57 +303,6 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
     end
 
-    describe 'Element#drag_to' do
-      before do
-        skip "Firefox < 62 doesn't support a DataTransfer constuctor" if firefox_lt?(62.0, session)
-        skip "IE doesn't support a DataTransfer constuctor" if ie?(session)
-        skip "Safari doesn't support" if safari?(session)
-      end
-
-      it 'should HTML5 drag and drop an object' do
-        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 set clientX/Y in dragover events' do
-        session.visit('/with_js')
-        element = session.find('//div[@id="drag_html5"]')
-        target = session.find('//div[@id="drop_html5"]')
-        element.drag_to(target)
-        session.all(:css, 'div.log').each { |el| puts el.text }
-        expect(session).to have_css('div.log', text: /DragOver with client position: [1-9]\d*,[1-9]\d*/, count: 2)
-      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 HTML5 drag and drop when scrolling needed' do
-        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
-
     describe 'Capybara#Node#attach_file' do
       it 'can attach a directory' do
         pending "Geckodriver doesn't support uploading a directory" if firefox?(session)
@@ -472,6 +421,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
     describe 'with react' do
       context 'controlled components' do
         it 'can set and clear a text field' do
+          skip "This test doesn't support older browsers" if ie?(session)
           # session.visit 'https://reactjs.org/docs/forms.html'
           # session.all(:css, 'h2#controlled-components ~ p a', text: 'Try it on CodePen')[0].click
           # copied into local view

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.20.0
+  version: 3.21.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -88,28 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: uglifier
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: xpath
   requirement: !ruby/object:Gem::Requirement
@@ -376,6 +362,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement