capybara 2.9.1 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc4841dedf9ca38322cb47a786b24f8628e62fd2
-  data.tar.gz: be5ea00f82b66a46769eab36218b26be66dda267
+  metadata.gz: db09e9654963783c82ada646c4814ddc80c2ddb7
+  data.tar.gz: 17cd310533f903c6074ab255346e37c40046f3e9
 SHA512:
-  metadata.gz: 266ef0ca4cec47b1692544d070b6cf467f366d52d4675dae21b2e2cce3985f9ea8a5b268f70d71e290cabe4f0fbf7134b39283e2ea180cabd7610d7c34ec06f7
-  data.tar.gz: d4ec85892ef15b4f1fee2b51b8b52a51119baaaf2a09b0abb096621197608e545036c0146cbcb64d860736cf014bb375186fec6d4f13d66e04e79959e174470c
+  metadata.gz: e20f671c5012aa0edcc8b51e9cd75fcac85ef8e8d784131e12cba87a1d89d6464f64d77f529787803b702d628022a48bf114ad37550995c354c409e25bb2f0b8
+  data.tar.gz: 3257116b6f9eb2584a154aecdc82342a1486a420eff1ebccb9df680ad0816d1f7a15aa1bc5aa8b321dc09471c6c991f035c35aa1c731fa17aa2d6827135a9667

data/History.md

@@ -1,3 +1,10 @@
+#Version 2.9.2
+Release date: 2016-09-29
+
+### Fixed
+* :label built-in selector finds nested label/control by control id if the label has no 'for' attribute [Thomas Walpole]
+* Warning issued if an unknown selector type is specified
+
 #Version 2.9.1
 Release date: 2016-09-23
 

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-webdriver, stay on either Firefox [45.0esr](https://ftp.mozilla.org/pub/firefox/releases/45.0esr/) or [47.0.1](https://ftp.mozilla.org/pub/firefox/releases/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.
+**Note: Firefox 48+** If you're using Firefox with selenium-webdriver, stay on either Firefox [45.0esr](https://ftp.mozilla.org/pub/firefox/releases/45.0esr/) or [47.0.1](https://ftp.mozilla.org/pub/firefox/releases/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/queries/selector_query.rb

@@ -11,7 +11,10 @@ module Capybara
         @options = if args.last.is_a?(Hash) then args.pop.dup else {} end
 
         if args[0].is_a?(Symbol)
-          @selector = Selector.all[args.shift]
+          @selector = Selector.all.fetch(args.shift) do |selector_type|
+            warn "Unknown selector type (:#{selector_type}), defaulting to :#{Capybara.default_selector} - This will raise an exception in a future version of Capybara"
+            nil
+          end
           @locator = args.shift
         else
           @selector = Selector.all.values.find { |s| s.match?(args[0]) }

data/lib/capybara/selector.rb

@@ -429,21 +429,25 @@ end
 #
 Capybara.add_selector(:label) do
   label "label"
-  xpath do |locator|
+  xpath(:for) do |locator, options|
     xpath = XPath.descendant(:label)
     xpath = xpath[XPath.string.n.is(locator.to_s) | XPath.attr(:id).equals(locator.to_s)] unless locator.nil?
+    if options.has_key?(:for) && !options[:for].is_a?(Capybara::Node::Element)
+      xpath = xpath[XPath.attr(:for).equals(options[:for].to_s).or((~XPath.attr(:for)).and(XPath.descendant()[XPath.attr(:id).equals(options[:for].to_s)]))]
+    end
     xpath
   end
 
   filter(:for) do |node, field_or_value|
     if field_or_value.is_a? Capybara::Node::Element
-      if field_or_value[:id] && (field_or_value[:id] == node[:for])
-        true
+      if node[:for]
+        field_or_value[:id] == node[:for]
       else
         field_or_value.find_xpath('./ancestor::label[1]').include? node.base
       end
     else
-      node[:for] == field_or_value.to_s
+      #Non element values were handled through the expression filter
+      true
     end
   end
 

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

@@ -416,4 +416,9 @@ Capybara::SpecHelper.spec '#find' do
       end
     end
   end
+
+  it "should warn if selector type is unknown" do
+    expect_any_instance_of(Kernel).to receive(:warn).with(/^Unknown selector type/)
+    @session.find(:unknown, '//h1')
+  end
 end

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

@@ -12,7 +12,11 @@ Capybara::SpecHelper.spec Capybara::Selector do
       expect(@session.find(:label, for: 'form_other_title')['for']).to eq 'form_other_title'
     end
 
-    it "finds a label from nested input using :for filter" do
+    it "finds a label from nested input using :for filter with id string" do
+      expect(@session.find(:label, for: 'nested_label').text).to eq 'Nested Label'
+    end
+
+    it "finds a label from nested input using :for filter with element" do
       input = @session.find(:id, 'nested_label')
       expect(@session.find(:label, for: input).text).to eq 'Nested Label'
     end

data/lib/capybara/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri