matches_selector? should allow all of the selectors filters

willnet · Sep 23, 2016 · 109cfab · 109cfab
1 parent 09d350e
commit 109cfab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/History.md b/History.md
@@ -3,6 +3,7 @@ Release date: unreleased
 
 ### Fixed
 * allow_label_click option did not work in some cases with Poltergeist - Issue #1762 [Thomas Walpole]
+* matches_selector? should have access to all of a selectors filters [Thomas Walpole]
 
 #Version 2.9.0
 Release date: 2016-09-19

diff --git a/lib/capybara/queries/match_query.rb b/lib/capybara/queries/match_query.rb
@@ -1,8 +1,6 @@
 module Capybara
   module Queries
     class MatchQuery < Capybara::Queries::SelectorQuery
-      VALID_KEYS = [:text, :visible, :exact, :wait]
-
       def visible
         if options.has_key?(:visible)
           super
@@ -14,7 +12,7 @@ def visible
       private
 
       def valid_keys
-        VALID_KEYS + @selector.custom_filters.keys
+        super - COUNT_KEYS
       end
     end
   end

diff --git a/lib/capybara/spec/session/element/matches_selector_spec.rb b/lib/capybara/spec/session/element/matches_selector_spec.rb
@@ -42,6 +42,12 @@
     expect(@element.matches_xpath?("//span", text: '42')).to be true
     expect(@element.matches_xpath?("//span", text: 'Nope')).to be false
   end
+
+  it 'should accept selector filters' do
+    @session.visit('/form')
+    cbox = @session.find(:css, '#form_pets_dog')
+    expect(cbox.matches_selector?(:checkbox, id: 'form_pets_dog', option: 'dog', name: 'form[pets][]', checked: true)).to be true
+  end
 end
 
 Capybara::SpecHelper.spec '#not_matches_selector?' do

diff --git a/spec/selector_spec.rb b/spec/selector_spec.rb
@@ -96,7 +96,7 @@
         end
       end
 
-      context "with :id option", twtw: true do
+      context "with :id option" do
         it "works with compound css selectors" do
           expect(string.all(:custom_css_selector, "div, h1", id: 'page').size).to eq 1
           expect(string.all(:custom_css_selector, "h1, div", id: 'page').size).to eq 1
@@ -109,7 +109,7 @@
         end
       end
 
-      context "with :class option", twtw: true do
+      context "with :class option" do
         it "works with compound css selectors" do
           expect(string.all(:custom_css_selector, "div, h1", class: 'a').size).to eq 2
           expect(string.all(:custom_css_selector, "h1, div", class: 'a').size).to eq 2