Merge pull request #269 from repinel/fix-unescape-js

Fix `unescape_js` to match changes in Action View
rails · Mar 30, 2020 · 6361d43 · 6361d43
2 parents 7553142 + b6d6e25
commit 6361d43
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/jquery/assert_select.rb b/lib/jquery/assert_select.rb
@@ -124,6 +124,8 @@ def unescape_js(js_string)
       unescaped.gsub!('\n', "\n")
       unescaped.gsub!('\076', '>')
       unescaped.gsub!('\074', '<')
+      unescaped.gsub!(/\\\$/, '$')
+      unescaped.gsub!(/\\`/, '`')
       # js encodes non-ascii characters.
       unescaped.gsub!(PATTERN_UNICODE_ESCAPED_CHAR) {|u| [$1.hex].pack('U*')}
       unescaped

diff --git a/test/assert_select_jquery_test.rb b/test/assert_select_jquery_test.rb
@@ -23,6 +23,8 @@ class AssertSelectJQueryTest < ActiveSupport::TestCase
 
     // without semicolon
     $("#browser_cart").hide("blind", 1000)
+
+    $('#item').html('<div><span>\\`Total\\`: \\$12.34</span></div>');
   JS
 
   setup do
@@ -43,6 +45,10 @@ def test_target_as_receiver
       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"
+
+      assert_select_jquery :html, '#item' do
+        assert_select 'span', '`Total`: $12.34'
+      end
     end
 
     assert_raise Minitest::Assertion, "No JQuery call matches [:show, :some_wrong]" do