capybara 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 354c57c570fb124607ab4255934f26bdb55b81716b846a2d76bb938ecae5d0c0
-  data.tar.gz: 128b9ee025bcd0021bc7e966a57d96fc05b516bd8dcb29756f3206f8aef15d4f
+  metadata.gz: ccbb47ddccdce3cfd6a790bd2af929bf21f0dff5a9c284c1798fced5de3deef0
+  data.tar.gz: abcbaadffc9b324fcb05601b14a923a051471de760c6a290acd4c020f7f53428
 SHA512:
-  metadata.gz: c55429aed39e48dbe84375f0822e2f0f244e4572474a797a27e8f83bdf0fa3c8062ca91d6696aba1b54c228908385351c483598a9f44718529d7ad4139b0717c
-  data.tar.gz: 8c61a46eb89183e28c4e0e7be76118ccecceb3383a6c7c37b2f9d7d0aa5efe5971146a97374146df09881a2fe0da94f58a89822cdb9e6d53b95f502782eb9106
+  metadata.gz: dee7228b9108ed669bf8796cfe024a49594b8820f5b0899118d49a90ecd8616453ec42b5467b0a833156ae0f10ff57df3e627f2b2e164ad4edc68fcef7cc0e6e
+  data.tar.gz: 7de8b0aa5ab6b9565b17732a61e6e693b431806c33cb2d64098f3f2d6d0440383af96f2930cff0197b11e92059e48878210a4254309320eeaf73f0cf470b256f

data/History.md

@@ -1,3 +1,28 @@
+# Version 3.5.0
+Release date: 2018-08-01
+
+### Added
+
+* text predicates and matchers (`has_text?`, `has_content?`, `assert_text`, etc) now support a `normalize_ws` option
+
+### Fixed
+
+* `attach_file` with Selenium and local Firefox 62+ now correctly generates only one change event when attaching multiple files
+
+# Version 3.4.2
+Release date: 2018-07-24
+
+### Fixed
+
+* `match_xxx` selectors and `matches_xxx?` predicates work correctly with elements found using a sibling selector - Issue #2073
+
+# Version 3.4.1
+Release date: 2018-07-20
+
+### Fixed
+
+* `Session#evaluate_script` now strips the script in `Session` rather than only in the Selenium driver
+
 # Version 3.4.0
 Release date: 2018-07-19
 

data/README.md

@@ -76,7 +76,7 @@ GitHub): http://groups.google.com/group/ruby-capybara
 
 ## <a name="setup"></a>Setup
 
-Capybara requires Ruby 2.2.2 or later. To install, add this line to your
+Capybara requires Ruby 2.3.0 or later. To install, add this line to your
 `Gemfile` and run `bundle install`:
 
 ```ruby

data/lib/capybara/node/element.rb

@@ -344,7 +344,9 @@ module Capybara
       ##
       #
       # Trigger any event on the current element, for example mouseover or focus
-      # events. Does not work in Selenium.
+      # events. Not supported with the Selenium driver, and SHOULDN'T BE USED IN TESTING unless you
+      # fully understand why you're using it, that it can allow actions a user could never
+      # perform, and that it may completely invalidate your test.
       #
       # @param [String] event       The name of the event to trigger
       #

data/lib/capybara/node/matchers.rb

@@ -203,7 +203,6 @@ module Capybara
           end
         end
       end
-      alias_method :refute_selector, :assert_no_selector
 
       ##
       #
@@ -529,7 +528,24 @@ module Capybara
           raise Capybara::ExpectationNotMet, 'Item matched the provided selector' if result.include? self
         end
       end
-      alias_method :refute_matches_selector, :assert_not_matches_selector
+
+      # Deprecated
+      # TODO: remove
+      def refute_selector(*args, &optional_filter_block)
+        warn '`refute_selector` was never meant to be in this scope unless ' \
+             'using minitest.  Either replace with `assert_no_selector` ' \
+             "or require 'capybara/minitest'."
+        assert_no_selector(*args, &optional_filter_block)
+      end
+
+      # Deprecated
+      # TODO: remove
+      def refute_matches_elector(*args, &optional_filter_block)
+        warn '`refute_matches_selector` was never meant to be in this scope unless ' \
+             'using minitest.  Either replace with `assert_not_matches_selector` ' \
+             "or require 'capybara/minitest'."
+        assert_not_matches_selector(*args, &optional_filter_block)
+      end
 
       ##
       #
@@ -616,6 +632,7 @@ module Capybara
       #     @option options [Range]   :between (nil)   Range of times that is expected to contain number of times text occurs
       #     @option options [Numeric] :wait (Capybara.default_max_wait_time)      Maximum time that Capybara will wait for text to eq/match given string/regexp argument
       #     @option options [Boolean] :exact (Capybara.exact_text) Whether text must be an exact match or just substring
+      #     @option options [Boolean] :nomalize_ws (false) When true replace all whitespace with standard spaces and collapse consecutive whitespace to a single space
       #   @overload $0(text, **options)
       #     @param [String, Regexp] text               The string/regexp to check for. If it's a string, text is expected to include it. If it's a regexp, text is expected to match it.
       #     @option options [Integer] :count (nil)     Number of times the text is expected to occur
@@ -624,6 +641,7 @@ module Capybara
       #     @option options [Range]   :between (nil)   Range of times that is expected to contain number of times text occurs
       #     @option options [Numeric] :wait (Capybara.default_max_wait_time)      Maximum time that Capybara will wait for text to eq/match given string/regexp argument
       #     @option options [Boolean] :exact (Capybara.exact_text) Whether text must be an exact match or just substring
+      #     @option options [Boolean] :normalize_ws (false) When true replace all whitespace with standard spaces and collapse consecutive whitespace to a single space
       # @raise [Capybara::ExpectationNotMet] if the assertion hasn't succeeded during wait time
       # @return [true]
       #
@@ -709,7 +727,7 @@ module Capybara
         query_args = _set_query_session_options(*query_args)
         query = Capybara::Queries::MatchQuery.new(*query_args, &optional_filter_block)
         synchronize(query.wait) do
-          yield query.resolve_for(query_scope)
+          yield query.resolve_for(first(:xpath, './parent::*', minimum: 0) || query_scope)
         end
         true
       end

data/lib/capybara/queries/text_query.rb

@@ -24,6 +24,7 @@ module Capybara
       def resolve_for(node)
         @node = node
         @actual_text = text(node, @type)
+        @actual_text.gsub!(/[[:space:]]+/, ' ').strip! if options[:normalize_ws]
         @count = @actual_text.scan(@search_regexp).size
       end
 
@@ -83,7 +84,7 @@ module Capybara
       end
 
       def valid_keys
-        COUNT_KEYS + %i[wait exact]
+        COUNT_KEYS + %i[wait exact normalize_ws]
       end
 
       def check_visible_text?

data/lib/capybara/rspec/matchers.rb

@@ -9,6 +9,11 @@ module Capybara
 
       attr_reader :failure_message, :failure_message_when_negated
 
+      def initialize(*args, &filter_block)
+        @args = args.dup
+        @filter_block = filter_block
+      end
+
       def wrap(actual)
         actual = actual.to_capybara_node if actual.respond_to?(:to_capybara_node)
         @context_el = if actual.respond_to?(:has_selector?)
@@ -56,11 +61,6 @@ module Capybara
     end
 
     class HaveSelector < Matcher
-      def initialize(*args, &filter_block)
-        @args = args
-        @filter_block = filter_block
-      end
-
       def matches?(actual)
         wrap_matches?(actual) { |el| el.assert_selector(*@args, &@filter_block) }
       end
@@ -79,11 +79,6 @@ module Capybara
     end
 
     class HaveAllSelectors < Matcher
-      def initialize(*args, &filter_block)
-        @args = args
-        @filter_block = filter_block
-      end
-
       def matches?(actual)
         wrap_matches?(actual) { |el| el.assert_all_of_selectors(*@args, &@filter_block) }
       end
@@ -98,11 +93,6 @@ module Capybara
     end
 
     class HaveNoSelectors < Matcher
-      def initialize(*args, &filter_block)
-        @args = args
-        @filter_block = filter_block
-      end
-
       def matches?(actual)
         wrap_matches?(actual) { |el| el.assert_none_of_selectors(*@args, &@filter_block) }
       end
@@ -135,11 +125,6 @@ module Capybara
     end
 
     class HaveText < Matcher
-      def initialize(*args)
-        @args = args.dup
-        @content = args[0].is_a?(Symbol) ? args[1] : args[0]
-      end
-
       def matches?(actual)
         wrap_matches?(actual) { |el| el.assert_text(*@args) }
       end
@@ -149,22 +134,21 @@ module Capybara
       end
 
       def description
-        "text #{format(@content)}"
+        "text #{format(text)}"
       end
 
       def format(content)
         content.inspect
       end
-    end
 
-    class HaveTitle < Matcher
-      def initialize(*args)
-        @args = args
+    private
 
-        # are set just for backwards compatability
-        @title = args.first
+      def text
+        @args[0].is_a?(Symbol) ? @args[1] : @args[0]
       end
+    end
 
+    class HaveTitle < Matcher
       def matches?(actual)
         wrap_matches?(actual) { |el| el.assert_title(*@args) }
       end
@@ -174,16 +158,17 @@ module Capybara
       end
 
       def description
-        "have title #{@title.inspect}"
+        "have title #{title.inspect}"
       end
-    end
 
-    class HaveCurrentPath < Matcher
-      def initialize(*args)
-        @args = args
-        @current_path = args.first
+    private
+
+      def title
+        @args.first
       end
+    end
 
+    class HaveCurrentPath < Matcher
       def matches?(actual)
         wrap_matches?(actual) { |el| el.assert_current_path(*@args) }
       end
@@ -193,7 +178,13 @@ module Capybara
       end
 
       def description
-        "have current path #{@current_path.inspect}"
+        "have current path #{current_path.inspect}"
+      end
+
+    private
+
+      def current_path
+        @args.first
       end
     end
 
@@ -201,6 +192,7 @@ module Capybara
       include ::Capybara::RSpecMatchers::Compound if defined?(::Capybara::RSpecMatchers::Compound)
 
       def initialize(matcher)
+        super()
         @matcher = matcher
       end
 
@@ -226,10 +218,6 @@ module Capybara
     end
 
     class HaveStyle < Matcher
-      def initialize(*args)
-        @args = args
-      end
-
       def matches?(actual)
         wrap_matches?(actual) { |el| el.assert_style(*@args) }
       end

data/lib/capybara/selenium/driver.rb

@@ -99,7 +99,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def evaluate_script(script, *args)
-    result = execute_script("return #{script.strip}", *args)
+    result = execute_script("return #{script}", *args)
     unwrap_script_result(result)
   end
 
@@ -312,7 +312,7 @@ private
   end
 
   def ie?
-    browser_name == :ie
+    %i[internet_explorer ie].include?(browser_name)
   end
 
   def browser_name

data/lib/capybara/selenium/node.rb

@@ -176,7 +176,14 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
 
       if parent
         siblings = parent.find_xpath(selector)
-        selector += "[#{siblings.index(node) + 1}]" unless siblings.size == 1
+        selector += case siblings.size
+        when 0
+          '[ERROR]' # IE doesn't support full XPath (namespace-uri, etc)
+        when 1
+          '' # index not necessary when only one matching element
+        else
+          "[#{siblings.index(node) + 1}]"
+        end
       end
       result.push selector
     end

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

@@ -5,7 +5,7 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
     super(value)
   rescue ::Selenium::WebDriver::Error::ExpectedError => e
     if e.message =~ /File not found : .+\n.+/m
-      raise ArgumentError, "Selenium with remote Chrome doesn't currently support multiple file upload"
+      raise ArgumentError, "Selenium < 3.14 with remote Chrome doesn't support multiple file upload"
     end
     raise
   end

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

@@ -26,8 +26,11 @@ class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
   end
 
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
+    native.clear # By default files are appended so we have to clear here
+    return super if driver.browser.capabilities[:browser_version].to_f >= 62.0
+
+    # Workaround lack of support for multiple upload by uploading one at a time
     path_names = value.to_s.empty? ? [] : value
-    native.clear
     Array(path_names).each do |path|
       unless driver.browser.respond_to?(:upload)
         if (fd = bridge.file_detector)
@@ -47,7 +50,7 @@ private
 
   def upload(local_file)
     unless File.file?(local_file)
-      raise Error::WebDriverError, "you may only upload files: #{local_file.inspect}"
+      raise ArgumentError, "You may only upload files: #{local_file.inspect}"
     end
 
     result = bridge.http.call(:post, "session/#{bridge.session_id}/file", file: Selenium::WebDriver::Zipper.zip_file(local_file))

data/lib/capybara/session.rb

@@ -580,7 +580,7 @@ module Capybara
     #
     def evaluate_script(script, *args)
       @touched = true
-      result = driver.evaluate_script(script, *driver_args(args))
+      result = driver.evaluate_script(script.strip, *driver_args(args))
       element_script_result(result)
     end