capybara 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7a05e30cbe8690367f383d17347c7b804e4d344ad3133ade68455a048b42808
-  data.tar.gz: b636d45641d3a1984b28efb9cd1079df36e7f41bf7ae0dc99335aa36e925951a
+  metadata.gz: ec1af73714c227e46b54e14d716a63f2cc75011d2cb8f0fde62eecb8d5d07785
+  data.tar.gz: 907fecc783f2a9b23529e10b0e4775dc0f1015ffc5163157523772d192456e5f
 SHA512:
-  metadata.gz: 0e7499bd3c7f96850db011ebf6215c8e27e11cfcc0c9a000a12b655455d03969fcaa8b17d09cbb4e672ff5ac3eaeb84d45e98d556bc26c42f4f0e0f9b55a7573
-  data.tar.gz: '053149fbaa728ab525ed988ef231fcc8189db64baf64fc6be64df8d05c86bd9ca13023028fdd1fe92751fc7345df2e4930e3cccf20306c7805265c27ee09518e'
+  metadata.gz: f5c6f7cdf74cb231ee795c299f7ee28688dc8ecfd371b97c1744e77a823209e5270626cdf36e8c171fe1018394d1f1176b15e0b61e88e18f4c60ff402d1aad88
+  data.tar.gz: 29fcba8784b579ff159a00df91ddf83aa0cdc14fb6061535943933aa89796848068b8dea1da723cdaeda9ec3a3c81c8ce7fb7857f052b3764ffe7cbcea790d93

data/History.md

@@ -1,3 +1,24 @@
+# Version 3.3.0
+Release date: 2018-06-25
+
+### Added
+
+* RackTest driver now handles 307/308 redirects
+* `execute_async_script` can now be called on elements to run the JS in the context of the element
+* `:download` filter option on `:link' selector
+* `Window#fullscreen`
+* `Element#style` and associated matchers
+
+### Changed
+
+* Minimum "supported" `selenium-webdriver` is raised to 3.5.0 (but you really should be using newer than that)
+
+### Fixes
+
+* Selenium driver with Firefox workaround for clicking on table row - https://github.com/mozilla/geckodriver/issues/1228
+* :class and :id filters applied to CSS based selectors now correctly handle the CSS comma
+* Selenium driver handles namespaces when generating an elements `#path` - Issue #2048
+
 # Version 3.2.1
 Release date: 2018-06-04
 
@@ -17,7 +38,7 @@ Release date: 2018-06-01
 ### Added
 
 * New global configuration `default_set_options` used in `Capybara::Node::Element#set` as default `options` hash [Champier Cyril]
-* `execute_javascript` and `evaluate_javascript` can now be called on elements to run the JS in the context of the element [Thomas Walpole]
+* `execute_script` and `evaluate_script` can now be called on elements to run the JS in the context of the element [Thomas Walpole]
 * Filters in custom selectors now support a `matcher` Regexp to handle multiple filter options [Thomas Walpole]
 * `:element` selector type which will match on any attribute (other than the reserved names) passed as a filter option [Thomas Walpole]
 * `:class` filter option now supports preceding class names with `!` to indicate not having that class [Thomas Walpole]

data/README.md

@@ -2,9 +2,9 @@
 
 [![Build Status](https://secure.travis-ci.org/teamcapybara/capybara.svg)](https://travis-ci.org/teamcapybara/capybara)
 [![Build Status](https://ci.appveyor.com/api/projects/status/github/teamcapybara/capybara?svg=true)](https://ci.appveyor.com/api/projects/github/teamcapybara/capybara)
-[![Dependency Status](https://gemnasium.com/teamcapybara/capybara.svg)](https://gemnasium.com/teamcapybara/capybara)
 [![Code Climate](https://codeclimate.com/github/teamcapybara/capybara.svg)](https://codeclimate.com/github/teamcapybara/capybara)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jnicklas/capybara?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![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.2_stable/README.md

data/lib/capybara.rb

@@ -406,6 +406,7 @@ module Capybara
   require 'capybara/queries/match_query'
   require 'capybara/queries/ancestor_query'
   require 'capybara/queries/sibling_query'
+  require 'capybara/queries/style_query'
 
   require 'capybara/node/finders'
   require 'capybara/node/matchers'
@@ -426,6 +427,7 @@ module Capybara
   require 'capybara/rack_test/css_handlers.rb'
 
   require 'capybara/selenium/node'
+  require 'capybara/selenium/nodes/marionette_node'
   require 'capybara/selenium/driver'
 end
 

data/lib/capybara/driver/base.rb

@@ -90,7 +90,11 @@ class Capybara::Driver::Base
   end
 
   def maximize_window(handle)
-    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#maximize_current_window'
+    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#maximize_window'
+  end
+
+  def fullscreen_window(handle)
+    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#fullscreen_window'
   end
 
   def close_window(handle)

data/lib/capybara/driver/node.rb

@@ -26,6 +26,10 @@ module Capybara
         raise NotImplementedError
       end
 
+      def style(styles)
+        raise NotImplementedError
+      end
+
       # @param value String or Array. Array is only allowed if node has 'multiple' attribute
       # @param options [Hash{}] Driver specific options for how to set a value on a node
       def set(value, **options)

data/lib/capybara/helpers.rb

@@ -74,5 +74,30 @@ module Capybara
     else
       def monotonic_time; Time.now.to_f; end
     end
+
+    def timer(expire_in:)
+      Timer.new(expire_in)
+    end
+
+    class Timer
+      def initialize(expire_in)
+        @start = current
+        @expire_in = expire_in
+      end
+
+      def expired?
+        current - @start >= @expire_in
+      end
+
+      def stalled?
+        @start == current
+      end
+
+    private
+
+      def current
+        Capybara::Helpers.monotonic_time
+      end
+    end
   end
 end

data/lib/capybara/minitest.rb

@@ -81,9 +81,15 @@ module Capybara
       # @!method assert_xpath
       #   see {Capybara::Node::Matchers#assert_not_matches_selector}
 
+      ## Assert element has the provided CSS styles
+      #
+      # @!method assert_style
+      #   see {Capybara::Node::Matchers#assert_style}
+
       %w[assert_selector assert_no_selector
          assert_all_of_selectors assert_none_of_selectors
-         assert_matches_selector assert_not_matches_selector].each do |assertion_name|
+         assert_matches_selector assert_not_matches_selector
+         assert_style].each do |assertion_name|
         class_eval <<-ASSERTION, __FILE__, __LINE__ + 1
           def #{assertion_name} *args, &optional_filter_block
             self.assertions +=1

data/lib/capybara/minitest/spec.rb

@@ -15,7 +15,8 @@ module Capybara
         [%W[assert_#{assertion} must_have_#{assertion}],
          %W[refute_#{assertion} wont_have_#{assertion}]]
       end + [%w[assert_all_of_selectors must_have_all_of_selectors],
-             %w[assert_none_of_selectors must_have_none_of_selectors]] +
+             %w[assert_none_of_selectors must_have_none_of_selectors],
+             %w[assert_style must_have_style]] +
       %w[selector xpath css].flat_map do |assertion|
         [%W[assert_matches_#{assertion} must_match_#{assertion}],
          %W[refute_matches_#{assertion} wont_match_#{assertion}]]
@@ -163,6 +164,12 @@ module Capybara
       #
       # @!method wont_have_current_path
       #   see {Capybara::SessionMatchers#assert_no_current_path}
+
+      ##
+      # Expectation that element has style
+      #
+      # @!method must_have_style
+      #   see {Capybara::SessionMatchers#assert_style}
     end
   end
 end

data/lib/capybara/node/base.rb

@@ -78,15 +78,15 @@ module Capybara
           yield
         else
           session.synchronized = true
-          start_time = Capybara::Helpers.monotonic_time
+          timer = Capybara::Helpers.timer(expire_in: seconds)
           begin
             yield
           rescue StandardError => e
             session.raise_server_error!
             raise e unless driver.wait? && catch_error?(e, errors)
-            raise e if (Capybara::Helpers.monotonic_time - start_time) >= seconds
+            raise e 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 Capybara::Helpers.monotonic_time == start_time
+            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/element.rb

@@ -71,6 +71,29 @@ module Capybara
         synchronize { base[attribute] }
       end
 
+      ##
+      #
+      # Retrieve the given CSS styles
+      #
+      #     element.style('color', 'font-size') # => Computed values of CSS 'color' and 'font-size' styles
+      #
+      # @param [String]  Names of the desired CSS properties
+      # @return [Hash]   Hash of the CSS property names to computed values
+      #
+      def style(*styles)
+        styles = styles.flatten.map(&:to_s)
+        raise ArgumentError, "You must specify at least one CSS style" if styles.empty?
+        begin
+          synchronize { base.style(styles) }
+        rescue NotImplementedError => e
+          begin
+            evaluate_script(STYLE_SCRIPT, *styles)
+          rescue Capybara::NotSupportedByDriverError
+            raise e
+          end
+        end
+      end
+
       ##
       #
       # @return [String]    The value of the form element
@@ -381,6 +404,23 @@ module Capybara
         JS
       end
 
+      ##
+      #
+      # Evaluate the given JavaScript in the context of the element and obtain the result from a
+      # callback function which will be passed as the last argument to the script. `this` in the
+      # script will refer to the element this is called on
+      #
+      # @param  [String] script   A string of JavaScript to evaluate
+      # @return [Object]          The result of the evaluated JavaScript (may be driver specific)
+      #
+      def evaluate_async_script(script, *args)
+        session.evaluate_async_script(<<~JS, self, *args)
+          (function (){
+            #{script}
+          }).apply(arguments[0], Array.prototype.slice.call(arguments,1));
+        JS
+      end
+
       def reload
         if @allow_reload
           begin
@@ -402,6 +442,18 @@ module Capybara
 
         %(Obsolete #<Capybara::Node::Element>)
       end
+
+      STYLE_SCRIPT = <<~JS
+        (function(){
+          var s = window.getComputedStyle(this);
+          var result = {};
+          for (var i = arguments.length; i--; ) {
+            var property_name = arguments[i];
+            result[property_name] = s.getPropertyValue(property_name);
+          }
+          return result;
+        }).apply(this, arguments)
+      JS
     end
   end
 end

data/lib/capybara/node/matchers.rb

@@ -56,6 +56,21 @@ module Capybara
         false
       end
 
+      ##
+      #
+      # Checks if a an element has the specified CSS styles
+      #
+      #     element.has_style?( 'color' => 'rgb(0,0,255)', 'font-size' => /px/ )
+      #
+      # @param styles [Hash]
+      # @return [Boolean]                       If the styles match
+      #
+      def has_style?(styles, **options)
+        assert_style(styles, **options)
+      rescue Capybara::ExpectationNotMet
+        false
+      end
+
       ##
       #
       # Asserts that a given selector is on the page or a descendant of the current node.
@@ -97,6 +112,24 @@ module Capybara
         end
       end
 
+      ##
+      #
+      # Asserts that an element has the specified CSS styles
+      #
+      #     element.assert_style( 'color' => 'rgb(0,0,255)', 'font-size' => /px/ )
+      #
+      # @param styles [Hash]
+      # @raise [Capybara::ExpectationNotMet]    If the element doesn't have the specified styles
+      #
+      def assert_style(styles, **options)
+        query_args = _set_query_session_options(styles, options)
+        query = Capybara::Queries::StyleQuery.new(*query_args)
+        synchronize(query.wait) do
+          raise Capybara::ExpectationNotMet, query.failure_message unless query.resolves_for?(self)
+        end
+        true
+      end
+
       # Asserts that all of the provided selectors are present on the given page
       # or descendants of the current node.  If options are provided, the assertion
       # will check that each locator is present with those options as well (other than :wait).

data/lib/capybara/queries/selector_query.rb

@@ -225,14 +225,14 @@ module Capybara
           raise ArgumentError, "XPath expressions are not supported for the :class filter with CSS based selectors"
         end
 
-        if process_class || process_id
-          css_selectors = expr.split(',').map(&:rstrip)
-          expr = css_selectors.map do |sel|
-            sel += "##{Capybara::Selector::CSS.escape(options[:id])}" if process_id
+        if process_id || process_class
+          expr = ::Capybara::Selector::CSS.split(expr).map do |sel|
+            sel += "##{::Capybara::Selector::CSS.escape(options[:id])}" if process_id
             sel += css_from_classes(Array(options[:class])) if process_class
             sel
           end.join(", ")
         end
+
         expr
       end
 

data/lib/capybara/queries/style_query.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Capybara
+  # @api private
+  module Queries
+    class StyleQuery < BaseQuery
+      def initialize(expected_styles, session_options:, **options)
+        @expected_styles = expected_styles.each_with_object({}) { |(style, value), str_keys| str_keys[style.to_s] = value }
+        @options = options
+        @actual_styles = {}
+        super(@options)
+        self.session_options = session_options
+
+        assert_valid_keys
+      end
+
+      def resolves_for?(node)
+        @node = node
+        @actual_styles = node.style(*@expected_styles.keys)
+        @expected_styles.all? do |style, value|
+          if value.is_a? Regexp
+            @actual_styles[style] =~ value
+          else
+            @actual_styles[style] == value
+          end
+        end
+      end
+
+      def failure_message
+        +"Expected node to have styles #{@expected_styles.inspect}. " \
+         "Actual styles were #{@actual_styles.inspect}"
+      end
+
+    private
+
+      def valid_keys
+        %i[wait]
+      end
+    end
+  end
+end

data/lib/capybara/rack_test/browser.rb

@@ -44,7 +44,13 @@ class Capybara::RackTest::Browser
     return unless driver.follow_redirects?
 
     driver.redirect_limit.times do
-      process(:get, last_response["Location"], {}, env) if last_response.redirect?
+      if last_response.redirect?
+        if [307, 308].include? last_response.status
+          process(last_request.request_method, last_response["Location"], last_request.params, env)
+        else
+          process(:get, last_response["Location"], {}, env)
+        end
+      end
     end
     raise Capybara::InfiniteRedirectError, "redirected more than #{driver.redirect_limit} times, check for infinite redirects." if last_response.redirect?
   end

data/lib/capybara/rack_test/node.rb

@@ -24,6 +24,10 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     string_node[name]
   end
 
+  def style(_styles)
+    raise NotImplementedError, "The rack_test driver does not process CSS"
+  end
+
   def value
     string_node.value
   end

data/lib/capybara/rspec/compound.rb

@@ -1,89 +1,91 @@
 # frozen_string_literal: true
 
-module Capybara
-  module RSpecMatchers
-    module Compound
-      include ::RSpec::Matchers::Composable
+if defined?(::RSpec::Expectations::Version)
+  module Capybara
+    module RSpecMatchers
+      module Compound
+        include ::RSpec::Matchers::Composable
 
-      def and(matcher)
-        And.new(self, matcher)
-      end
-
-      def and_then(matcher)
-        ::RSpec::Matchers::BuiltIn::Compound::And.new(self, matcher)
-      end
-
-      def or(matcher)
-        Or.new(self, matcher)
-      end
+        def and(matcher)
+          And.new(self, matcher)
+        end
 
-      class CapybaraEvaluator
-        def initialize(actual)
-          @actual = actual
-          @match_results = Hash.new { |h, matcher| h[matcher] = matcher.matches?(@actual) }
+        def and_then(matcher)
+          ::RSpec::Matchers::BuiltIn::Compound::And.new(self, matcher)
         end
 
-        def matcher_matches?(matcher)
-          @match_results[matcher]
+        def or(matcher)
+          Or.new(self, matcher)
         end
 
-        def reset
-          @match_results.clear
+        class CapybaraEvaluator
+          def initialize(actual)
+            @actual = actual
+            @match_results = Hash.new { |h, matcher| h[matcher] = matcher.matches?(@actual) }
+          end
+
+          def matcher_matches?(matcher)
+            @match_results[matcher]
+          end
+
+          def reset
+            @match_results.clear
+          end
         end
-      end
 
-      class And < ::RSpec::Matchers::BuiltIn::Compound::And
-      private
+        class And < ::RSpec::Matchers::BuiltIn::Compound::And
+        private
 
-        def match(_expected, actual)
-          @evaluator = CapybaraEvaluator.new(actual)
-          syncer = sync_element(actual)
-          begin
-            syncer.synchronize do
-              @evaluator.reset
-              raise ::Capybara::ElementNotFound unless [matcher_1_matches?, matcher_2_matches?].all?
-              true
+          def match(_expected, actual)
+            @evaluator = CapybaraEvaluator.new(actual)
+            syncer = sync_element(actual)
+            begin
+              syncer.synchronize do
+                @evaluator.reset
+                raise ::Capybara::ElementNotFound unless [matcher_1_matches?, matcher_2_matches?].all?
+                true
+              end
+            rescue StandardError
+              false
             end
-          rescue StandardError
-            false
           end
-        end
 
-        def sync_element(el)
-          if el.respond_to? :synchronize
-            el
-          elsif el.respond_to? :current_scope
-            el.current_scope
-          else
-            Capybara.string(el)
+          def sync_element(el)
+            if el.respond_to? :synchronize
+              el
+            elsif el.respond_to? :current_scope
+              el.current_scope
+            else
+              Capybara.string(el)
+            end
           end
         end
-      end
 
-      class Or < ::RSpec::Matchers::BuiltIn::Compound::Or
-      private
+        class Or < ::RSpec::Matchers::BuiltIn::Compound::Or
+        private
 
-        def match(_expected, actual)
-          @evaluator = CapybaraEvaluator.new(actual)
-          syncer = sync_element(actual)
-          begin
-            syncer.synchronize do
-              @evaluator.reset
-              raise ::Capybara::ElementNotFound unless [matcher_1_matches?, matcher_2_matches?].any?
-              true
+          def match(_expected, actual)
+            @evaluator = CapybaraEvaluator.new(actual)
+            syncer = sync_element(actual)
+            begin
+              syncer.synchronize do
+                @evaluator.reset
+                raise ::Capybara::ElementNotFound unless [matcher_1_matches?, matcher_2_matches?].any?
+                true
+              end
+            rescue StandardError
+              false
             end
-          rescue StandardError
-            false
           end
-        end
 
-        def sync_element(el)
-          if el.respond_to? :synchronize
-            el
-          elsif el.respond_to? :current_scope
-            el.current_scope
-          else
-            Capybara.string(el)
+          def sync_element(el)
+            if el.respond_to? :synchronize
+              el
+            elsif el.respond_to? :current_scope
+              el.current_scope
+            else
+              Capybara.string(el)
+            end
           end
         end
       end