capybara 3.10.0 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e17a63edc194f43995b9c63196fe91311450999a03da4ee7c2f1aa1e1e34e4
-  data.tar.gz: f0a20f11e8a454f62a9abd62dc4d1f18f8419460c43a0e37f250d8c603cffc60
+  metadata.gz: ab5799591629ab7839ce7bd05f651e7ca3215e300bd1e6622130e01e0431ad86
+  data.tar.gz: b848caed06658e44c604d490eb26b4a5d313a5879c4deb6fc3f8d3ba2b784644
 SHA512:
-  metadata.gz: ee9b34f496afec3a99be65c5fcdcfebef38640eccb146a4e43ec811a55c99edf8393695e9a9d228db07d738d753feaa7f8c8090bc7cf37189ff3b192e5b15482
-  data.tar.gz: 002ae33fdef7b207d2cba11b8ce125c1d4ef972b10226d9f766dc41605791b8167c11c69ae1295ff229049bbd668a4b49021747eefee4861b152489ddbbe4f5d
+  metadata.gz: b74973ebd8ca32addec5f7aeb005ef022d6b2e9e5633203b51ccafa4608378121ad582eed792bd7de44496e2d9b8692a49b648575fe3b8ee399f4ca6515e3b22
+  data.tar.gz: ebb6f2aeb95d168e23d515d6d97e1af702d244c030a39ba7474a2dbd3a6bd954b70e29bacf31e7def0e9f66e5db8e53ae255709751e99431b869d5c2c84b0041

data/History.md

@@ -1,3 +1,11 @@
+# Version 3.10.1
+Release date: 2018-11-03
+
+### Fixed
+
+* Fix `aria-label` and `test_id` matching for `link_or_button` selector type - Issue #2125
+* Fixed crash in element path creation for matcher failure messages - Issue #2120
+
 # Version 3.10.0
 Release date: 2018-10-23
 

data/README.md

@@ -7,7 +7,7 @@
 [![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.9_stable/README.md
+you can find the README at https://github.com/teamcapybara/capybara/blob/3.10_stable/README.md
 
 
 Capybara helps you test web applications by simulating how a real user would

data/lib/capybara/queries/selector_query.rb

@@ -156,7 +156,6 @@ module Capybara
 
       def matches_node_filters?(node)
         unapplied_options = options.keys - valid_keys
-
         node_filters.all? do |filter_name, filter|
           if filter.matcher?
             unapplied_options.select { |option_name| filter.handles_option?(option_name) }.all? do |option_name|

data/lib/capybara/selector.rb

@@ -178,7 +178,7 @@ end
 Capybara.add_selector(:link_or_button) do
   label 'link or button'
   xpath do |locator, **options|
-    self.class.all.values_at(:link, :button).map { |selector| selector.xpath.call(locator, options) }.reduce(:union)
+    self.class.all.values_at(:link, :button).map { |selector| selector.call(locator, **options, selector_config: @config) }.reduce(:union)
   end
 
   node_filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| node.tag_name == 'a' || !(value ^ node.disabled?) }

data/lib/capybara/selenium/node.rb

@@ -181,7 +181,9 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
         when 1
           '' # index not necessary when only one matching element
         else
-          "[#{siblings.index(node) + 1}]"
+          idx = siblings.index(node)
+          # Element may not be found in the siblings if it has gone away
+          idx.nil? ? '[ERROR]' : "[#{idx + 1}]"
         end
       end
       result.push selector

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

@@ -110,4 +110,20 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
     link = @session.find(:link, 'Blank Anchor')
     expect(@session.click_link_or_button('Blank Anchor')).to eq link
   end
+
+  context 'with enable_aria_label' do
+    it 'should click on link' do
+      @session.visit('/with_html')
+      expect do
+        @session.click_link_or_button('Go to simple', enable_aria_label: true)
+      end.not_to raise_error
+    end
+
+    it 'should click on button' do
+      @session.visit('/form')
+      expect do
+        @session.click_link_or_button('Aria button', enable_aria_label: true)
+      end.not_to raise_error
+    end
+  end
 end

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

@@ -39,10 +39,29 @@ Capybara::SpecHelper.spec '#has_css?' do
     expect(@session).to have_css('h2', id: /2ON/i)
   end
 
-  it 'should respect scopes' do
-    @session.within "//p[@id='first']" do
-      expect(@session).to have_css('a#foo')
-      expect(@session).not_to have_css('a#red')
+  context 'when scoped' do
+    it 'should look in the scope' do
+      @session.within "//p[@id='first']" do
+        expect(@session).to have_css('a#foo')
+        expect(@session).not_to have_css('a#red')
+      end
+    end
+
+    it 'should be able to generate an error message if the scope is a sibling' do
+      el = @session.find(:css, '#first')
+      @session.within el.sibling(:css, '#second') do
+        expect {
+          expect(@session).to have_css('a#not_on_page')
+        }.to raise_error /there were no matches/
+      end
+    end
+
+    it 'should be able to generate an error message if the scope is a sibling from XPath' do
+      el = @session.find(:css, '#first').find(:xpath, './following-sibling::*[1]') do
+        expect {
+          expect(el).to have_css('a#not_on_page')
+        }.to raise_error /there were no matches/
+      end
     end
   end
 

data/lib/capybara/spec/views/form.erb

@@ -434,7 +434,7 @@ New line after and before textarea tag
   </p>
 
   <p>
-    <input type="button" name="form[fresh]" id="fresh_btn" value="i am fresh"/>
+    <input type="button" aria-label="Aria button" name="form[fresh]" id="fresh_btn" value="i am fresh"/>
     <input type="submit" name="form[awesome]" id="awe123" title="What an Awesome Button" value="awesome"/>
     <input type="submit" name="form[crappy]" id="crap321" value="crappy"/>
     <input type="image" name="form[okay]" id="okay556" title="Okay 556 Image" value="okay" alt="oh hai thar"/>

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.10.0'
+  VERSION = '3.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -525,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,