capybara 3.2.1 → 3.3.0

data/lib/capybara/rspec/features.rb

@@ -9,10 +9,8 @@ RSpec.shared_context "Capybara Features", capybara_feature: true do
 end
 
 # ensure shared_context is included if default shared_context_metadata_behavior is changed
-if RSpec::Core::Version::STRING.to_f >= 3.5
-  RSpec.configure do |config|
-    config.include_context "Capybara Features", capybara_feature: true
-  end
+RSpec.configure do |config|
+  config.include_context "Capybara Features", capybara_feature: true if config.respond_to?(:include_context)
 end
 
 RSpec.configure do |config|

data/lib/capybara/rspec/matchers.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
+require 'capybara/rspec/compound'
+
 module Capybara
   module RSpecMatchers
     class Matcher
-      if defined?(::RSpec::Expectations::Version)
-        require 'capybara/rspec/compound'
-        include ::Capybara::RSpecMatchers::Compound
-      end
+      include ::Capybara::RSpecMatchers::Compound if defined?(::Capybara::RSpecMatchers::Compound)
 
       attr_reader :failure_message, :failure_message_when_negated
 
@@ -199,10 +198,7 @@ module Capybara
     end
 
     class NegatedMatcher
-      if defined?(::RSpec::Expectations::Version)
-        require 'capybara/rspec/compound'
-        include ::Capybara::RSpecMatchers::Compound
-      end
+      include ::Capybara::RSpecMatchers::Compound if defined?(::Capybara::RSpecMatchers::Compound)
 
       def initialize(matcher)
         @matcher = matcher
@@ -229,6 +225,24 @@ module Capybara
       end
     end
 
+    class HaveStyle < Matcher
+      def initialize(*args)
+        @args = args
+      end
+
+      def matches?(actual)
+        wrap_matches?(actual) { |el| el.assert_style(*@args) }
+      end
+
+      def does_not_match?(_actual)
+        raise ArgumentError, "The have_style matcher does not support use with not_to/should_not"
+      end
+
+      def description
+        "have style"
+      end
+    end
+
     class BecomeClosed
       def initialize(options)
         @options = options
@@ -237,9 +251,9 @@ module Capybara
       def matches?(window)
         @window = window
         @wait_time = Capybara::Queries::BaseQuery.wait(@options, window.session.config.default_max_wait_time)
-        start_time = Capybara::Helpers.monotonic_time
+        timer = Capybara::Helpers.timer(expire_in: @wait_time)
         while window.exists?
-          return false if (Capybara::Helpers.monotonic_time - start_time) > @wait_time
+          return false if timer.expired?
           sleep 0.05
         end
         true
@@ -359,6 +373,12 @@ module Capybara
       HaveSelector.new(:table, locator, options, &optional_filter_block)
     end
 
+    # RSpec matcher for element style
+    # See {Capybara::Node::Matchers#has_style?}
+    def have_style(styles, **options)
+      HaveStyle.new(styles, options)
+    end
+
     %w[selector css xpath text title current_path link button field checked_field unchecked_field select table].each do |matcher_type|
       define_method "have_no_#{matcher_type}" do |*args, &optional_filter_block|
         NegatedMatcher.new(send("have_#{matcher_type}", *args, &optional_filter_block))

data/lib/capybara/selector.rb

@@ -112,6 +112,15 @@ Capybara.add_selector(:link) do
     href.is_a?(Regexp) ? node[:href].match(href) : true
   end
 
+  expression_filter(:download, valid_values: [true, false, String]) do |expr, download|
+    mod = case download
+    when true then XPath.attr(:download)
+    when false then !XPath.attr(:download)
+    when String then XPath.attr(:download) == download
+    end
+    expr[mod]
+  end
+
   describe do |**options|
     desc = +""
     desc << " with href #{options[:href].inspect}" if options[:href]

data/lib/capybara/selector/css.rb

@@ -16,12 +16,85 @@ module Capybara
         c =~ %r{[ -/:-~]} ? "\\#{c}" : format("\\%06x", c.ord)
       end
 
+      def self.split(css)
+        Splitter.new.split(css)
+      end
+
       S = '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
       H = /[0-9a-fA-F]/
       UNICODE  = /\\#{H}{1,6}[ \t\r\n\f]?/
       NONASCII = /[#{S}]/
       ESCAPE   = /#{UNICODE}|\\[ -~#{S}]/
-      NMSTART  = /[_a-zA-Z]|#{NONASCII}|#{ESCAPE}/
+      NMSTART = /[_a-zA-Z]|#{NONASCII}|#{ESCAPE}/
+
+      class Splitter
+        def split(css)
+          selectors = []
+          StringIO.open(css) do |str|
+            selector = ""
+            while (c = str.getc)
+              case c
+              when '['
+                selector += parse_square(str)
+              when '('
+                selector += parse_paren(str)
+              when '"', "'"
+                selector += parse_string(c, str)
+              when '\\'
+                selector += c + str.getc
+              when ','
+                selectors << selector.strip
+                selector = ""
+              else
+                selector += c
+              end
+            end
+            selectors << selector.strip
+          end
+          selectors
+        end
+
+      private
+
+        def parse_square(strio)
+          parse_block('[', ']', strio)
+        end
+
+        def parse_paren(strio)
+          parse_block('(', ')', strio)
+        end
+
+        def parse_block(start, final, strio)
+          block = start
+          while (c = strio.getc)
+            case c
+            when final
+              return block + c
+            when '\\'
+              block += c + strio.getc
+            when '"', "'"
+              block += parse_string(c, strio)
+            else
+              block += c
+            end
+          end
+          raise ArgumentError, "Invalid CSS Selector - Block end '#{final}' not found"
+        end
+
+        def parse_string(quote, strio)
+          string = quote
+          while (c = strio.getc)
+            string += c
+            case c
+            when quote
+              return string
+            when '\\'
+              string += strio.getc
+            end
+          end
+          raise ArgumentError, 'Invalid CSS Selector - string end not found'
+        end
+      end
     end
   end
 end

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

@@ -49,7 +49,8 @@ module Capybara
         end
 
         def valid_value?(value)
-          !@options.key?(:valid_values) || Array(@options[:valid_values]).include?(value)
+          return true unless @options.key?(:valid_values)
+          Array(@options[:valid_values]).any? { |valid| valid === value } # rubocop:disable Style/CaseEquality
         end
       end
     end

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

@@ -12,8 +12,9 @@ module Capybara
       end
 
       class IdentityExpressionFilter < ExpressionFilter
-        def initialize; end
+        def initialize(name); super(name, nil, nil); end
         def default?; false; end
+        def matcher?; false; end
         def apply_filter(expr, _name, _value); expr; end
       end
     end

data/lib/capybara/selector/selector.rb

@@ -223,7 +223,7 @@ module Capybara
     def xpath(*allowed_filters, &block)
       if block
         @format, @expression = :xpath, block
-        allowed_filters.flatten.each { |ef| expression_filters[ef] = Filters::IdentityExpressionFilter.new }
+        allowed_filters.flatten.each { |ef| expression_filters[ef] = Filters::IdentityExpressionFilter.new(ef) }
       end
       format == :xpath ? @expression : nil
     end

data/lib/capybara/selenium/driver.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "uri"
-require "English"
+require 'uri'
+require 'English'
 
 class Capybara::Selenium::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
@@ -10,18 +10,11 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     clear_session_storage: false
   }.freeze
   SPECIAL_OPTIONS = %i[browser clear_local_storage clear_session_storage].freeze
-
   attr_reader :app, :options
 
   def self.load_selenium
     require 'selenium-webdriver'
-    # Fix for selenium-webdriver 3.4.0 which misnamed these
-    unless defined?(::Selenium::WebDriver::Error::ElementNotInteractableError)
-      ::Selenium::WebDriver::Error.const_set('ElementNotInteractableError', Class.new(::Selenium::WebDriver::Error::WebDriverError))
-    end
-    unless defined?(::Selenium::WebDriver::Error::ElementClickInterceptedError)
-      ::Selenium::WebDriver::Error.const_set('ElementClickInterceptedError', Class.new(::Selenium::WebDriver::Error::WebDriverError))
-    end
+    warn "Warning: You're using an unsupported version of selenium-webdriver, please upgrade." if Gem::Version.new(Selenium::WebDriver::VERSION) < Gem::Version.new('3.5.0')
   rescue LoadError => e
     raise e if e.message !~ /selenium-webdriver/
     raise LoadError, "Capybara's selenium driver is unable to load `selenium-webdriver`, please install the gem and add `gem 'selenium-webdriver'` to your Gemfile if you are using bundler."
@@ -37,10 +30,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       @processed_options = options.reject { |key, _val| SPECIAL_OPTIONS.include?(key) }
       @browser = Selenium::WebDriver.for(options[:browser], @processed_options)
 
-      @w3c = ((defined?(Selenium::WebDriver::Remote::W3CCapabilities) && @browser.capabilities.is_a?(Selenium::WebDriver::Remote::W3CCapabilities)) ||
-              (defined?(Selenium::WebDriver::Remote::W3C::Capabilities) && @browser.capabilities.is_a?(Selenium::WebDriver::Remote::W3C::Capabilities)))
-      main = Process.pid
+      extend ChromeDriver if chrome?
+      extend MarionetteDriver if marionette?
 
+      main = Process.pid
       at_exit do
         # Store the exit status of the test run since it goes away after calling the at_exit proc...
         @exit_status = $ERROR_INFO.status if $ERROR_INFO.is_a?(SystemExit)
@@ -59,6 +52,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     @exit_status = nil
     @frame_handles = {}
     @options = DEFAULT_OPTIONS.merge(options)
+    @node_class = ::Capybara::Selenium::Node
   end
 
   def visit(path)
@@ -90,11 +84,11 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def find_xpath(selector)
-    browser.find_elements(:xpath, selector).map { |node| Capybara::Selenium::Node.new(self, node) }
+    browser.find_elements(:xpath, selector).map(&method(:build_node))
   end
 
   def find_css(selector)
-    browser.find_elements(:css, selector).map { |node| Capybara::Selenium::Node.new(self, node) }
+    browser.find_elements(:css, selector).map(&method(:build_node))
   end
 
   def wait?; true; end
@@ -123,13 +117,8 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     # Use instance variable directly so we avoid starting the browser just to reset the session
     return unless @browser
 
-    if firefox? || chrome?
-      switch_to_window(window_handles.first)
-      window_handles.slice(1..-1).each { |win| close_window(win) }
-    end
-
     navigated = false
-    start_time = Capybara::Helpers.monotonic_time
+    timer = Capybara::Helpers.timer(expire_in: 10)
     begin
       unless navigated
         # Only trigger a navigation if we haven't done it already, otherwise it
@@ -152,7 +141,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
       # Ensure the page is empty and trigger an UnhandledAlertError for any modals that appear during unload
       until find_xpath("/html/body/*").empty?
-        raise Capybara::ExpectationNotMet, 'Timed out waiting for Selenium session reset' if (Capybara::Helpers.monotonic_time - start_time) >= 10
+        raise Capybara::ExpectationNotMet, 'Timed out waiting for Selenium session reset' if timer.expired?
         sleep 0.05
       end
     rescue Selenium::WebDriver::Error::UnhandledAlertError, Selenium::WebDriver::Error::UnexpectedAlertOpenError
@@ -212,12 +201,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def resize_window_to(handle, width, height)
     within_given_window(handle) do
-      # Don't set the size if already set - See https://github.com/mozilla/geckodriver/issues/643
-      if marionette? && (window_size(handle) == [width, height])
-        {}
-      else
-        browser.manage.window.resize_to(width, height)
-      end
+      browser.manage.window.resize_to(width, height)
     end
   end
 
@@ -228,6 +212,12 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     sleep 0.1 # work around for https://code.google.com/p/selenium/issues/detail?id=7405
   end
 
+  def fullscreen_window(handle)
+    within_given_window(handle) do
+      browser.manage.window.full_screen
+    end
+  end
+
   def close_window(handle)
     raise ArgumentError, "Not allowed to close the primary window" if handle == window_handles.first
     within_given_window(handle) do
@@ -299,38 +289,36 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     Selenium::WebDriver::Error::NoSuchWindowError
   end
 
-  # @api private
+private
+
+  def w3c?
+    browser && browser.capabilities.is_a?(Selenium::WebDriver::Remote::W3C::Capabilities)
+  end
+
   def marionette?
-    firefox? && browser && @w3c
+    firefox? && w3c?
   end
 
-  # @api private
   def firefox?
     browser_name == :firefox
   end
 
-  # @api private
   def chrome?
     browser_name == :chrome
   end
 
-  # @api private
   def edge?
     browser_name == :edge
   end
 
-  # @api private
   def ie?
     browser_name == :ie
   end
 
-  # @api private
   def browser_name
     browser.browser
   end
 
-private
-
   def native_args(args)
     args.map { |arg| arg.is_a?(Capybara::Selenium::Node) ? arg.native : arg }
   end
@@ -354,11 +342,7 @@ private
   end
 
   def modal_error
-    if defined?(Selenium::WebDriver::Error::NoSuchAlertError)
-      Selenium::WebDriver::Error::NoSuchAlertError
-    else
-      Selenium::WebDriver::Error::NoAlertPresentError
-    end
+    Selenium::WebDriver::Error::NoSuchAlertError
   end
 
   def within_given_window(handle)
@@ -406,9 +390,16 @@ private
     when Hash
       arg.each { |k, v| arg[k] = unwrap_script_result(v) }
     when Selenium::WebDriver::Element
-      Capybara::Selenium::Node.new(self, arg)
+      build_node(arg)
     else
       arg
     end
   end
+
+  def build_node(native_node)
+    ::Capybara::Selenium::Node.new(self, native_node)
+  end
 end
+
+require 'capybara/selenium/driver_specializations/chrome_driver'
+require 'capybara/selenium/driver_specializations/marionette_driver'

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Capybara::Selenium::Driver::ChromeDriver
+  def fullscreen_window(handle)
+    within_given_window(handle) do
+      begin
+        super
+      rescue NoMethodError => e
+        raise unless e.message =~ /full_screen_window/
+        bridge = browser.send(:bridge)
+        result = bridge.http.call(:post, "session/#{bridge.session_id}/window/fullscreen", {})
+        result['value']
+      end
+    end
+  end
+
+  def resize_window_to(handle, width, height)
+    super
+  rescue Selenium::WebDriver::Error::UnknownError => e
+    raise unless e.message =~ /failed to change window state/
+    # Chromedriver doesn't wait long enough for state to change when coming out of fullscreen
+    # and raises unnecessary error. Wait a bit and try again.
+    sleep 0.5
+    super
+  end
+
+  def reset!
+    # Use instance variable directly so we avoid starting the browser just to reset the session
+    return unless @browser
+
+    switch_to_window(window_handles.first)
+    window_handles.slice(1..-1).each { |win| close_window(win) }
+    super
+  end
+end