capybara 2.14.4 → 2.15.0

data/lib/capybara/rspec/matchers.rb

@@ -2,7 +2,10 @@
 module Capybara
   module RSpecMatchers
     class Matcher
-      include ::RSpec::Matchers::Composable if defined?(::RSpec::Expectations::Version) && (Gem::Version.new(RSpec::Expectations::Version::STRING) >= Gem::Version.new('3.0'))
+      if defined?(::RSpec::Expectations::Version) && (Gem::Version.new(RSpec::Expectations::Version::STRING) >= Gem::Version.new('3.0'))
+        require 'capybara/rspec/compound'
+        include ::Capybara::RSpecMatchers::Compound
+      end
 
       attr_reader :failure_message, :failure_message_when_negated
 

data/lib/capybara/selector.rb

@@ -14,6 +14,7 @@ Capybara::Selector::FilterSet.add(:_field) do
     states << 'checked' if options[:checked] || (options[:unchecked] == false)
     states << 'not checked' if options[:unchecked] || (options[:checked] == false)
     states << 'disabled' if options[:disabled] == true
+    states << 'not disabled' if options[:disabled] == false
     desc << " that is #{states.join(' and ')}" unless states.empty?
     desc << " with the multiple attribute" if options[:multiple] == true
     desc << " without the multiple attribute" if options[:multiple] == false

data/lib/capybara/selector/filter.rb

@@ -1,47 +1,19 @@
 # frozen_string_literal: true
+require 'capybara/selector/filters/node_filter'
+require 'capybara/selector/filters/expression_filter'
+
 module Capybara
   class Selector
-    class Filter
-      def initialize(name, block, options={})
-        @name = name
-        @block = block
-        @options = options
-        @options[:valid_values] = [true,false] if options[:boolean]
-      end
-
-      def default?
-        @options.has_key?(:default)
-      end
-
-      def default
-        @options[:default]
-      end
-
-      def matches?(node, value)
-        return true if skip?(value)
-
-        if !valid_value?(value)
-          msg = "Invalid value #{value.inspect} passed to filter #{@name} - "
-          if default?
-            warn msg + "defaulting to #{default}"
-            value = default
-          else
-            warn msg + "skipping"
-            return true
-          end
-        end
-
-        @block.call(node, value)
-      end
-
-      def skip?(value)
-        @options.has_key?(:skip_if) && value == @options[:skip_if]
-      end
-
-      private
-
-      def valid_value?(value)
-        !@options.has_key?(:valid_values) || Array(@options[:valid_values]).include?(value)
+    def self.const_missing(const_name)
+      case const_name
+      when :Filter
+        warn "DEPRECATED: Capybara::Selector::Filter is deprecated, please use Capybara::Selector::Filters::NodeFilter instead"
+        Filters::NodeFilter
+      when :ExpressionFilter
+        warn "DEPRECATED: Capybara::Selector::ExpressionFilter is deprecated, please use Capybara::Selector::Filters::ExpressionFilter instead"
+        Filters::ExpressionFilter
+      else
+        super
       end
     end
   end

data/lib/capybara/selector/filter_set.rb

@@ -13,11 +13,11 @@ module Capybara
       end
 
       def filter(name, *types_and_options, &block)
-        add_filter(name, Filter, *types_and_options, &block)
+        add_filter(name, Filters::NodeFilter, *types_and_options, &block)
       end
 
       def expression_filter(name, *types_and_options, &block)
-        add_filter(name, ExpressionFilter, *types_and_options, &block)
+        add_filter(name, Filters::ExpressionFilter, *types_and_options, &block)
       end
 
       def describe(&block)
@@ -25,7 +25,14 @@ module Capybara
       end
 
       def description(options={})
-        @descriptions.map {|desc| desc.call(options).to_s }.join
+        options_with_defaults = options.dup
+        filters.each do |name, filter|
+          options_with_defaults[name] = filter.default if filter.default? && !options_with_defaults.has_key?(name)
+        end
+
+        @descriptions.map do |desc|
+          desc.call(options_with_defaults).to_s
+        end.join
       end
 
       def filters
@@ -33,11 +40,11 @@ module Capybara
       end
 
       def node_filters
-        filters.reject { |_n, f| f.nil? || f.is_a?(ExpressionFilter) }.freeze
+        filters.reject { |_n, f| f.nil? || f.is_a?(Filters::ExpressionFilter) }.freeze
       end
 
       def expression_filters
-        filters.select { |_n, f| f.nil? || f.is_a?(ExpressionFilter)  }.freeze
+        filters.select { |_n, f| f.nil? || f.is_a?(Filters::ExpressionFilter)  }.freeze
       end
 
       class << self

data/lib/capybara/selector/filters/base.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module Capybara
+  class Selector
+    module Filters
+      class Base
+        def initialize(name, block, options={})
+          @name = name
+          @block = block
+          @options = options
+          @options[:valid_values] = [true,false] if options[:boolean]
+        end
+
+        def default?
+          @options.has_key?(:default)
+        end
+
+        def default
+          @options[:default]
+        end
+
+        def skip?(value)
+          @options.has_key?(:skip_if) && value == @options[:skip_if]
+        end
+
+        private
+
+        def valid_value?(value)
+          !@options.has_key?(:valid_values) || Array(@options[:valid_values]).include?(value)
+        end
+      end
+    end
+  end
+end

data/lib/capybara/selector/filters/expression_filter.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+require 'capybara/selector/filters/base'
+
+module Capybara
+  class Selector
+    module Filters
+      class ExpressionFilter < Base
+        def apply_filter(expr, value)
+          return expr if skip?(value)
+
+          if !valid_value?(value)
+            msg = "Invalid value #{value.inspect} passed to expression filter #{@name} - "
+            if default?
+              warn msg + "defaulting to #{default}"
+              value = default
+            else
+              warn msg + "skipping"
+              return expr
+            end
+          end
+
+          @block.call(expr, value)
+        end
+      end
+
+      class IdentityExpressionFilter < ExpressionFilter
+        def initialize
+        end
+
+        def default?
+          false
+        end
+
+        def apply_filter(expr, _value)
+          return expr
+        end
+      end
+    end
+  end
+end

data/lib/capybara/selector/filters/node_filter.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+require 'capybara/selector/filters/base'
+
+module Capybara
+  class Selector
+    module Filters
+      class NodeFilter < Base
+        def matches?(node, value)
+          return true if skip?(value)
+
+          if !valid_value?(value)
+            msg = "Invalid value #{value.inspect} passed to filter #{@name} - "
+            if default?
+              warn msg + "defaulting to #{default}"
+              value = default
+            else
+              warn msg + "skipping"
+              return true
+            end
+          end
+
+          @block.call(node, value)
+        end
+      end
+    end
+  end
+end

data/lib/capybara/selector/selector.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'capybara/selector/expression_filter'
 require 'capybara/selector/filter_set'
 require 'capybara/selector/css'
 require 'xpath'
@@ -85,7 +84,7 @@ module Capybara
     def xpath(*expression_filters, &block)
       if block
         @format, @expression = :xpath, block
-        expression_filters.flatten.each { |ef| custom_filters[ef] = IdentityExpressionFilter.new }
+        expression_filters.flatten.each { |ef| custom_filters[ef] = Filters::IdentityExpressionFilter.new }
       end
       format == :xpath ? @expression : nil
     end
@@ -188,13 +187,13 @@ module Capybara
     def filter(name, *types_and_options, &block)
       options = types_and_options.last.is_a?(Hash) ? types_and_options.pop.dup : {}
       types_and_options.each { |k| options[k] = true }
-      custom_filters[name] = Filter.new(name, block, options)
+      custom_filters[name] = Filters::NodeFilter.new(name, block, options)
     end
 
     def expression_filter(name, *types_and_options, &block)
       options = types_and_options.last.is_a?(Hash) ? types_and_options.pop.dup : {}
       types_and_options.each { |k| options[k] = true }
-      custom_filters[name] = ExpressionFilter.new(name, block, options)
+      custom_filters[name] = Filters::ExpressionFilter.new(name, block, options)
     end
 
     def filter_set(name, filters_to_use = nil)
@@ -202,6 +201,7 @@ module Capybara
       f_set.filters.each do |n, filter|
         custom_filters[n] = filter if filters_to_use.nil? || filters_to_use.include?(n)
       end
+
       f_set.descriptions.each { |desc| @filter_set.describe(&desc) }
     end
 

data/lib/capybara/selenium/driver.rb

@@ -67,6 +67,13 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.navigate.to(path)
   end
 
+  def refresh
+    accept_modal(nil, wait: 0.1) do
+      browser.navigate.refresh
+    end
+  rescue Capybara::ModalNotFound
+  end
+
   def go_back
     browser.navigate.back
   end
@@ -284,7 +291,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
      ::Selenium::WebDriver::Error::ElementNotVisibleError,
      ::Selenium::WebDriver::Error::InvalidSelectorError, # Work around a race condition that can occur with chromedriver and #go_back/#go_forward
      ::Selenium::WebDriver::Error::ElementNotInteractableError,
-     ::Selenium::WebDriver::Error::ElementClickInterceptedError]
+     ::Selenium::WebDriver::Error::ElementClickInterceptedError,
+     ::Selenium::WebDriver::Error::InvalidElementStateError,
+     ::Selenium::WebDriver::Error::ElementNotSelectableError,
+    ]
   end
 
   def no_such_window_error
@@ -312,7 +322,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       caps = @processed_options[:desired_capabilities]
       chrome_options = caps[:chrome_options] || caps[:chromeOptions] || {}
       args = chrome_options['args'] || chrome_options[:args] || []
-      return args.include?("headless")
+      return args.include?("--headless") || args.include?("headless")
     end
     return false
   end

data/lib/capybara/selenium/node.rb

@@ -18,7 +18,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
 
   def value
     if tag_name == "select" and multiple?
-      native.find_elements(:xpath, ".//option").select { |n| n.selected? }.map { |n| n[:value] || n.text }
+      native.find_elements(:css, "option:checked").map { |n| n[:value] || n.text }
     else
       native[:value]
     end
@@ -38,65 +38,54 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   def set(value, options={})
     tag_name = self.tag_name
     type = self[:type]
+
     if (Array === value) && !multiple?
       raise ArgumentError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
     end
-    if tag_name == 'input' and type == 'radio'
-      click
-    elsif tag_name == 'input' and type == 'checkbox'
-      click if value ^ native.attribute('checked').to_s.eql?("true")
-    elsif tag_name == 'input' and type == 'file'
-      path_names = value.to_s.empty? ? [] : value
-      if driver.chrome?
-        native.send_keys(Array(path_names).join("\n"))
+
+    case tag_name
+    when 'input'
+      case type
+      when 'radio'
+        click
+      when 'checkbox'
+        click if value ^ native.attribute('checked').to_s.eql?("true")
+      when 'file'
+        path_names = value.to_s.empty? ? [] : value
+        if driver.chrome?
+          native.send_keys(Array(path_names).join("\n"))
+        else
+          native.send_keys(*path_names)
+        end
       else
-        native.send_keys(*path_names)
+        set_text(value, options)
       end
-    elsif tag_name == 'textarea' or tag_name == 'input'
-      if readonly?
-        warn "Attempt to set readonly element with value: #{value} \n *This will raise an exception in a future version of Capybara"
-      elsif value.to_s.empty?
-        native.clear
-      else
-        if options[:clear] == :backspace
-          # Clear field by sending the correct number of backspace keys.
-          backspaces = [:backspace] * self.value.to_s.length
-          native.send_keys(*(backspaces + [value.to_s]))
-        elsif options[:clear] == :none
-          native.send_keys(value.to_s)
-        elsif options[:clear].is_a? Array
-          native.send_keys(*options[:clear], value.to_s)
+    when 'textarea'
+      set_text(value, options)
+    else
+      if content_editable?
+        #ensure we are focused on the element
+        click
+
+        script = <<-JS
+          var range = document.createRange();
+          var sel = window.getSelection();
+          arguments[0].focus();
+          range.selectNodeContents(arguments[0]);
+          sel.removeAllRanges();
+          sel.addRange(range);
+        JS
+        driver.execute_script script, self
+
+        if (driver.chrome?) || (driver.firefox? && !driver.marionette?)
+          # chromedriver raises a can't focus element for child elements if we use native.send_keys
+          # we've already focused it so just use action api
+          driver.browser.action.send_keys(value.to_s).perform
         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
+          # action api is really slow here just use native.send_keys
           native.send_keys(value.to_s)
         end
       end
-    elsif native.attribute('isContentEditable')
-      #ensure we are focused on the element
-      native.click
-
-      script = <<-JS
-        var range = document.createRange();
-        var sel = window.getSelection();
-        arguments[0].focus();
-        range.selectNodeContents(arguments[0]);
-        sel.removeAllRanges();
-        sel.addRange(range);
-      JS
-      driver.execute_script script, self
-
-      if (driver.chrome?) ||
-         (driver.firefox? && !driver.marionette?)
-        # chromedriver raises a can't focus element for child elements if we use native.send_keys
-        # we've already focused it so just use action api
-        driver.browser.action.send_keys(value.to_s).perform
-      else
-        # action api is really slow here just use native.send_keys
-        native.send_keys(value.to_s)
-      end
     end
   end
 
@@ -105,9 +94,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def unselect_option
-    if select_node['multiple'] != 'multiple' and select_node['multiple'] != 'true'
-      raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box."
-    end
+    raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box." if !select_node.multiple?
     native.click if selected?
   end
 
@@ -173,6 +160,10 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     multiple and multiple != "false"
   end
 
+  def content_editable?
+    native.attribute('isContentEditable')
+  end
+
   def find_xpath(locator)
     native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
   end
@@ -212,6 +203,30 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
 private
   # a reference to the select node if this is an option node
   def select_node
-    find_xpath('./ancestor::select').first
+    find_xpath('./ancestor::select[1]').first
+  end
+
+  def set_text(value, options)
+    if readonly?
+      warn "Attempt to set readonly element with value: #{value} \n *This will raise an exception in a future version of Capybara"
+    elsif value.to_s.empty?
+      native.clear
+    else
+      if options[:clear] == :backspace
+        # Clear field by sending the correct number of backspace keys.
+        backspaces = [:backspace] * self.value.to_s.length
+        native.send_keys(*(backspaces + [value.to_s]))
+      elsif options[:clear] == :none
+        native.send_keys(value.to_s)
+      elsif options[:clear].is_a? Array
+        native.send_keys(*options[: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)
+      end
+    end
   end
 end