capybara 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cbea94168c582ba31d25ccf5f24312005b47616
-  data.tar.gz: 7b779b6363ffb09be883cfe71ac2fde7cd616851
+  metadata.gz: fbc8500c466333af5900b64e398ea4bb73221857
+  data.tar.gz: f1ccdd60394f1d8d6a73bdc6cc2f70cbd05459f6
 SHA512:
-  metadata.gz: 132688050a792bda11f9d4054aa5bac76e6f4070668f72c10bce230060d622e306e9eeb1b2bb079de66d428ca24f2814d07102083619db4e8f53075c473727a6
-  data.tar.gz: dbd2d43752dad9b40b2281ca1281cd3751e774ba6b785024f98c3c7c845637cdb76c36521343d16f338af34c21439cab00a76f837b32c4a1a88115f52a99e674
+  metadata.gz: 1c18871ba8adfa7f8ed70df32f332909cff6d6ee2518fefb252de17267d5549a6a281e6958e3dfb5cda029002be4b51203d0793bbe454e96d7998583a576cd74
+  data.tar.gz: 8be99a4f361374e92c9cbb9050920e7c031d4e8cfdcbf1d5fef28cdcfe938df6b61531a817afff9a7910ea9b28b7a0636512420abcdcbedc98fd1dfbcafc25dd

data/History.md

@@ -1,3 +1,10 @@
+#Version 2.8.1
+Release data: 2016-08-25
+
+###Fixed
+* Fixed error message from have_text when text is not found but contains regex special characters [Ryunosuke Sato]
+* Warn when :exact option is passed that has no effect [Thomas Walpole]
+
 # Version 2.8.0
 Release date: 2016-08-16
 
@@ -5,7 +12,7 @@ Release date: 2016-08-16
 * Issue with modals present when closing the page using selenium - Issue #1696 [Jonas Nicklas, Thomas Walpole]
 * Server errors raised in test code have the cause set to an explanatory exception
   in rubies that support Exception#cause rather than a confusing ExpectationNotMet - Issue #1719 [Thomas Walpole]
-* background/given/given! RSoec aliases will work if RSpec config.shared_context_metadata_behavior == :apply_to_host_groups [Thomas Walpole]
+* background/given/given! RSpec aliases will work if RSpec config.shared_context_metadata_behavior == :apply_to_host_groups [Thomas Walpole]
 * Fixed setting of unexpectedAlertError now that Selenium will be freezing the Capabilities::DEFAULTS [Thomas Walpole]
 
 ### Added

data/README.md

@@ -13,7 +13,7 @@ through an external gem.
 **Need help?** Ask on the mailing list (please do not open an issue on
 GitHub): http://groups.google.com/group/ruby-capybara
 
-**Note: Firefox 48** If you're using Firefox with selenium-webdrvier, stay on Firefox 47.0.1 and selenium-webdriver 2.53.4.  Firefox 48 requires geckodriver and is not supported without selenium-webdriver 3 which currently has multiple issues and is feature incomplete
+**Note: Firefox 48** If you're using Firefox with selenium-webdrvier, stay on either Firefox 45.0esr or 47.0.1 and selenium-webdriver 2.53.4.  Firefox 48 requires geckodriver and selenium-webdriver v3, the combo of which currently has multiple issues and is feature incomplete.
 
 ## Table of contents
 

data/lib/capybara/node/finders.rb

@@ -31,7 +31,7 @@ module Capybara
       def find(*args)
         query = Capybara::Queries::SelectorQuery.new(*args)
         synchronize(query.wait) do
-          if query.match == :smart or query.match == :prefer_exact
+          if (query.match == :smart or query.match == :prefer_exact) and query.supports_exact?
             result = query.resolve_for(self, true)
             result = query.resolve_for(self, false) if result.empty? && !query.exact?
           else

data/lib/capybara/queries/selector_query.rb

@@ -27,6 +27,9 @@ module Capybara
         end
 
         @expression = @selector.call(@locator)
+
+        warn_exact_usage
+
         assert_valid_keys
       end
 
@@ -79,6 +82,7 @@ module Capybara
       end
 
       def exact?
+        return false if !supports_exact?
         if options.has_key?(:exact)
           @options[:exact]
         else
@@ -125,6 +129,11 @@ module Capybara
         end
       end
 
+      # @api private
+      def supports_exact?
+        @expression.respond_to? :to_xpath
+      end
+
       private
 
       def valid_keys
@@ -150,6 +159,12 @@ module Capybara
           raise ArgumentError, "invalid option #{match.inspect} for :match, should be one of #{VALID_MATCH.map(&:inspect).join(", ")}"
         end
       end
+
+      def warn_exact_usage
+        if options.has_key?(:exact) && !supports_exact?
+          warn "The :exact option only has an effect on queries using the XPath#is method. Using it with the query \"#{expression.to_s}\" has no effect."
+        end
+      end
     end
   end
 end

data/lib/capybara/queries/text_query.rb

@@ -48,7 +48,7 @@ module Capybara
         details_message = []
 
         if @node and !@expected_text.is_a? Regexp
-          insensitive_regexp = Regexp.new(@expected_text, Regexp::IGNORECASE)
+          insensitive_regexp = Capybara::Helpers.to_regexp(@expected_text, Regexp::IGNORECASE)
           insensitive_count = @actual_text.scan(insensitive_regexp).size
           if insensitive_count != @count
             details_message << "it was found #{insensitive_count} #{Capybara::Helpers.declension("time", "times", insensitive_count)} using a case insensitive search"

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

@@ -52,6 +52,13 @@ Capybara::SpecHelper.spec '#assert_text' do
     end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time using a case insensitive search/)
   end
 
+  it "should raise the correct error if requested text is missing but contains regex special characters" do
+    @session.visit('/with_html')
+    expect do
+      @session.assert_text('[]*.')
+    end.to raise_error(Capybara::ExpectationNotMet, /expected to find text "\[\]\*\."/)
+  end
+
   it "should be true if the text in the page matches given regexp" do
     @session.visit('/with_html')
     expect(@session.assert_text(/Lorem/)).to eq(true)

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

@@ -235,6 +235,12 @@ Capybara::SpecHelper.spec '#find' do
       Capybara.exact = false
       @session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("est_fiel")])
     end
+
+    it "warns when the option has no effect" do
+      expect_any_instance_of(Kernel).to receive(:warn).
+        with('The :exact option only has an effect on queries using the XPath#is method. Using it with the query "#test_field" has no effect.')
+      @session.find(:css, '#test_field', exact: true)
+    end
   end
 
   context "with :match option" do
@@ -292,7 +298,7 @@ Capybara::SpecHelper.spec '#find' do
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:css, ".does-not-exist", :match => :smart, :exact => false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], :match => :smart, :exact => false)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -319,7 +325,7 @@ Capybara::SpecHelper.spec '#find' do
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:css, ".does-not-exist", :match => :smart, :exact => true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], :match => :smart, :exact => true)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -345,7 +351,7 @@ Capybara::SpecHelper.spec '#find' do
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:css, ".does-not-exist", :match => :prefer_exact, :exact => false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], :match => :prefer_exact, :exact => false)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -371,7 +377,7 @@ Capybara::SpecHelper.spec '#find' do
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:css, ".does-not-exist", :match => :prefer_exact, :exact => true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], :match => :prefer_exact, :exact => true)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.8.0'
+  VERSION = '2.8.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri