capybara 3.11.0 → 3.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c349d493d1d6639b40265451f5b357aa7b5d29d279e1095284071fba9bc8a59
-  data.tar.gz: 23350dd400ffd3e11fdda081f12331ab7518b94061fb104355e30cfbee0d9935
+  metadata.gz: 54ee49a77f4b1cec2ed59869334766af110a64a50dae8cdc02a95b5ba750fb9b
+  data.tar.gz: db2319b75d0626c01babc298eccd8ce76d3da65a8a0a994bb25de5c742e1721f
 SHA512:
-  metadata.gz: caa9124c0465dcc82b15109c4cbd841dbc8e214ff87fd928a712abd6896155c6c8b3be00d0ec09cb1fbbea9da8206773b799766da5fd08ac9bc0a9d36d81dd85
-  data.tar.gz: 18b0c515e7be809183bc26d6d2ce38692561e30760b96a26992d44b96027484ae942f7c25e48b803323ef0534ca616fd20c503ec2cfefbf1da47416eb30b2443
+  metadata.gz: d9c1965b9ba0d38813d3060aaefe797ef8d6610416c954bf4cebdae70de5ca23bc4b07303033ecbf2f5e62bc681319c6b20dc0567f49e89ccc02df38dd10d44d
+  data.tar.gz: bf971abb444f58438091422e656108d29bb7efa0d2f2dfb1728a818626cea38e7fa700b3701904ca10344a4f272e14fd99482c23b62b9cfe3b6139d868fa5b30

data/History.md

@@ -1,3 +1,10 @@
+# Version 3.11.1
+Release date: 2018-11-16
+
+###Fixed
+
+* Fixed :link_or_button XPath generation when it has had an expression filter added
+
 # Version 3.11.0
 Release date: 2018-11-14
 

data/lib/capybara/selector.rb

@@ -161,11 +161,9 @@ Capybara.add_selector(:button) do
       image_btn_xpath = image_btn_xpath[alt_matches]
     end
 
-    res_xpath = input_btn_xpath.union(btn_xpath).union(image_btn_xpath)
-
-    res_xpath = expression_filters.keys.inject(res_xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
-
-    res_xpath
+    %i[value title type].inject(input_btn_xpath.union(btn_xpath).union(image_btn_xpath)) do |memo, ef|
+      memo[find_by_attr(ef, options[ef])]
+    end
   end
 
   node_filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| !(value ^ node.disabled?) }

data/lib/capybara/version.rb

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

data/spec/selector_spec.rb

@@ -416,6 +416,22 @@ RSpec.describe Capybara do
           expect(string.find(:element, 'input', title: XPath.contains_word('button 1'))[:type]).to eq 'button'
         end
       end
+
+      describe ':link_or_button selector' do
+        around(:all) do |example|
+          Capybara.modify_selector(:link_or_button) do
+            expression_filter(:random) { |xpath, _| xpath } # do nothing filter
+          end
+          example.run
+          Capybara::Selector.all[:link_or_button].expression_filters.delete(:random)
+        end
+
+        context 'when modified' do
+          it 'should still work' do
+            expect(string.find(:link_or_button, 'click me', random: 'blah').value).to eq 'click me'
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.11.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable