Merge pull request #243 from juank-pa/support_even_more_css_selectors

Support even more CSS selectors
rails · May 12, 2017 · 6eb084e · 6eb084e
2 parents a3ed164 + 3b2b33a
commit 6eb084e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Add possibility to test HTML: all, attribute prefix, attribute contains,
+  attribute ends with, child, and class selectors
 - Fix matching mutiple calls for the same selector/function exception
 
 ## 4.3.1

diff --git a/lib/jquery/assert_select.rb b/lib/jquery/assert_select.rb
@@ -134,6 +134,15 @@ def escape_id(selector)
 
       id = selector.gsub('[', '\[')
       id.gsub!(']', '\]')
+      id.gsub!('*', '\*')
+      id.gsub!('(', '\(')
+      id.gsub!(')', '\)')
+      id.gsub!('.', '\.')
+      id.gsub!('|', '\|')
+      id.gsub!('^', '\^')
+      id.gsub!('$', '\$')
+      id.gsub!('+', "\\\\+")
+      id.gsub!(',', '\,')
 
       id
     end

diff --git a/test/assert_select_jquery_test.rb b/test/assert_select_jquery_test.rb
@@ -16,6 +16,9 @@ class AssertSelectJQueryTest < ActiveSupport::TestCase
     $('#id').remove();
     jQuery("#id").hide();
     $("[data-placeholder~=name]").remove();
+    $("#cart tr:not(.total_line) > *").remove();
+    $("[href|=\"val\"][href$=\"val\"][href^=\"val\"]").remove();
+    $("tr + td, li").remove();
   JS
 
   setup do
@@ -32,6 +35,9 @@ def test_target_as_receiver
         assert_select 'p', 'something'
       end
       assert_select_jquery :remove, "[data-placeholder~=name]"
+      assert_select_jquery :remove, "#cart tr:not(.total_line) > *"
+      assert_select_jquery :remove, "[href|=\"val\"][href$=\"val\"][href^=\"val\"]"
+      assert_select_jquery :remove, "tr + td, li"
     end
 
     assert_raise Minitest::Assertion, "No JQuery call matches [:show, :some_wrong]" do