Skip to content

Commit 92af4cc

Browse files
authored
Merge pull request #241 from juank-pa/fix_bug_with_single_quoted_escaped_html
Fix bug with single quoted escaped html
2 parents 6430f5f + 9a88478 commit 92af4cc

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

lib/jquery/assert_select.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ module Rails::Dom::Testing::Assertions::SelectorAssertions
4747
# assert_select '.product'
4848
# end
4949

50-
PATTERN_HTML = "['\"]((\\\\\"|[^\"])*)['\"]"
50+
PATTERN_HTML = "['\"]((\\\\\"|\\\\'|[^\"'])*)['\"]"
5151
PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
5252
SKELETAL_PATTERN = "(?:jQuery|\\$)\\(%s\\)\\.%s\\(%s\\);"
5353

test/assert_select_jquery_test.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ class AssertSelectJQueryTest < ActiveSupport::TestCase
88
JAVASCRIPT_TEST_OUTPUT = <<-JS
99
$("#card").show("blind", 1000);
1010
$("#id").html('<div><p>something</p></div>');
11+
$('#card').html('<div><p>something else</p></div>');
1112
jQuery("#id").replaceWith("<div><p>something</p></div>");
1213
$("<div><p>something</p></div>").appendTo("#id");
1314
jQuery("<div><p>something</p></div>").prependTo("#id");
@@ -35,6 +36,12 @@ def test_target_as_receiver
3536
assert_raise Minitest::Assertion, "No JQuery call matches [:show, :some_wrong]" do
3637
assert_select_jquery :show, :some_wrong
3738
end
39+
40+
assert_raise Minitest::Assertion, "<something else> was expected but was <something>" do
41+
assert_select_jquery :html, '#id' do
42+
assert_select 'p', 'something else'
43+
end
44+
end
3845
end
3946

4047
def test_target_as_argument

0 commit comments

Comments
 (0)