capybara 3.8.2 → 3.9.0

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

@@ -34,6 +34,7 @@ module Capybara::Selenium::Driver::MarionetteDriver
 
   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]

data/lib/capybara/selenium/node.rb

@@ -48,6 +48,7 @@ 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]
@@ -79,12 +80,14 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
 
   def unselect_option
     raise Capybara::UnselectNotAllowed, 'Cannot unselect option from single select box.' unless select_node.multiple?
+
     click if selected?
   end
 
   def click(keys = [], **options)
     click_options = ClickOptions.new(keys, options)
     return native.click if click_options.empty?
+
     click_with_options(click_options)
   rescue StandardError => err
     if err.is_a?(::Selenium::WebDriver::Error::ElementClickInterceptedError) ||
@@ -136,6 +139,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
 
   def disabled?
     return true unless native.enabled?
+
     # WebDriver only defines `disabled?` for form controls but fieldset makes sense too
     tag_name == 'fieldset' && find_xpath('ancestor-or-self::fieldset[@disabled]').any?
   end
@@ -255,6 +259,7 @@ private
   def set_date(value) # rubocop:disable Naming/AccessorMethodName
     value = SettableValue.new(value)
     return set_text(value) unless value.dateable?
+
     # TODO: this would be better if locale can be detected and correct keystrokes sent
     update_value_js(value.to_date_str)
   end
@@ -262,6 +267,7 @@ private
   def set_time(value) # rubocop:disable Naming/AccessorMethodName
     value = SettableValue.new(value)
     return set_text(value) unless value.timeable?
+
     # TODO: this would be better if locale can be detected and correct keystrokes sent
     update_value_js(value.to_time_str)
   end
@@ -269,6 +275,7 @@ private
   def set_datetime_local(value) # rubocop:disable Naming/AccessorMethodName
     value = SettableValue.new(value)
     return set_text(value) unless value.timeable?
+
     # TODO: this would be better if locale can be detected and correct keystrokes sent
     update_value_js(value.to_datetime_str)
   end

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

@@ -11,11 +11,13 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
     if err.message =~ /File not found : .+\n.+/m
       raise ArgumentError, "Selenium < 3.14 with remote Chrome doesn't support multiple file upload"
     end
+
     raise
   end
 
   def drag_to(element)
     return super unless html5_draggable?
+
     html5_drag_to(element)
   end
 

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

@@ -21,6 +21,7 @@ class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
     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
     if %w[option optgroup].include? tag_name
       find_xpath('parent::*[self::optgroup or self::select]')[0].disabled?
@@ -52,13 +53,12 @@ class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
     return super(*args.map { |arg| arg == :space ? ' ' : arg }) if args.none? { |arg| arg.is_a? Array }
 
     native.click
-    args.each_with_object(browser_action) do |keys, actions|
-      _send_keys(keys, actions)
-    end.perform
+    _send_keys(args).perform
   end
 
   def drag_to(element)
     return super unless (browser_version >= 62.0) && html5_draggable?
+
     html5_drag_to(element)
   end
 
@@ -71,35 +71,29 @@ private
     super
   end
 
-  def _send_keys(keys, actions, down_keys = nil)
+  def _send_keys(keys, actions = browser_action, down_keys = ModifierKeysStack.new)
     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
+      down_keys.press(keys)
+      actions.key_down(keys)
+    when String
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1405370
+      keys = keys.upcase if (browser_version < 64.0) && down_keys&.include?(:shift)
+      actions.send_keys(keys)
     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) }
+      down_keys.push
+      keys.each { |sub_keys| _send_keys(sub_keys, actions, down_keys) }
+      down_keys.pop.reverse_each { |key| actions.key_up(key) }
     else
       raise ArgumentError, 'Unknown keys type'
     end
+    actions
   end
 
   def bridge
@@ -118,4 +112,27 @@ private
   def browser_version
     driver.browser.capabilities[:browser_version].to_f
   end
+
+  class ModifierKeysStack
+    def initialize
+      @stack = []
+    end
+
+    def include?(key)
+      @stack.flatten.include?(key)
+    end
+
+    def press(key)
+      @stack.last.push(key)
+    end
+
+    def push
+      @stack.push []
+    end
+
+    def pop
+      @stack.pop
+    end
+  end
+  private_constant :ModifierKeysStack
 end

data/lib/capybara/server.rb

@@ -8,6 +8,7 @@ require 'capybara/server/animation_disabler'
 require 'capybara/server/checker'
 
 module Capybara
+  # @api private
   class Server
     class << self
       def ports
@@ -44,6 +45,7 @@ module Capybara
 
     def responsive?
       return false if @server_thread&.join(0)
+
       res = @checker.request { |http| http.get('/__identify__') }
 
       if res.is_a?(Net::HTTPSuccess) || res.is_a?(Net::HTTPRedirection)
@@ -57,6 +59,7 @@ module Capybara
       timer = Capybara::Helpers.timer(expire_in: 60)
       while pending_requests?
         raise 'Requests did not finish in 60 seconds' if timer.expired?
+
         sleep 0.01
       end
     end
@@ -72,6 +75,7 @@ module Capybara
         timer = Capybara::Helpers.timer(expire_in: 60)
         until responsive?
           raise 'Rack application timed out during boot' if timer.expired?
+
           @server_thread.join(0.1)
         end
       end

data/lib/capybara/server/animation_disabler.rb

@@ -22,6 +22,7 @@ module Capybara
       def call(env)
         @status, @headers, @body = @app.call(env)
         return [@status, @headers, @body] unless html_content?
+
         response = Rack::Response.new([], @status, @headers)
 
         @body.each { |html| response.write insert_disable(html) }

data/lib/capybara/session.rb

@@ -76,11 +76,13 @@ module Capybara
 
     def initialize(mode, app = nil)
       raise TypeError, 'The second parameter to Session::new should be a rack app if passed.' if app && !app.respond_to?(:call)
+
       @@instance_created = true
       @mode = mode
       @app = app
       if block_given?
         raise 'A configuration block is only accepted when Capybara.threadsafe == true' unless Capybara.threadsafe
+
         yield config
       end
       @server = if config.run_server && @app && driver.needs_server?
@@ -138,6 +140,7 @@ module Capybara
     #
     def raise_server_error!
       return unless @server&.error
+
       # Force an explanation for the error being raised as the exception cause
       begin
         if config.raise_server_errors
@@ -468,6 +471,7 @@ module Capybara
     def switch_to_window(window = nil, **options, &window_locator)
       raise ArgumentError, '`switch_to_window` can take either a block or a window, not both' if window && block_given?
       raise ArgumentError, '`switch_to_window`: either window or block should be provided' if !window && !block_given?
+
       unless scopes.last.nil?
         raise Capybara::ScopeError, '`switch_to_window` is not supposed to be invoked from '\
                                     '`within` or `within_frame` blocks.'
@@ -769,6 +773,7 @@ module Capybara
     #
     def configure
       raise 'Session configuration is only supported when Capybara.threadsafe == true' unless Capybara.threadsafe
+
       yield config
     end
 

data/lib/capybara/session/config.rb

@@ -78,12 +78,14 @@ module Capybara
     remove_method :app_host=
     def app_host=(url)
       raise ArgumentError, "Capybara.app_host should be set to a url (http://www.example.com). Attempted to set #{url.inspect}." if url && url !~ URI::DEFAULT_PARSER.make_regexp
+
       @app_host = url
     end
 
     remove_method :default_host=
     def default_host=(url)
       raise ArgumentError, "Capybara.default_host should be set to a url (http://www.example.com). Attempted to set #{url.inspect}." if url && url !~ URI::DEFAULT_PARSER.make_regexp
+
       @default_host = url
     end
 

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

@@ -23,6 +23,22 @@ Capybara::SpecHelper.spec '#has_css?' do
     expect(@session).not_to have_css('p.nosuchclass')
   end
 
+  it 'should support :id option' do
+    expect(@session).to have_css('h2', id: 'h2one')
+    expect(@session).to have_css('h2')
+    expect(@session).to have_css('h2', id: /h2o/)
+  end
+
+  it 'should support :class option' do
+    expect(@session).to have_css('li', class: 'guitarist')
+    expect(@session).to have_css('li', class: /guitar/)
+  end
+
+  it 'should support case insensitive :class and :id options' do
+    expect(@session).to have_css('li', class: /UiTaRI/i)
+    expect(@session).to have_css('h2', id: /2ON/i)
+  end
+
   it 'should respect scopes' do
     @session.within "//p[@id='first']" do
       expect(@session).to have_css('a#foo')

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

@@ -61,6 +61,10 @@ Capybara::SpecHelper.spec '#has_field' do
       expect(@session).not_to have_field('Description', type: 'email')
       expect(@session).not_to have_field('Languages', type: 'textarea')
     end
+
+    it 'it can find type="hidden" elements if explicity specified' do
+      expect(@session).to have_field('form[data]', with: 'TWTW', type: 'hidden')
+    end
   end
 
   context 'with multiple' do

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

@@ -478,6 +478,12 @@ Capybara::SpecHelper.spec 'node' do
       expect(@session.find(:css, '#address1_city').value).to eq 'Oceanside'
     end
 
+    it 'should hold modifers at top level' do
+      @session.visit('/form')
+      @session.find(:css, '#address1_city').send_keys('ocean', :shift, 'side')
+      expect(@session.find(:css, '#address1_city').value).to eq 'oceanSIDE'
+    end
+
     it 'should generate key events', requires: %i[send_keys js] do
       @session.visit('/with_js')
       @session.find(:css, '#with-key-events').send_keys([:shift, 't'], [:shift, 'w'])

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

@@ -34,6 +34,6 @@ Capybara::SpecHelper.spec '#to_capybara_node' do
     end.to raise_error(/^expected to find css "#second" within #<Capybara::Node::Element/)
     expect do
       expect(para).to have_link(href: %r{/without_simple_html})
-    end.to raise_error(%r{^expected to find visible link nil with href matching /\\/without_simple_html/ within #<Capybara::Node::Element})
+    end.to raise_error(%r{^expected to find link nil with href matching /\\/without_simple_html/ within #<Capybara::Node::Element})
   end
 end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#reset_session!' do
-  it 'removes cookies' do
+  it 'removes cookies from current domain' do
     @session.visit('/set_cookie')
     @session.visit('/get_cookie')
     expect(@session).to have_content('test_cookie')
@@ -11,6 +11,20 @@ Capybara::SpecHelper.spec '#reset_session!' do
     expect(@session.body).not_to include('test_cookie')
   end
 
+  it 'removes ALL cookies', requires: [:server] do
+    domains = ['localhost', '127.0.0.1']
+    domains.each do |domain|
+      @session.visit("http://#{domain}:#{@session.server.port}/set_cookie")
+      @session.visit("http://#{domain}:#{@session.server.port}/get_cookie")
+      expect(@session).to have_content('test_cookie')
+    end
+    @session.reset_session!
+    domains.each do |domain|
+      @session.visit("http://#{domain}:#{@session.server.port}/get_cookie")
+      expect(@session.body).not_to include('test_cookie')
+    end
+  end
+
   it 'resets current url, host, path' do
     @session.visit '/foo'
     expect(@session.current_url).not_to be_empty

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

@@ -40,8 +40,18 @@ Capybara::SpecHelper.spec Capybara::Selector do
   end
 
   describe 'field selectors' do
-    it 'can find specifically by id' do
-      expect(@session.find(:field, id: 'customer_email').value).to eq 'ben@ben.com'
+    context 'with :id option' do
+      it 'can find specifically by id' do
+        expect(@session.find(:field, id: 'customer_email').value).to eq 'ben@ben.com'
+      end
+
+      it 'can find by regex' do
+        expect(@session.find(:field, id: /ustomer.emai/).value).to eq 'ben@ben.com'
+      end
+
+      it 'can find by case-insensitive id' do
+        expect(@session.find(:field, id: /StOmer.emAI/i).value).to eq 'ben@ben.com'
+      end
     end
 
     it 'can find specifically by name' do

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

@@ -25,6 +25,12 @@
     </label>
   </p>
 
+  <p>
+    <label for="customer_other_email">Customer Other Email
+      <input type="text" name="form[customer_other_email]" value="notben@notben.com" id="customer_other_email"/>
+    </label>
+  </p>
+
   <p>
     <label for="form_other_title">Other title</label>
     <select name="form[other_title]" id="form_other_title">
@@ -547,6 +553,11 @@ New line after and before textarea tag
     <input type="file" name="form[multiple_documents][]" id="form_multiple_documents" multiple="multiple" />
   </p>
 
+  <p>
+    <label for="form_directory_upload">Directory Upload</label>
+    <input type="file" name="form[multiple_documents][]" id="form_directory_upload" multiple="multiple" webkitdirectory="webkitdirectory" mozdirectory="mozdirectory" />
+  </p>
+
   <p>
     <input type="submit" value="Upload Multiple"/>
   <p>
@@ -643,3 +654,7 @@ New line after and before textarea tag
   <label for="asterisk_input">With Asterisk<abbr title="required">*</abbr></label>
   <input id="asterisk_input" type="number"value="2016"/>
 </p>
+
+<p>
+  <input id="special" {custom}="abcdef" value="custom attribute"/>
+</p>

data/lib/capybara/version.rb

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

data/lib/capybara/xpath_patches.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module XPath
+  module DSL
+    def lowercase
+      method(:translate, 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ', 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ')
+    end
+
+    def uppercase
+      method(:translate, 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ', 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ')
+    end
+  end
+end
+
+module Capybara
+  module XPathPatches
+    module Renderer
+      def attribute(current, name)
+        return super if name =~ /^[a-zA-Z_:][a-zA-Z0-9_:\.\-]*$/
+
+        "#{current}/attribute::*[local-name(.) = #{string_literal(name)}]"
+      end
+    end
+  end
+end
+
+XPath::Renderer.prepend(Capybara::XPathPatches::Renderer)

data/spec/dsl_spec.rb

@@ -9,7 +9,12 @@ 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 driver
-]
+] do |example|
+  case example.metadata[:full_description]
+  when /has_css\? should support case insensitive :class and :id options/
+    pending "Nokogiri doesn't support case insensitive CSS attribute matchers"
+  end
+end
 
 RSpec.describe Capybara::DSL do
   after do
@@ -224,6 +229,15 @@ RSpec.describe Capybara::DSL do
       end
       expect(Capybara.session_name).to eq(:default)
     end
+
+    it 'should allow a session object' do
+      original_session = Capybara.current_session
+      new_session = Capybara::Session.new(:rack_test, proc {})
+      Capybara.using_session(new_session) do
+        expect(Capybara.current_session).to eq(new_session)
+      end
+      expect(Capybara.current_session).to eq(original_session)
+    end
   end
 
   describe '#session_name' do